diff options
author | Justin Luth <justin_luth@sil.org> | 2021-06-26 19:14:17 +0200 |
---|---|---|
committer | Justin Luth <justin_luth@sil.org> | 2021-06-28 21:01:18 +0200 |
commit | e5ac6caf9efa3d3a8cb82dbc59ef00b193facdc4 (patch) | |
tree | 384bceb3259b1259dd5996f78a9bb0da65c4122e /sw/qa/extras/ww8export | |
parent | 4ad110677be8c9b89524a0cbe1690778b3db032e (diff) |
tdf#104239 doc import: fix chose m_pChosenWW8OutlineStyle carefully
I mis-placed the cancel test.
In the previous place, that only worked if the FIRST instance
of the style was bad. My intention was to prevent if ANY
use of the numbering style could cause problems.
tdf#75748 had the document I had been developing the fix for.
Change-Id: I75286b943b7fca56ea43f79a49d68a351f6d0e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117966
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/qa/extras/ww8export')
-rw-r--r-- | sw/qa/extras/ww8export/data/tdf75748_inheritChapterNumberingC.doc | bin | 0 -> 25088 bytes | |||
-rw-r--r-- | sw/qa/extras/ww8export/ww8export3.cxx | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf75748_inheritChapterNumberingC.doc b/sw/qa/extras/ww8export/data/tdf75748_inheritChapterNumberingC.doc Binary files differnew file mode 100644 index 000000000000..7f393612cab7 --- /dev/null +++ b/sw/qa/extras/ww8export/data/tdf75748_inheritChapterNumberingC.doc diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx index abbf414dc01d..9ccf3ea19a31 100644 --- a/sw/qa/extras/ww8export/ww8export3.cxx +++ b/sw/qa/extras/ww8export/ww8export3.cxx @@ -822,6 +822,12 @@ DECLARE_WW8EXPORT_TEST(testTdf106541_inheritChapterNumberingB, "tdf106541_inheri CPPUNIT_ASSERT_EQUAL(OUString("1.1"), getProperty<OUString>(xPara, "ListLabelString")); } +DECLARE_WW8EXPORT_TEST(testTdf75748_inheritChapterNumberingC, "tdf75748_inheritChapterNumberingC.doc") +{ + uno::Reference<beans::XPropertySet> xPara(getParagraph(5, "Inherited from Heading 3"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("II.B.1."), getProperty<OUString>(xPara, "ListLabelString")); +} + DECLARE_WW8EXPORT_TEST(testTdf104239_chapterNumberTortureTest, "tdf104239_chapterNumberTortureTest.doc") { // There is no point in identifying what the wrong values where in this test, |