From 1501df419ea4d40358d705a281fd9662088ba51e Mon Sep 17 00:00:00 2001 From: László Németh Date: Fri, 4 May 2018 00:56:39 +0200 Subject: tdf#117171 DOCX export/import of cardinalText, ordinalText MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and ordinal (indicator) numbering styles. Change-Id: Ia4030c8a170bad67e0b52ec685a49faa77552ccf Reviewed-on: https://gerrit.libreoffice.org/53831 Tested-by: Jenkins Reviewed-by: László Németh --- writerfilter/source/dmapper/ConversionHelper.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index d2311e46713a..f4eddffc2625 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -485,7 +485,7 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt) nRet = style::NumberingType::ROMAN_LOWER; break; case NS_ooxml::LN_Value_ST_NumberFormat_ordinal: - nRet = style::NumberingType::ARABIC; + nRet = style::NumberingType::TEXT_NUMBER; break; case NS_ooxml::LN_Value_ST_NumberFormat_bullet: nRet = style::NumberingType::CHAR_SPECIAL; @@ -576,12 +576,15 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt) case NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth2: nRet = style::NumberingType::FULLWIDTH_ARABIC; break; + case NS_ooxml::LN_Value_ST_NumberFormat_cardinalText: + nRet = style::NumberingType::TEXT_CARDINAL; + break; + case NS_ooxml::LN_Value_ST_NumberFormat_ordinalText: + nRet = style::NumberingType::TEXT_ORDINAL; + break; default: nRet = style::NumberingType::ARABIC; } /* TODO: Lots of additional values are available - some are supported in the I18 framework - NS_ooxml::LN_Value_ST_NumberFormat_ordinal = 91682; - NS_ooxml::LN_Value_ST_NumberFormat_cardinalText = 91683; - NS_ooxml::LN_Value_ST_NumberFormat_ordinalText = 91684; NS_ooxml::LN_Value_ST_NumberFormat_hex = 91685; NS_ooxml::LN_Value_ST_NumberFormat_chicago = 91686; NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth = 91691; -- cgit