From ade43e6a86e4f864e771f4b3008a428bc10fa55f Mon Sep 17 00:00:00 2001 From: lbenes Date: Thu, 6 Oct 2016 15:57:22 -0400 Subject: tdf#102997 Fix Error in OOXML Transparency Conversion Math This fixes the import logic for tdf#100830 to handle transparencies other than 50%. Change-Id: If4e2e369a9674488878bb0a4378d48292ea4e0cb Reviewed-on: https://gerrit.libreoffice.org/29581 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- sw/qa/extras/ooxmlimport/data/tdf100830.docx | Bin 14219 -> 22171 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 sw/qa/extras/ooxmlimport/data/tdf100830.docx (limited to 'sw/qa') diff --git a/sw/qa/extras/ooxmlimport/data/tdf100830.docx b/sw/qa/extras/ooxmlimport/data/tdf100830.docx old mode 100644 new mode 100755 index a51b89026340..6c432179073c Binary files a/sw/qa/extras/ooxmlimport/data/tdf100830.docx and b/sw/qa/extras/ooxmlimport/data/tdf100830.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 8752ee07473f..f42f1e61f507 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -3297,7 +3297,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(50), getProperty(getShape(1), "FillTransparence")); + CPPUNIT_ASSERT_EQUAL(static_cast(30), getProperty(getShape(1), "FillTransparence")); } CPPUNIT_PLUGIN_IMPLEMENT(); -- cgit v1.2.3