diff options
| author | Mark Hung <marklh9@gmail.com> | 2015-01-24 06:50:03 -0800 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-06-08 05:30:33 +0000 |
| commit | 7f605eb84c2b647a87b9bd96ca91c3170b3c84e6 (patch) | |
| tree | a9cd18caf4fe58018aef9cfee467351778d9680d | |
| parent | d23245424d872540345beb0aff2aa4b3784e056e (diff) | |
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@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@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/outline-num-none.odt | bin | 0 -> 9052 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/outline-num-none.odt b/sw/qa/extras/ooxmlexport/data/outline-num-none.odt Binary files differnew file mode 100644 index 000000000000..b3bb56d5cfa5 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/outline-num-none.odt diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index e43cf9002e55..ac4b246d474f 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 171d08c0383a..873d0f986ad2 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; } |