summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ooxmlimport
diff options
context:
space:
mode:
authorlbenes <lukebenes@hotmail.com>2016-10-06 15:57:22 -0400
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-10-07 07:07:19 +0000
commitade43e6a86e4f864e771f4b3008a428bc10fa55f (patch)
treec67c4b078578e2501cfbfd51657b064ba1b77479 /sw/qa/extras/ooxmlimport
parentbf25013d4332dd7ed18f591e1d8c0e9591b0a8a7 (diff)
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 <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
-rwxr-xr-x[-rw-r--r--]sw/qa/extras/ooxmlimport/data/tdf100830.docxbin14219 -> 22171 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx2
2 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf100830.docx b/sw/qa/extras/ooxmlimport/data/tdf100830.docx
index a51b89026340..6c432179073c 100644..100755
--- a/sw/qa/extras/ooxmlimport/data/tdf100830.docx
+++ b/sw/qa/extras/ooxmlimport/data/tdf100830.docx
Binary files 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<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();