diff options
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | sw/qa/extras/ooxmlimport/data/tdf100830.docx | bin | 14219 -> 22171 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index c283212c9a1f..81a37479e5f1 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -655,7 +655,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, } if (maBlipProps.moAlphaModFix.has()) - rPropMap.setProperty(SHAPEPROP_FillTransparency, static_cast<sal_Int16>(maBlipProps.moAlphaModFix.get() / PER_PERCENT)); + rPropMap.setProperty(SHAPEPROP_FillTransparency, static_cast<sal_Int16>(100 - (maBlipProps.moAlphaModFix.get() / PER_PERCENT))); } break; diff --git a/sw/qa/extras/ooxmlimport/data/tdf100830.docx b/sw/qa/extras/ooxmlimport/data/tdf100830.docx Binary files differindex a51b89026340..6c432179073c 100644..100755 --- a/sw/qa/extras/ooxmlimport/data/tdf100830.docx +++ b/sw/qa/extras/ooxmlimport/data/tdf100830.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 59a015b15fc7..417af4860b53 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -3248,7 +3248,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf99140, "tdf99140.docx") DECLARE_OOXMLIMPORT_TEST(testTdf100830, "tdf100830.docx") { // FillTransparence wasn't imported, this was 0. - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(50), getProperty<sal_Int16>(getShape(1), "FillTransparence")); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(30), getProperty<sal_Int16>(getShape(1), "FillTransparence")); } CPPUNIT_PLUGIN_IMPLEMENT(); |