diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-03-04 09:13:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-04-02 12:57:21 +0200 |
| commit | 5c397440529bbfd997a3fd75f64c4e4e78fc80ac (patch) | |
| tree | 4beafd61deff7fc66ba4fa69bff04f3e3b1ee228 /writerfilter | |
| parent | aa258391ecc86dad47a52f51fdaf773dbe9ca6f5 (diff) | |
sw padded numbering: add DOCX filter
DOCX uses <w:numFmt w:val="decimalZero"/> for this.
(cherry picked from commit 5435ea2afc5da5633a440f2f06d79265bcbb040c)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
writerfilter/source/dmapper/ConversionHelper.cxx
Change-Id: I12a4a88f472af42a04244d30f9e59fc0b8b4855c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91503
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/ConversionHelper.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 996c284f1779..c0eaf005d4dd 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -585,6 +585,9 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt) case NS_ooxml::LN_Value_ST_NumberFormat_chicago: nRet = style::NumberingType::SYMBOL_CHICAGO; break; + case NS_ooxml::LN_Value_ST_NumberFormat_decimalZero: + nRet = style::NumberingType::ARABIC_ZERO; + break; default: nRet = style::NumberingType::ARABIC; } /* TODO: Lots of additional values are available - some are supported in the I18 framework @@ -593,7 +596,6 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt) NS_ooxml::LN_Value_ST_NumberFormat_decimalHalfWidth = 91692; NS_ooxml::LN_Value_ST_NumberFormat_japaneseDigitalTenThousand = 91694; NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedCircle = 91695; - NS_ooxml::LN_Value_ST_NumberFormat_decimalZero = 91699; NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedFullstop = 91703; NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedParen = 91704; NS_ooxml::LN_Value_ST_NumberFormat_ideographZodiacTraditional = 91709; |