summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-01-23 13:34:34 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-23 15:30:11 +0100
commit6063555744ed89d8a757b667cddcdd4357839466 (patch)
tree943e35b211c85a732614e439280f7732306711bf /sw
parent30a561c0082d98c195caaa255c50fb6f0f679cc1 (diff)
drawingML export: fix position of shape in case rotation is 180 degrees
This is the other case when position shouldn't be adjusted. Change-Id: I9265bf1c762fd519e3a12e97d767b5d213644e6d
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/data/dml-textshape.docxbin16496 -> 16554 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx4
2 files changed, 4 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/dml-textshape.docx b/sw/qa/extras/ooxmlexport/data/dml-textshape.docx
index b98eea79c054..28e39c29a9b2 100644
--- a/sw/qa/extras/ooxmlexport/data/dml-textshape.docx
+++ b/sw/qa/extras/ooxmlexport/data/dml-textshape.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c18277c376de..9ce53cb3d646 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2492,6 +2492,10 @@ DECLARE_OOXMLEXPORT_TEST(testDmlTextshape, "dml-textshape.docx")
// Connector was incorrectly shifted towards the top left corner, X was 552, Y was 0.
CPPUNIT_ASSERT_EQUAL(sal_Int32(4018), xShape->getPosition().X);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1256), xShape->getPosition().Y);
+
+ xShape.set(xGroup->getByIndex(5), uno::UNO_QUERY);
+ // This was incorrectly shifted towards the top of the page, Y was 106.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1016), xShape->getPosition().Y);
}
DECLARE_OOXMLEXPORT_TEST(testDrawinglayerPicPos, "drawinglayer-pic-pos.docx")