summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2024-11-02 19:22:13 -0400
committerJustin Luth <jluth@mail.com>2024-11-03 01:40:15 +0100
commitc8cfe6822f148d6f4ac545a9c66f17c4bcb1d9a3 (patch)
treec1267484e8e3f7822759f6abd082ae78add338e3
parent9f53d40fd19b22fe1bdbf64e8ce751cf53f4f517 (diff)
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 <jluth@mail.com> Tested-by: Jenkins
-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 04b773164d92..447999e0a908 100644
--- a/sw/source/writerfilter/dmapper/PropertyMap.cxx
+++ b/sw/source/writerfilter/dmapper/PropertyMap.cxx
@@ -1206,6 +1206,8 @@ void SectionPropertyMap::HandleMarginsHeaderFooter(DomainMapper_Impl& rDM_Impl)
rDM_Impl.GetPageStyles()->getStyleByName(u"Standard"_ustr);
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);