diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-18 09:19:50 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-08 11:56:05 +0100 |
| commit | b80c870446bd0e881a783a41f1450a39a80ba5f5 (patch) | |
| tree | 8d84be804f9f6edbb8dbe575dcb4beb37a435273 /sw/qa/extras | |
| parent | af6d32101f225c50c26141e1f2fcc5b2fe55f91f (diff) | |
tdf#95031 DOCX import: auto spacing inside numbering means no spacing
The WW8 import has code for this in SwWW8ImplReader::AppendTextNode(),
with lots of corner-cases. Not all of that is implemented here yet, but
the bullet list in the bugdoc already looks correct now.
(cherry picked from commit c486e875de7c8e845594f5043a37ee8800865782)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
Reviewed-on: https://gerrit.libreoffice.org/30291
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 806e323271982c8975ec2904219c6f136aa20eea)
Change-Id: I9499bfa4d8d7fcc425d7b95e64987258c099f7f2
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf95031.docx | bin | 0 -> 14024 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf95031.docx b/sw/qa/extras/ooxmlexport/data/tdf95031.docx Binary files differnew file mode 100644 index 000000000000..ef082f752038 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf95031.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 54eed4d5fcee..764ddb026361 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -1126,6 +1126,13 @@ DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") #endif } +DECLARE_OOXMLEXPORT_TEST(testTdf95031, "tdf95031.docx") +{ + // This was 494, in-numbering paragraph's automating spacing was handled as visible spacing, while it should not. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), getProperty<sal_Int32>(getParagraph(2), "ParaBottomMargin")); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), getProperty<sal_Int32>(getParagraph(3), "ParaTopMargin")); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); |