diff options
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf103664.docx | bin | 0 -> 11444 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 19 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 |
3 files changed, 21 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf103664.docx b/sw/qa/extras/ooxmlimport/data/tdf103664.docx Binary files differnew file mode 100644 index 000000000000..4d299a66ea0a --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf103664.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 417af4860b53..13c84379f4b7 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -81,6 +81,7 @@ #include <comphelper/propertysequence.hxx> #include <svx/svdpage.hxx> #include <com/sun/star/drawing/HomogenMatrix3.hpp> +#include <com/sun/star/awt/CharSet.hpp> #include <bordertest.hxx> @@ -3251,6 +3252,24 @@ DECLARE_OOXMLIMPORT_TEST(testTdf100830, "tdf100830.docx") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(30), getProperty<sal_Int16>(getShape(1), "FillTransparence")); } +DECLARE_OOXMLIMPORT_TEST(testTdf103664, "tdf103664.docx") +{ + // Wingdings symbols were displayed as rectangles + uno::Reference<text::XTextRange> xPara(getParagraph(1)); + CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf020), xPara->getString()[0] ); + CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0fc), xPara->getString()[1] ); + CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf0dc), xPara->getString()[2] ); + CPPUNIT_ASSERT_EQUAL(sal_Unicode(0xf081), xPara->getString()[3] ); + + uno::Reference<beans::XPropertySet> xRun(getRun(xPara,1), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontName")); + CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontNameAsian")); + CPPUNIT_ASSERT_EQUAL(OUString("Wingdings"), getProperty<OUString>(xRun, "CharFontNameComplex")); + + // Make sure these special characters are imported as symbols + CPPUNIT_ASSERT_EQUAL(awt::CharSet::SYMBOL, getProperty<sal_Int16>(xRun, "CharFontCharSet")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index c39208b7c619..e3098709d3da 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -62,6 +62,7 @@ #include <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/text/FontEmphasis.hpp> +#include <com/sun/star/awt/CharSet.hpp> #include <comphelper/types.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/sequence.hxx> @@ -2649,6 +2650,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) rContext->Insert(PROP_CHAR_FONT_NAME, aVal); rContext->Insert(PROP_CHAR_FONT_NAME_ASIAN, aVal); rContext->Insert(PROP_CHAR_FONT_NAME_COMPLEX, aVal); + rContext->Insert(PROP_CHAR_FONT_CHAR_SET, uno::makeAny(awt::CharSet::SYMBOL)); utext( reinterpret_cast < const sal_uInt8 * >( &(aSymbolData.cSymbol) ), 1 ); } } |