summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2024-03-05 20:19:09 -0500
committerMiklos Vajna <vmiklos@collabora.com>2024-03-11 09:47:18 +0100
commit14451b801029e8efc05d7f777692a91eddab9e16 (patch)
tree94b2df9ef00ab36641012a4f1ca77f8014734c0b /sw
parent8dcc7c73999727a5a5e5577d6d48f43f403e2995 (diff)
tdf#160049 dml shape import: use margins with left/right HoriOrientRel
make CppunitTest_sw_ooxmlexport21 \ CPPUNIT_TEST_NAME=testTdf160049_anchorMargin Change-Id: I3e2df2037cabfedbb6df6b8c8257e90baeaab96e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164445 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164584 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin2.docxbin0 -> 79678 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport21.cxx10
2 files changed, 10 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin2.docx b/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin2.docx
new file mode 100644
index 000000000000..349ed4cbeea7
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf160049_anchorMargin2.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
index d57c94835e4b..61c1b3172d19 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
@@ -302,6 +302,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf160049_anchorMarginVML, "tdf160049_anchorMarginV
getProperty<sal_Int16>(getShape(1), "HoriOrientRelation"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf160049_anchorMargin2, "tdf160049_anchorMargin2.docx")
+{
+ // given a DML compat14 (Word 2010) document with a LEFT "column/text" anchored shape
+
+ // The shape takes into account the margin, so it looks like it is in the middle of the doc,
+ // which is "Paragraph text area"/PRINT_AREA/1, not "Entire paragraph area"/FRAME/0
+ CPPUNIT_ASSERT_EQUAL(css::text::RelOrientation::PRINT_AREA,
+ getProperty<sal_Int16>(getShape(1), "HoriOrientRelation"));
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf160049_anchorMargin15, "tdf160049_anchorMargin15.docx")
{
// given a DML compat15 (Word 2013) document with a LEFT "column/text" anchored image