Attachment 153096 Details for Bug 120394 – numbering_sNumStringEmpty.patch: close, but not general enough patch

[patch] numbering_sNumStringEmpty.patch: close, but not general enough patch

numbering_sNumStringEmpty.patch (text/plain), 1.73 KB, created by Justin L on 2019-08-01 18:54:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Justin L

Created: 2019-08-01 18:54:33 UTC

Size: 1.73 KB

patch

obsolete

>diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx
>index ba99e05..2a54d44 100644
>--- a/sw/qa/extras/ww8export/ww8export3.cxx
>+++ b/sw/qa/extras/ww8export/ww8export3.cxx
>@@ -197,6 +197,16 @@ DECLARE_WW8EXPORT_TEST(testTdf94009_zeroPgMargin, "tdf94009_zeroPgMargin.odt")
>     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(defaultStyle, "TopMargin"));
> }
> 
>+DECLARE_WW8EXPORT_TEST(testTdf120394_emptyNumString, "tdf120394_emptyNumString.doc")
>+{
>+    //sal_Int16   numFormat = getNumberingTypeOfParagraph(2);
>+    // If this needs to be returned to ::ARABIC, at least make sure IJKL: is not preceeded by something visible.
>+    //CPPUNIT_ASSERT(style::NumberingType::ARABIC == numFormat);
>+
>+    //xmlDocPtr pDump = parseLayoutDump();
>+    //assertXPath(pDump, "/root/page[1]/body/txt[5]/Special", "rText", "1.2.1");
>+}
>+
> DECLARE_WW8EXPORT_TEST(testTdf120711_joinedParagraphWithChangeTracking, "tdf120711.doc")
> {
>     sal_Int16   numFormat = getNumberingTypeOfParagraph(5);
>diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
>index 5b79f98..ce5b413 100644
>--- a/sw/source/filter/ww8/ww8par3.cxx
>+++ b/sw/source/filter/ww8/ww8par3.cxx
>@@ -894,6 +894,13 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet
>          number indexes from the aOfsNumsXCH then placeholders remain in
>          sNumString which must not be copied into the final numbering strings
>         */
>+
>+        // Without any string, nothing should be displayed
>+        if ( sNumString.isEmpty() && sPrefix.isEmpty() && sPostfix.isEmpty() )
>+        {
>+            nType = SVX_NUM_CHAR_SPECIAL;
>+            cBullet = 0x200B; //Zero width space
>+        }
>     }
> 
>     switch( aLVL.nAlign )

Actions: View

Attachments on bug 120394: 145455 | 145456 | 150798 | 151040 | 151041 | 153096 | 162335