[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source

[Mark Hung]

 sw/qa/extras/ooxmlexport/data/outline-num-none.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx           |    6 ++++++
 sw/source/filter/ww8/docxattributeoutput.cxx       |    2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7f605eb84c2b647a87b9bd96ca91c3170b3c84e6
Author: Mark Hung <marklh9 at gmail.com>
Date:   Sat Jan 24 06:50:03 2015 -0800

    tdf#87574 - Outline numbering "None" is not retained in docx
    
    Partially revert commit d30a8ec448bcd08c6a52a37d6ae41a4b71c235da
    (Correct number format mapping for CJK numbered lists in rtf/doc/docx
    filters., 2014-11-04).
    
    Conflicts:
    	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
    Reviewed on:
    	https://gerrit.libreoffice.org/14211
    
    (cherry picked from commit 7f126fc8570da5c7275a4d4efe019b9ea3b5b073)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>
    
    Conflicts:
    	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
    
    Change-Id: I0876ecd982cfd8d97887495b23af0e0370821101
    Reviewed-on: https://gerrit.libreoffice.org/16145
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/qa/extras/ooxmlexport/data/outline-num-none.odt b/sw/qa/extras/ooxmlexport/data/outline-num-none.odt
new file mode 100644
index 0000000..b3bb56d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/outline-num-none.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e43cf90..ac4b246 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -584,6 +584,12 @@ DECLARE_OOXMLEXPORT_TEST(testOoxmlCjklist35, "cjklist35.docx")
     CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_LOWER_ZH, numFormat);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testOOxmlOutlineNumNone, "outline-num-none.odt")
+{
+    if (xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"))
+        assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt", "val", "none");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testNumParentStyle, "num-parent-style.docx")
 {
     // This was "Outline", i.e. <w:numId> was not imported from the Heading 2 paragraph style.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 171d08c..873d0f9 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5582,7 +5582,7 @@ static OString impl_LevelNFC( sal_uInt16 nNumberingType , const SfxItemSet *pOut
         case style::NumberingType::NUMBER_HANGUL_KO: aType="koreanDigital";break;
         case style::NumberingType::NUMBER_UPPER_KO: aType="koreanLegal"; break;
         default:
-            aType = "decimal";        break;
+            aType = "none";        break;
     }
     return aType;
 }