diff options
| author | Justin Luth <justin_luth@sil.org> | 2018-05-12 20:53:45 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2018-05-24 05:36:53 +0200 |
| commit | 8d42de21c10bfefeaffabc5c939e7830a09f7dca (patch) | |
| tree | 3ac7f116d03c2e93c6107b5c42652726e5a0252d /sw | |
| parent | 6fecbff9810ae9afc2de8c4d5e9e8a8a511d1f2d (diff) | |
revert tdf#76817 ooxmlimport: connect Heading to existing numbers
tdf#50774 has an example document which was broken by 6.1 commit
8e9e705de29a1a3d9b964c9350aa2a3a17cce6f9.
Reverting does a couple of things:
-go back to previous behaviour (right or wrong) - no regression.
-gives an opportunity to find documents broken by reverting -
i.e. it will give an indication as to which state has more broken
docs. Can be re-visited in 6.2.
-gives me an option to escape from this horrible mess without causing
a regression in a production release of LO.
Change-Id: Ib594b76d5533a0c4807cf70ef706c107e52cddcf
Reviewed-on: https://gerrit.libreoffice.org/54293
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 0442456cd8c8..0dc6ebe65b20 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -348,10 +348,13 @@ DECLARE_OOXMLEXPORT_TEST(testNumberingFont, "numbering-font.docx") DECLARE_OOXMLEXPORT_TEST(testTdf106541_noinheritChapterNumbering, "tdf106541_noinheritChapterNumbering.odt") { - // in LO, it appears that styles based on the Chapter Numbering style explicitly sets the - // numbering style/outline level to 0 by default, and prevents inheriting directly from "Outline" style. + // in LO, it appears that styles based on the Chapter Numbering style explicitly set the + // numbering style/outline level to 0 by default, and that LO prevents inheriting directly from "Outline" style. // Adding this preventative unit test to ensure that any fix for tdf106541 doesn't make incorrect assumptions. - CPPUNIT_ASSERT_EQUAL(OUString("Outline"), getProperty<OUString>(getParagraph(1), "NumberingStyleName")); + +//reverting tdf#76817 hard-codes the numbering style on the paragraph, preventing RT of "Outline" style +// CPPUNIT_ASSERT_EQUAL(OUString("Outline"), getProperty<OUString>(getParagraph(1), "NumberingStyleName")); + OUString sPara3NumberingStyle = getProperty<OUString>(getParagraph(3), "NumberingStyleName"); CPPUNIT_ASSERT_EQUAL(sPara3NumberingStyle, getProperty<OUString>(getParagraph(4), "NumberingStyleName")); @@ -719,7 +722,9 @@ DECLARE_OOXMLEXPORT_TEST(testOOxmlOutlineNumberTypes, "outline-number-types.odt" DECLARE_OOXMLEXPORT_TEST(testNumParentStyle, "num-parent-style.docx") { - CPPUNIT_ASSERT_EQUAL(OUString("Outline"), getProperty<OUString>(getParagraph(4), "NumberingStyleName")); +//reverting tdf#76817 hard-codes the numbering style on the paragraph, preventing RT of "Outline" style +//I think this unit test is wrong, but I will revert to its original claim. + CPPUNIT_ASSERT(getProperty<OUString>(getParagraph(4), "NumberingStyleName").startsWith("WWNum")); } DECLARE_OOXMLEXPORT_TEST(testNumOverrideLvltext, "num-override-lvltext.docx") |