core.git: Branch 'distro/collabora/co-24.04' - writerfilter/source

[Justin Luth (via logerrit)]

 writerfilter/source/dmapper/PropertyMap.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 00515706481dddb46ec8f7b2f7a0e0f7e30a2f5c
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Sat Nov 2 19:22:13 2024 -0400
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 4 11:46:00 2024 +0100

    tdf#161349 writerfilter: only copy page background vml fill
    
    This fixes my 24.8 regression.
    
    I had this clause in earlier versions of the patchset,
    but it moved along with most of the other logic
    to the initialization of the default page style.
    
    However, I certainly need to limit copying the properties
    of the default page style to ONLY the fill properties here as well.
    
    Change-Id: I168f13ebeea3720eba53703210314f069fb87ae2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175963
    Reviewed-by: Justin Luth <jl...@mail.com>
    Tested-by: Jenkins
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175964
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 7bdc4a688217..393142483710 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1215,6 +1215,8 @@ void 
SectionPropertyMap::HandleMarginsHeaderFooter(DomainMapper_Impl& rDM_Impl)
                     rDM_Impl.GetPageStyles()->getByName("Standard"), 
uno::UNO_QUERY_THROW);
         for (const beans::Property& rProp : 
m_aPageStyle->getPropertySetInfo()->getProperties())
         {
+            if (!rProp.Name.startsWith("Fill")) // only copy XATTR_FILL 
properties
+                continue;
             try
             {
                 const uno::Any aFillValue = 
xDefaultPageStyle->getPropertyValue(rProp.Name);