From ecfcee8b05e45ec82dec6ed417e9ac53d4d7b4ff Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 4 Oct 2016 09:24:42 +0200 Subject: [PATCH] tdf#100830 drawingML import: handle Fill transparency on the UI. Regression from commit 57450afb768c085df0ba2344aa94b5f843060178 (DOCX import: declare wps as a supported feature, 2013-12-03), as the VML import handled this. Change-Id: I654b51d51448d25d400979a4a62189b86126ac01 Reviewed-on: https://gerrit.libreoffice.org/29517 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- include/oox/drawingml/fillproperties.hxx | 1 + oox/source/drawingml/fillproperties.cxx | 4 ++++ .../drawingml/fillpropertiesgroupcontext.cxx | 3 +++ sw/qa/extras/ooxmlimport/data/tdf100830.docx | Bin 0 -> 14219 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 ++++++ 5 files changed, 14 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/tdf100830.docx diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx index 3015424c1898..bed67d6fcc46 100644 --- a/include/oox/drawingml/fillproperties.hxx +++ b/include/oox/drawingml/fillproperties.hxx @@ -121,6 +121,7 @@ struct BlipFillProperties Color maDuotoneColors[2]; /// Duotone Colors ArtisticEffectProperties maEffect; /// Artistic effect, not supported by core. + OptValue moAlphaModFix; ///< Alpha Modulate Fixed Effect. /** Overwrites all members that are explicitly set in rSourceProps. */ void assignUsed( const BlipFillProperties& rSourceProps ); diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 370be6804d6a..2acf94f5cc9c 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -205,6 +205,7 @@ void BlipFillProperties::assignUsed( const BlipFillProperties& rSourceProps ) maDuotoneColors[0].assignIfUsed( rSourceProps.maDuotoneColors[0] ); maDuotoneColors[1].assignIfUsed( rSourceProps.maDuotoneColors[1] ); maEffect.assignUsed( rSourceProps.maEffect ); + moAlphaModFix.assignIfUsed(rSourceProps.moAlphaModFix); } void FillProperties::assignUsed( const FillProperties& rSourceProps ) @@ -652,6 +653,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, } } } + + if (maBlipProps.moAlphaModFix.has()) + rPropMap.setProperty(ShapeProperty::FillTransparency, static_cast(maBlipProps.moAlphaModFix.get() / PER_PERCENT)); } break; diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx index c8009f8edab7..22d68faabeb9 100644 --- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx +++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx @@ -190,6 +190,9 @@ ContextHandlerRef BlipContext::onCreateContext( mrBlipProps.moBrightness = rAttribs.getInteger( XML_bright ); mrBlipProps.moContrast = rAttribs.getInteger( XML_contrast ); break; + case A_TOKEN( alphaModFix ): + mrBlipProps.moAlphaModFix = rAttribs.getInteger(XML_amt); + break; } return nullptr; } diff --git a/sw/qa/extras/ooxmlimport/data/tdf100830.docx b/sw/qa/extras/ooxmlimport/data/tdf100830.docx new file mode 100644 index 0000000000000000000000000000000000000000..a51b8902634096f604c880a4ca53bf581d339273 GIT binary patch literal 14219 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 Fe*j1#hR6T_ literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 4c099e178e80..8752ee07473f 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -3294,6 +3294,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf99140, "tdf99140.docx") CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::LEFT_AND_WIDTH, getProperty(xTableProperties, "HoriOrient")); } +DECLARE_OOXMLIMPORT_TEST(testTdf100830, "tdf100830.docx") +{ + // FillTransparence wasn't imported, this was 0. + CPPUNIT_ASSERT_EQUAL(static_cast(50), getProperty(getShape(1), "FillTransparence")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */