tdf#87574 - Outline numbering "None" is not retained in docx

Partially revert commit d30a8ec4
(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

Change-Id: I0876ecd982cfd8d97887495b23af0e0370821101

sw/qa/extras/ooxmlexport/ooxmlexport.cxx

@@ -610,6 +610,12 @@ DECLARE_OOXMLEXPORT_TEST(testOoxmlNumListZHCN, "numlist-zhcn.odt")
     assertXPath ( pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt","val","chineseCountingThousand" );
 }
 
+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.

sw/source/filter/ww8/docxattributeoutput.cxx

@@ -5591,7 +5591,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;
 }