summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapper_Impl.cxx
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2023-03-13 12:57:35 -0400
committerJustin Luth <jluth@mail.com>2023-03-15 16:16:24 +0000
commitb1194e42dde6e3749631a6510d9e7b969e5eae8e (patch)
tree7f7e0e5257e7d9c87e2949ac37913455b416bf72 /writerfilter/source/dmapper/DomainMapper_Impl.cxx
parentd21ba804040bdb275234254fbbe742ce830420c2 (diff)
tdf#154129 writerfilter framePr: deduplicate BackColorTransparency
Well, not really deduplicate, because it only existed once. Added long ago with commit 4ac48167662c592c21025b89fe8f6925c680c6e0 Author: Miklos Vajna on Mon Feb 20 15:46:08 2012 +0100 n#695479 fix rtf/docx import of transparent frames However, it didn't handle the situation where {\stylesheet{\fs19\lang1033 \snext0 Normal;}} was missing. In that case there is no "Normal" paragraph style to inherit from, and thus his fix is also needed in the no-style case. make CppunitTest_sw_rtfexport3 \ CPPUNIT_TEST_NAME=testTdf154129_transparentFrame Change-Id: Iaa5b92cd626192d44d11c1365b9b483bd46dff9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148815 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0f8991819b3b..2324fa78c2b5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1811,12 +1811,14 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
comphelper::makePropertyValue(getPropertyName(PROP_FRM_DIRECTION), *nDirection));
}
+ // If there is no fill, the Word default is 100% transparency.
+ // Otherwise CellColorHandler has priority, and this setting
+ // will be ignored.
+ aFrameProperties.push_back(comphelper::makePropertyValue(
+ getPropertyName(PROP_BACK_COLOR_TRANSPARENCY), sal_Int32(100)));
+
if (vProps.size() > 1)
{
- // If there is no fill, the Word default is 100% transparency.
- // Otherwise CellColorHandler has priority, and this setting
- // will be ignored.
- aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_BACK_COLOR_TRANSPARENCY), sal_Int32(100)));
uno::Sequence<beans::PropertyValue> aGrabBag( comphelper::InitPropertySequence({
{ "ParaFrameProperties", uno::Any(rAppendContext.pLastParagraphProperties->IsFrameMode()) }