diff options
-rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf115719.docx | bin | 11905 -> 18335 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf123243.docx | bin | 0 -> 11905 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 7 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf115719b.docx | bin | 16677 -> 19861 bytes | |||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 5 |
5 files changed, 10 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf115719.docx b/sw/qa/extras/ooxmlexport/data/tdf115719.docx Binary files differindex 9519a2a14524..f98f8b4a05dc 100644 --- a/sw/qa/extras/ooxmlexport/data/tdf115719.docx +++ b/sw/qa/extras/ooxmlexport/data/tdf115719.docx diff --git a/sw/qa/extras/ooxmlexport/data/tdf123243.docx b/sw/qa/extras/ooxmlexport/data/tdf123243.docx Binary files differnew file mode 100644 index 000000000000..9519a2a14524 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf123243.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index c277b9efc4dd..9b1dd0627cb0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -292,6 +292,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf115719, "tdf115719.docx") CPPUNIT_ASSERT_EQUAL(2, getPages()); } +DECLARE_OOXMLEXPORT_TEST(testTdf123243, "tdf123243.docx") +{ + // Without the accompanying fix in place, this test would have failed with 'Expected: 1; Actual: + // 2'; i.e. unexpected paragraph margin created 2 pages. + CPPUNIT_ASSERT_EQUAL(1, getPages()); +} + DECLARE_OOXMLEXPORT_TEST(testTdf116410, "tdf116410.docx") { // Opposite of the above, was 2 pages, should be 1 page. diff --git a/sw/qa/extras/ooxmlimport/data/tdf115719b.docx b/sw/qa/extras/ooxmlimport/data/tdf115719b.docx Binary files differindex 551b9871fe60..8c552baf76c1 100644 --- a/sw/qa/extras/ooxmlimport/data/tdf115719b.docx +++ b/sw/qa/extras/ooxmlimport/data/tdf115719b.docx diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index ea4b40e28438..f1a28bedfc4e 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1273,8 +1273,9 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& std::vector<AnchoredObjectInfo>& rAnchoredObjectAnchors = rDM_Impl.m_aAnchoredObjectAnchors; for (auto& rAnchor : rAnchoredObjectAnchors) { - // Ignore this paragraph when there is a single shape only. - if (rAnchor.m_aAnchoredObjects.size() < 2) + // Ignore this paragraph when there are not enough shapes to trigger the Word bug we + // emulate. + if (rAnchor.m_aAnchoredObjects.size() < 4) continue; // Analyze the anchored objects of this paragraph, now that we know the |