summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2024-11-02 19:22:13 -0400
committerThorsten Behrens <thorsten.behrens@allotropia.de>2024-11-06 11:19:17 +0100
commitb8ea36c08437199ed53a4c88c3fb89ad497a6880 (patch)
treee16dcdc99701ece344807df24eb83017ac29fc56
parent9a7d9bf269ba35b077be3f4a6b587f25b54c06f2 (diff)
tdf#161349 writerfilter: only copy page background vml fillcib_contract49d-24.8.3.2.M1
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 <jluth@mail.com> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175965 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--sw/source/writerfilter/dmapper/PropertyMap.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/writerfilter/dmapper/PropertyMap.cxx b/sw/source/writerfilter/dmapper/PropertyMap.cxx
index 9dbf1c1eb47d..a9270da6617b 100644
--- a/sw/source/writerfilter/dmapper/PropertyMap.cxx
+++ b/sw/source/writerfilter/dmapper/PropertyMap.cxx
@@ -1211,6 +1211,8 @@ void SectionPropertyMap::HandleMarginsHeaderFooter(DomainMapper_Impl& rDM_Impl)
rDM_Impl.GetPageStyles()->getByName(u"Standard"_ustr), 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);