diff options
Diffstat (limited to 'kspread/kspread_sheet.cc')
-rw-r--r-- | kspread/kspread_sheet.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc index 70323124..43e4bbec 100644 --- a/kspread/kspread_sheet.cc +++ b/kspread/kspread_sheet.cc @@ -268,7 +268,7 @@ public: TQString name; int id; - Sheet::LayoutDirection tqlayoutDirection; + Sheet::LayoutDirection layoutDirection; // true if sheet is hidden bool hide; @@ -365,7 +365,7 @@ Sheet::Sheet (Map* map, d->id = s_id++; s_mapSheets->insert( d->id, this ); - d->tqlayoutDirection = LeftToRight; + d->layoutDirection = LeftToRight; d->defaultFormat = new Format (this, d->workbook->doc()->styleManager()->defaultStyle()); d->emptyPen.setStyle( Qt::NoPen ); @@ -452,19 +452,19 @@ int Sheet::id() const return d->id; } -Sheet::LayoutDirection Sheet::tqlayoutDirection() const +Sheet::LayoutDirection Sheet::layoutDirection() const { - return d->tqlayoutDirection; + return d->layoutDirection; } void Sheet::setLayoutDirection( LayoutDirection dir ) { - d->tqlayoutDirection = dir; + d->layoutDirection = dir; } bool Sheet::isRightToLeft() const { - return d->tqlayoutDirection == RightToLeft; + return d->layoutDirection == RightToLeft; } bool Sheet::isHidden() const @@ -5921,7 +5921,7 @@ TQDomElement Sheet::saveXML( TQDomDocument& dd ) //Laurent: for oasis format I think that we must use style:direction... - sheet.setAttribute( "tqlayoutDirection", (d->tqlayoutDirection == RightToLeft) ? "rtl" : "ltr" ); + sheet.setAttribute( "layoutDirection", (d->layoutDirection == RightToLeft) ? "rtl" : "ltr" ); sheet.setAttribute( "columnnumber", (int)d->showColumnNumber); sheet.setAttribute( "borders", (int)d->showPageBorders); sheet.setAttribute( "hide", (int)d->hide); @@ -6390,7 +6390,7 @@ TQString Sheet::getPart( const TQDomNode & part ) bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext& oasisContext, TQDict<Style>& styleMap ) { - d->tqlayoutDirection = LeftToRight; + d->layoutDirection = LeftToRight; if ( sheetElement.hasAttributeNS( KoXmlNS::table, "style-name" ) ) { TQString stylename = sheetElement.attributeNS( KoXmlNS::table, "style-name", TQString() ); @@ -6594,7 +6594,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack ) if ( styleStack.hasAttributeNS( KoXmlNS::style, "writing-mode" ) ) { kdDebug()<<"styleStack.hasAttribute( style:writing-mode ) :"<<styleStack.hasAttributeNS( KoXmlNS::style, "writing-mode" )<<endl; - d->tqlayoutDirection = ( styleStack.attributeNS( KoXmlNS::style, "writing-mode" )=="lr-tb" ) ? LeftToRight : RightToLeft; + d->layoutDirection = ( styleStack.attributeNS( KoXmlNS::style, "writing-mode" )=="lr-tb" ) ? LeftToRight : RightToLeft; //TODO //<value>lr-tb</value> //<value>rl-tb</value> @@ -7638,22 +7638,22 @@ bool Sheet::loadXML( const TQDomElement& sheet ) } bool detectDirection = true; - d->tqlayoutDirection = LeftToRight; - TQString tqlayoutDir = sheet.attribute( "tqlayoutDirection" ); - if( !tqlayoutDir.isEmpty() ) + d->layoutDirection = LeftToRight; + TQString layoutDir = sheet.attribute( "layoutDirection" ); + if( !layoutDir.isEmpty() ) { - if( tqlayoutDir == "rtl" ) + if( layoutDir == "rtl" ) { detectDirection = false; - d->tqlayoutDirection = RightToLeft; + d->layoutDirection = RightToLeft; } - else if( tqlayoutDir == "ltr" ) + else if( layoutDir == "ltr" ) { detectDirection = false; - d->tqlayoutDirection = LeftToRight; + d->layoutDirection = LeftToRight; } else - kdDebug()<<" Direction not implemented : "<<tqlayoutDir<<endl; + kdDebug()<<" Direction not implemented : "<<layoutDir<<endl; } if( detectDirection ) checkContentDirection( d->name ); |