diff options
| author | Luke Deller <luke@deller.id.au> | 2017-07-13 00:01:53 +1000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-20 11:47:21 +0200 |
| commit | f1481007077723f7676f517db8df1363d070d459 (patch) | |
| tree | e61b2e7c7d5d50b90ab765a19902d075cc91e527 | |
| parent | a4bebdf80e8d4cb897b746f41a14100948c4d59b (diff) | |
tdf#109080 First page header/footer ODF (2/2)
The proposal to add <style:header-first> / <style:footer-first>
to the ODF standard has not yet been accepted, so meanwhile we
should be using an extension namespace for these elements.
This second commit changes LibreOffice to emit
<loext:header-first> / <loext:footer-first>
Change-Id: Iffec14696a09c3378a6e65b78b5c63b9a43d9b46
Reviewed-on: https://gerrit.libreoffice.org/39865
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, 2 insertions, 3 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index b4c79b1b048c..38ce6a5596c6 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -53,7 +53,6 @@ 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 8d31899929e7..3c60880c6e18 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_STYLE, + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, 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_STYLE, + SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT, XML_FOOTER_FIRST, true, true ); exportHeaderFooterContent( xFooterTextFirst, false ); } |