sw/qa/extras/ooxmlexport/data/FDO74106.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 ++++++++
sw/source/filter/ww8/docxattributeoutput.cxx | 1 +
writerfilter/source/dmapper/ConversionHelper.cxx | 5 ++++-
4 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 1f34909fd74d9c58648e19aca76615d73f546e57
Author: Rohit Deshmukh <rohit.deshm...@synerzip.com>
Date: Mon Jan 27 15:46:37 2014 +0530
fdo#74106: Fix for Hebrew Text-Bulleted List converted to Numbered List
Problem:
Hebrew Text-Bulleted List converted to Numbered List in round trip file
Implementaion:
- Added Hebrew support for import and export for list.
- Added Unit test case.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7693
Change-Id: I739f4b74fb0451f6da80be06114c48074d1e4cdf
diff --git a/sw/qa/extras/ooxmlexport/data/FDO74106.docx
b/sw/qa/extras/ooxmlexport/data/FDO74106.docx
new file mode 100644
index 0000000..3b62573
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/FDO74106.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 818569e..5ea7e83 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2995,6 +2995,14 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73541,"fdo73541.docx")
assertXPath(pXmlDoc, "/w:settings/w:mirrorMargins");
}
+DECLARE_OOXMLEXPORT_TEST(testFDO74106, "FDO74106.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
+ if (!pXmlDoc)
+ return;
+ assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt",
"val","hebrew1");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 87b1c6e..1884294 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3870,6 +3870,7 @@ static OString impl_NumberingType( sal_uInt16
nNumberingType )
case SVX_NUM_BITMAP:
case SVX_NUM_CHAR_SPECIAL: aType = "bullet"; break;
+ case style::NumberingType::CHARS_HEBREW: aType = "hebrew1"; break;
default: aType = "none"; break;
}
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index c39859d..fb5071c 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -377,6 +377,10 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
case NS_ooxml::LN_Value_ST_NumberFormat_chineseLegalSimplified:
nRet = style::NumberingType::NUMBER_UPPER_ZH;
break;
+ case NS_ooxml::LN_Value_ST_NumberFormat_hebrew1:
+ //91726
+ nRet = style::NumberingType::CHARS_HEBREW;
+ break;
default: nRet = style::NumberingType::ARABIC;
}
/* TODO: Lots of additional values are available - some are supported in the
I18 framework
@@ -402,7 +406,6 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
NS_ooxml::LN_Value_ST_NumberFormat_vietnameseCounting = 91721;
NS_ooxml::LN_Value_ST_NumberFormat_numberInDash = 91725;
NS_ooxml::LN_Value_ST_NumberFormat_arabicAbjad:
- NS_ooxml::LN_Value_ST_NumberFormat_hebrew1 = 91726;
NS_ooxml::LN_Value_ST_NumberFormat_hindiConsonants = 91731;
NS_ooxml::LN_Value_ST_NumberFormat_hindiNumbers = 91732;
NS_ooxml::LN_Value_ST_NumberFormat_hindiCounting = 91733;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
