From 358666e4204364ce915ee95372dc6f2fca545253 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 28 Sep 2015 09:03:13 +0200 Subject: tdf#90153 DOCX import: fix default sw TextFrame roundtrip The AnchorType of the shape was at-paragraph, which does not allow line-level VertOrientRelation (which is correct, it would be undefined, what line of the paragraph should be the used). Fix this by changing the AnchorType to at-character in the line-level case, which brings the filter in sync with the DOC one. With this, import of a DOCX file that was created by inserting a TextFrame into an empty document is roundtripped without shifting the shape up considerably. Change-Id: I6d85c38be859d6e730584f2349c857b87496a1d4 --- sw/qa/extras/ooxmlimport/data/tdf90153.docx | Bin 0 -> 4856 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/tdf90153.docx (limited to 'sw') diff --git a/sw/qa/extras/ooxmlimport/data/tdf90153.docx b/sw/qa/extras/ooxmlimport/data/tdf90153.docx new file mode 100644 index 000000000000..decbfa29d3b9 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf90153.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 4f41751722df..b85af749d8b3 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2840,6 +2840,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf92124, "tdf92124.docx") CPPUNIT_ASSERT(aSuffix.isEmpty()); } +DECLARE_OOXMLIMPORT_TEST(testTdf90153, "tdf90153.docx") +{ + // This was at-para, so the line-level VertOrientRelation was lost, resulting in an incorrect vertical position. + CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, getProperty(getShape(1), "AnchorType")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit