writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 97b84d31a1db2ec690d180effad307f331d62fb9
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Mon Mar 13 13:02:40 2023 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Wed Mar 15 16:16:52 2023 +0000
tdf#154129 tdf#78590 writerfilter framePr: deduplicate grabbag
Well, not really deduplicate, because it only existed once.
But I can't imagine why it would depend on a parent style.
It was added with commit 1c876f5616522ab695de8c0316cdb0c601081815
Author: Rohit Deshmukh on Fri Jun 13 11:39:56 2014 +0530
fdo#78590: Fix for Corruption of para with framePr & drawing object into
para
Typically only RTF files don't have a parent style,
so the lack of it being there in the "else" clause
likely wouldn't have been noticed.
Change-Id: I36828863f9bc9b51fbd7c019d3865ac477662795
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148816
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2324fa78c2b5..1c27e8ccfdc6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1817,14 +1817,10 @@ void
DomainMapper_Impl::CheckUnregisteredFrameConversion( )
aFrameProperties.push_back(comphelper::makePropertyValue(
getPropertyName(PROP_BACK_COLOR_TRANSPARENCY), sal_Int32(100)));
- if (vProps.size() > 1)
- {
-
- uno::Sequence<beans::PropertyValue> aGrabBag(
comphelper::InitPropertySequence({
- { "ParaFrameProperties",
uno::Any(rAppendContext.pLastParagraphProperties->IsFrameMode()) }
- }));
-
aFrameProperties.push_back(comphelper::makePropertyValue("FrameInteropGrabBag",
aGrabBag));
- }
+ uno::Sequence<beans::PropertyValue>
aGrabBag(comphelper::InitPropertySequence(
+ { { "ParaFrameProperties",
+
uno::Any(rAppendContext.pLastParagraphProperties->IsFrameMode()) } }));
+
aFrameProperties.push_back(comphelper::makePropertyValue("FrameInteropGrabBag",
aGrabBag));
lcl_MoveBorderPropertiesToFrame(aFrameProperties,
rAppendContext.pLastParagraphProperties->GetStartingRange(),
