summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-05-16 15:57:09 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-05-16 16:32:17 +0200
commite25bdf7f602ce7d3d941c07b8c1cf5740e2b0a85 (patch)
treea9396bf544905f68bb70859222dd12e808fd79e6 /sw
parente0d94ef4447734b27d15c50fdcea09d8200b2efe (diff)
DOCX import: make sure inline shapes are not in the background
Change-Id: I80d684662ac3f94bff4448fcdae94f9e69fd1590
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlimport/data/inline-groupshape.docxbin0 -> 16992 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/inline-groupshape.docx b/sw/qa/extras/ooxmlimport/data/inline-groupshape.docx
new file mode 100644
index 000000000000..def5a05b40e4
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/inline-groupshape.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5c08d7a72f70..3e2f2ac7d3a8 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2120,6 +2120,12 @@ DECLARE_OOXMLIMPORT_TEST(testChartSize, "chart-size.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(6008), getProperty<sal_Int32>(xEmbeddedObjects->getByIndex(0), "Width"));
}
+DECLARE_OOXMLIMPORT_TEST(testInlineGroupshape, "inline-groupshape.docx")
+{
+ // Inline groupshape was in the background, so it was hidden sometimes by other shapes.
+ CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), "Opaque"));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();