summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-11-27 15:22:44 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-11-27 15:32:19 +0100
commit8518cf42f48cdf07ad14681cb19f476438542236 (patch)
treed7a5fc70751760bc3995f27803248801a1002d45 /sw
parent289e54feabc936b8175327355a159073830a326a (diff)
DOCX drawingML shape import: fix position of group shapes
Change-Id: Ib5db40ecd5782d729d406b285d3399cc2626e335
Diffstat (limited to 'sw')
-rwxr-xr-xsw/qa/extras/ooxmlimport/data/wpg-only.docxbin0 -> 13503 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx7
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/wpg-only.docx b/sw/qa/extras/ooxmlimport/data/wpg-only.docx
new file mode 100755
index 000000000000..7c86361f9d34
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/wpg-only.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 69beb44e2055..853c3169a43e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1548,6 +1548,13 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly, "textbox-wps-only.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(2805), getProperty<sal_Int32>(xFrame, "VertOrientPosition"));
}
+DECLARE_OOXMLIMPORT_TEST(testWpgOnly, "wpg-only.docx")
+{
+ uno::Reference<drawing::XShape> xShape = getShape(1);
+ // Check position, it was nearly 0. This is a shape, so use getPosition(), not a property.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(548005)), xShape->getPosition().X);
+}
+
DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx")
{
// The document contains a rotated bitmap