Kaydet (Commit) a75b4cef authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Miklos Vajna

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 f1481007.

Change-Id: Ib195cbbf0dd341db203608f259d42ca71e7e5939
Reviewed-on: https://gerrit.libreoffice.org/50562Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst c85aa97d
......@@ -58,6 +58,7 @@ public:
"fdo86963.odt",
"shape-relsize.odt",
"fdo60769.odt",
"first-header-footer.odt",
"fdo38244.odt"
};
......
......@@ -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 );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment