diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-26 13:44:34 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-27 09:05:17 +0200 |
| commit | 7e2240c384c405bb14207f0cb26bff3e4357fcb6 (patch) | |
| tree | 888cd2ddbb56d1f3d29217adff15a05362c6c13a /xmloff | |
| parent | 38b14b248029ea65fc778ede06e8b426b74451da (diff) | |
OFFICE-3789 xmloff: ODF export: fix footer-first order inconsistency
Reorder footer-left/footer-first so that they are valid wrt. ODF 1.3
draft schema. The schema was changed to add footer-first after
footer-left, but the filter wrote footer-first before footer-left.
Change-Id: I48b7ed932729ec2c94e17e6f3d4797926c9811ee
Reviewed-on: https://gerrit.libreoffice.org/56482
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -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 ); + } } } |