summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-10-04 09:24:42 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-10-04 09:45:04 +0000
commitecfcee8b05e45ec82dec6ed417e9ac53d4d7b4ff (patch)
tree2423df531726915c528f98c3faf283d06d18d887 /sw
parentbe014c218d81b228784764e280baa25750e7adb7 (diff)
tdf#100830 drawingML import: handle <a:alphaModFix>
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 <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlimport/data/tdf100830.docxbin0 -> 14219 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx6
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf100830.docx b/sw/qa/extras/ooxmlimport/data/tdf100830.docx
new file mode 100644
index 000000000000..a51b89026340
--- /dev/null
+++ 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 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<sal_Int16>(xTableProperties, "HoriOrient"));
}
+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_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */