diff options
| author | Justin Luth <justin_luth@sil.org> | 2021-04-19 15:53:44 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-04-21 08:51:00 +0200 |
| commit | 3c230b0a440ab4d434c4ddabd6959fb1654b6eff (patch) | |
| tree | e6dc05b0e7cbe71148681dc5637a4b46c6ddc0fa /sw/qa | |
| parent | f2bbe8bbd543b931352cd4a7626ee2196f6f917d (diff) | |
tdf#94326 doc import: allow direct numbering to cancel outlineStyle
Prior to this, if a Chapter Numbering style was assigned
as the paragraph style, any direct numbering would have
been skipped.
In this unit test, DOC defines WW8Num2 as the
numbering style for the Heading styles.
LO copies this to its special "Outline" style.
So any direct formatting with WW8Num2 must be ignored.
However, any other numbering rules should be allowed,
and that is what this patch does.
Make sure that WW8Num2 can also be applied outside of
the Heading styles. (Unfortunately, the numbering
is probably broken since these are now considered
to be two different lists - unless someone has
connected them in the background some way.)
Change-Id: If29c8bbd096acc0edd6f1fe32cedc054f16460d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114298
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ww8export/data/tdf94326_notOutlineNumbering.doc | bin | 0 -> 40960 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export3.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/data/tdf94326_notOutlineNumbering.doc b/sw/qa/extras/ww8export/data/tdf94326_notOutlineNumbering.doc Binary files differnew file mode 100644 index 000000000000..2df22e9317c6 --- /dev/null +++ b/sw/qa/extras/ww8export/data/tdf94326_notOutlineNumbering.doc diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx index e525927579e3..f5ae1ced9481 100644 --- a/sw/qa/extras/ww8export/ww8export3.cxx +++ b/sw/qa/extras/ww8export/ww8export3.cxx @@ -745,6 +745,13 @@ CPPUNIT_TEST_FIXTURE(Test, testRtlGutter) verify(); } +DECLARE_WW8EXPORT_TEST(testTdf94326_notOutlineNumbering, "tdf94326_notOutlineNumbering.doc") +{ + // The directly applied numbering list must not be lost. + uno::Reference<beans::XPropertySet> xPara(getParagraph(2, u"ОБЩИЕ ПОЛОЖЕНИЯ"), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("1."), getProperty<OUString>(xPara, "ListLabelString")); +} + DECLARE_WW8EXPORT_TEST(testTdf120394, "tdf120394.doc") { CPPUNIT_ASSERT_EQUAL(1, getPages()); |