diff options
Diffstat (limited to 'kexi/3rdparty/kolibs/koPageLayout.cpp')
| -rw-r--r-- | kexi/3rdparty/kolibs/koPageLayout.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp index 7888ba7de..316eba19c 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.cpp +++ b/kexi/3rdparty/kolibs/koPageLayout.cpp @@ -62,7 +62,7 @@ KoGenStyle KoPageLayout::saveOasis() const void KoPageLayout::loadOasis(const TQDomElement &style) { - TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) ); + TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) ); if ( !properties.isNull() ) { ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) ); @@ -86,16 +86,16 @@ void KoPageLayout::loadOasis(const TQDomElement &style) KoPageLayout KoPageLayout::standardLayout() { - KoPageLayout tqlayout; - tqlayout.format = KoPageFormat::defaultFormat(); - tqlayout.orientation = PG_PORTRAIT; - tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) ); - tqlayout.ptLeft = MM_TO_POINT( 20.0 ); - tqlayout.ptRight = MM_TO_POINT( 20.0 ); - tqlayout.ptTop = MM_TO_POINT( 20.0 ); - tqlayout.ptBottom = MM_TO_POINT( 20.0 ); - return tqlayout; + KoPageLayout layout; + layout.format = KoPageFormat::defaultFormat(); + layout.orientation = PG_PORTRAIT; + layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) ); + layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) ); + layout.ptLeft = MM_TO_POINT( 20.0 ); + layout.ptRight = MM_TO_POINT( 20.0 ); + layout.ptTop = MM_TO_POINT( 20.0 ); + layout.ptBottom = MM_TO_POINT( 20.0 ); + return layout; } struct PageFormatInfo @@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format ) { if ( format == PG_SCREEN ) { - kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; + kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl; return KPrinter::A4; } else if ( format == PG_CUSTOM ) { - kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; + kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl; return KPrinter::A4; } else if ( format <= PG_LAST_FORMAT ) @@ -200,15 +200,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height ) TQString KoPageFormat::formatString( KoFormat format ) { if ( format <= PG_LAST_FORMAT ) - return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName ); - return TQString::tqfromLatin1( "A4" ); + return TQString::fromLatin1( pageFormatInfo[ format ].shortName ); + return TQString::fromLatin1( "A4" ); } KoFormat KoPageFormat::formatFromString( const TQString & string ) { for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i ) { - if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName )) + if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName )) return pageFormatInfo[ i ].format; } // We do not know the format name, so we have a custom format |