diff options
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/text/XMLTextMasterPageExport.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index 3c60880c6e18..278194551661 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -150,16 +150,6 @@ void XMLTextMasterPageExport::exportMasterPageContent( exportHeaderFooterContent( xHeaderText, false ); } - if( xHeaderTextFirst.is() && xHeaderTextFirst != xHeaderText ) - { - if (bHeaderFirstShared) - GetExport().AddAttribute( XML_NAMESPACE_STYLE, - XML_DISPLAY, XML_FALSE ); - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, - XML_HEADER_FIRST, true, true ); - exportHeaderFooterContent( xHeaderTextFirst, false ); - } - if( xHeaderTextLeft.is() && xHeaderTextLeft != xHeaderText ) { if (bHeaderLeftShared) @@ -170,6 +160,16 @@ void XMLTextMasterPageExport::exportMasterPageContent( exportHeaderFooterContent( xHeaderTextLeft, false ); } + if( xHeaderTextFirst.is() && xHeaderTextFirst != xHeaderText ) + { + if (bHeaderFirstShared) + GetExport().AddAttribute( XML_NAMESPACE_STYLE, + XML_DISPLAY, XML_FALSE ); + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, + XML_HEADER_FIRST, true, true ); + exportHeaderFooterContent( xHeaderTextFirst, false ); + } + aAny = rPropSet->getPropertyValue( sFooterOn ); bool bFooter = false; aAny >>= bFooter; @@ -198,16 +198,6 @@ void XMLTextMasterPageExport::exportMasterPageContent( exportHeaderFooterContent( xFooterText, false ); } - if( xFooterTextFirst.is() && xFooterTextFirst != xFooterText ) - { - if (bFooterFirstShared) - GetExport().AddAttribute( XML_NAMESPACE_STYLE, - XML_DISPLAY, XML_FALSE ); - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, - XML_FOOTER_FIRST, true, true ); - exportHeaderFooterContent( xFooterTextFirst, false ); - } - if( xFooterTextLeft.is() && xFooterTextLeft != xFooterText ) { if (bFooterLeftShared) @@ -217,6 +207,16 @@ void XMLTextMasterPageExport::exportMasterPageContent( XML_FOOTER_LEFT, true, true ); exportHeaderFooterContent( xFooterTextLeft, false ); } + + if( xFooterTextFirst.is() && xFooterTextFirst != xFooterText ) + { + if (bFooterFirstShared) + GetExport().AddAttribute( XML_NAMESPACE_STYLE, + XML_DISPLAY, XML_FALSE ); + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, + XML_FOOTER_FIRST, true, true ); + exportHeaderFooterContent( xFooterTextFirst, false ); + } } } |