[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - xmloff/source

[Michael Stahl (via logerrit)]

 xmloff/source/style/PageMasterExportPropMapper.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fb87c2ae2d28665f6d95df8ff5ac410db2dccb45
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Aug 19 18:12:01 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Aug 20 14:14:14 2020 +0200

    tdf#103602 xmloff: ODF export of page style: don't export draw:fill
    
    ... attributes on header-style and footer-style in strict ODF.
    
    Change-Id: Ic1af26b6112a5afbb70a82b29dbacd3dcec14ec3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101012
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit dd7caf3cfd3de636c8bf37c8347c1b72b3772aeb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101041
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 9c20a6a2b70e..a0443a5103c7 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -350,7 +350,11 @@ void XMLPageMasterExportPropMapper::ContextFilter(
 
         // tdf#103602 don't export draw:fill attributes on page-layout-properteis in strict ODF
         if (!isDrawingPageExport
-            && aPropMapper->GetEntryAPIName(rProp.mnIndex).startsWith("Fill")
+            && [](OUString const& rName) -> bool {
+                return rName.startsWith("Fill")
+                    || rName.startsWith("HeaderFill")
+                    || rName.startsWith("FooterFill");
+                } (aPropMapper->GetEntryAPIName(rProp.mnIndex))
             && ((aBackgroundImageExport.GetExport().getSaneDefaultVersion()
                 & SvtSaveOptions::ODFSVER_EXTENDED) == 0))
         {