diff options
Diffstat (limited to 'karbon/karbon_part.cc')
| -rw-r--r-- | karbon/karbon_part.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index 9355c961..955b21f5 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -109,9 +109,9 @@ DCOPObject* KarbonPart::dcopObject() } void -KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit ) +KarbonPart::setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit ) { - m_pageLayout = tqlayout; + m_pageLayout = layout; m_doc.setUnit( _unit ); m_doc.setWidth( m_pageLayout.ptWidth ); m_doc.setHeight( m_pageLayout.ptHeight ); @@ -308,7 +308,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ return false; } - TQString masterPageName = "Standard"; // use default tqlayout as fallback + TQString masterPageName = "Standard"; // use default layout as fallback TQDomElement *master = styles.masterPages()[ masterPageName ]; if ( !master ) //last test... master = styles.masterPages()[ "Default" ]; @@ -319,7 +319,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ master = it.current(); } Q_ASSERT( master ); - const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; if( style ) { m_pageLayout.loadOasis( *style ); @@ -371,7 +371,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter ) KoGenStyle pageLayout = m_pageLayout.saveOasis(); TQString layoutName = mainStyles.lookup( pageLayout, "PL" ); KoGenStyle masterPage( KoGenStyle::STYLE_MASTER ); - masterPage.addAttribute( "style:page-tqlayout-name", layoutName ); + masterPage.addAttribute( "style:page-layout-name", layoutName ); mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering ); KTempFile contentTmpFile; @@ -435,7 +435,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter ) it = styleList.begin(); for( ; it != styleList.end(); ++it ) - (*it).style->writeStyle( styleWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties" ); + (*it).style->writeStyle( styleWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties" ); styleWriter->endElement(); // office:automatic-styles |