diff options
Diffstat (limited to 'lib/kotext/KoParagStyle.cpp')
| -rw-r--r-- | lib/kotext/KoParagStyle.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index fcae882c..a68c6768 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -88,7 +88,7 @@ void KoParagStyle::setFollowingStyle( KoParagStyle *fst ) void KoParagStyle::saveStyle( TQDomElement & parentElem ) { - m_paragLayout.saveParagLayout( parentElem, m_paragLayout.alignment ); + m_paragLayout.saveParagLayout( parentElem, m_paragLayout.tqalignment ); if ( followingStyle() ) { @@ -103,12 +103,12 @@ void KoParagStyle::saveStyle( TQDomElement & parentElem ) void KoParagStyle::loadStyle( TQDomElement & parentElem, int docVersion ) { - KoParagLayout layout; - KoParagLayout::loadParagLayout( layout, parentElem, docVersion ); + KoParagLayout tqlayout; + KoParagLayout::loadParagLayout( tqlayout, parentElem, docVersion ); // This way, KoTextParag::setParagLayout also sets the style pointer, to this style - layout.style = this; - m_paragLayout = layout; + tqlayout.style = this; + m_paragLayout = tqlayout; // Load name TQDomElement nameElem = parentElem.namedItem("NAME").toElement(); @@ -138,8 +138,8 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context context.styleStack().save(); context.addStyles( &styleElem, "paragraph" ); // Load all parents - only because we don't support inheritance. - KoParagLayout layout; - KoParagLayout::loadOasisParagLayout( layout, context ); + KoParagLayout tqlayout; + KoParagLayout::loadOasisParagLayout( tqlayout, context ); // loadOasisParagLayout doesn't load the counter. It's modelled differently for parags and for styles. int level = 0; @@ -172,15 +172,15 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context const TQDomElement listStyle = context.listStyleStack().currentListStyle(); // The tag is either text:list-level-style-number or text:list-level-style-bullet const bool ordered = listStyle.localName() == "list-level-style-number"; - Q_ASSERT( !layout.counter ); - layout.counter = new KoParagCounter; - layout.counter->loadOasis( context, -1, ordered, m_bOutline, level, true ); + Q_ASSERT( !tqlayout.counter ); + tqlayout.counter = new KoParagCounter; + tqlayout.counter->loadOasis( context, -1, ordered, m_bOutline, level, true ); context.listStyleStack().pop(); } // This way, KoTextParag::setParagLayout also sets the style pointer, to this style - layout.style = this; - m_paragLayout = layout; + tqlayout.style = this; + m_paragLayout = tqlayout; m_format.load( context ); @@ -207,7 +207,7 @@ TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const T // This display-name will probably look nicer in OO, but this also means // no re-use possible between list styles... listStyle.addAttribute( "style:display-name", - i18n( "Numbering Style for %1" ).arg( m_displayName ) ); + i18n( "Numbering Style for %1" ).tqarg( m_displayName ) ); TQString autoListStyleName = genStyles.lookup( listStyle, "L", KoGenStyles::ForceNumbering ); gs.addAttribute( "style:list-style-name", autoListStyleName ); @@ -245,7 +245,7 @@ void KoParagStyle::propagateChanges( int paragLayoutFlag, int /*formatFlag*/ ) if ( !m_parentStyle ) return; if ( !(paragLayoutFlag & KoParagLayout::Alignment) ) - m_paragLayout.alignment = m_parentStyle->paragLayout().alignment; + m_paragLayout.tqalignment = m_parentStyle->paragLayout().tqalignment; if ( !(paragLayoutFlag & KoParagLayout::Margins) ) for ( int i = 0 ; i < 5 ; ++i ) m_paragLayout.margins[i] = m_parentStyle->paragLayout().margins[i]; @@ -269,9 +269,9 @@ void KoParagStyle::propagateChanges( int paragLayoutFlag, int /*formatFlag*/ ) #if 0 if ( paragLayoutFlag == KoParagLayout::All ) { - setDirection( static_cast<TQChar::Direction>(layout.direction) ); + setDirection( static_cast<TQChar::Direction>(tqlayout.direction) ); // Don't call applyStyle from here, it would overwrite any paragraph-specific settings - setStyle( layout.style ); + setStyle( tqlayout.style ); } #endif // TODO a flag for the "is outline" bool? Otherwise we have no way to inherit |