diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-03-01 12:48:47 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-01 14:30:03 +0100 |
| commit | a75b4cefe89a8e9ebf0c1c0563390d076e85dc49 (patch) | |
| tree | 8b2044dcff2285d3b38a96f08aa980d7aa742bcd | |
| parent | c85aa97d4e20091db71899f713b07e3c57b3b7ad (diff) | |
tdf#116102 Revert "tdf#109080 First page header/footer ODF (2/2)"
Revert this on the libreoffice-6-0 branch; the patch to import the
element by its new name was only added in LO 5.3.6, so
probably 2 release cycles is too short for a change like this.
This revert delays the change until LO 6.1.
This reverts commit f1481007077723f7676f517db8df1363d070d459.
Change-Id: Ib195cbbf0dd341db203608f259d42ca71e7e5939
Reviewed-on: https://gerrit.libreoffice.org/50562
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/text/XMLTextMasterPageExport.cxx | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 27762d0bf60b..cc5cfb4f7a77 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -58,6 +58,7 @@ public: "fdo86963.odt", "shape-relsize.odt", "fdo60769.odt", + "first-header-footer.odt", "fdo38244.odt" }; diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index 3c60880c6e18..8d31899929e7 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -155,7 +155,7 @@ void XMLTextMasterPageExport::exportMasterPageContent( if (bHeaderFirstShared) GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_HEADER_FIRST, true, true ); exportHeaderFooterContent( xHeaderTextFirst, false ); } @@ -203,7 +203,7 @@ void XMLTextMasterPageExport::exportMasterPageContent( if (bFooterFirstShared) GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY, XML_FALSE ); - SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_FOOTER_FIRST, true, true ); exportHeaderFooterContent( xFooterTextFirst, false ); } |