diff options
| -rw-r--r-- | sw/qa/extras/ww8export/data/cp1000039.doc | bin | 22016 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 5 |
3 files changed, 0 insertions, 11 deletions
diff --git a/sw/qa/extras/ww8export/data/cp1000039.doc b/sw/qa/extras/ww8export/data/cp1000039.doc Binary files differdeleted file mode 100644 index 70cad3c244b9..000000000000 --- a/sw/qa/extras/ww8export/data/cp1000039.doc +++ /dev/null diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index d3d87332f48e..a89798408c3c 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -347,12 +347,6 @@ DECLARE_WW8EXPORT_TEST(testCp1000044, "cp1000044.doc") CPPUNIT_ASSERT_EQUAL(false, bool(xStorable->isReadonly())); } -DECLARE_WW8EXPORT_TEST(testCp1000039, "cp1000039.doc") -{ - // This was RTL_TEXTENCODING_SYMBOL, causing "1" rendered as a placeholder rectangle. - CPPUNIT_ASSERT_EQUAL(sal_Int16(RTL_TEXTENCODING_DONTKNOW), getProperty<sal_Int16>(getRun(getParagraph(1), 1), "CharFontCharSet")); -} - DECLARE_WW8EXPORT_TEST(testBorderColours, "bordercolours.doc") { // The following 6 colours can only be represented with WW9 (Word 2000) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 11850a08f24f..f28b3a832d22 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3467,11 +3467,6 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, FontFamily& reFamily, reCharSet = rtl_getTextEncodingFromWindowsCharset( pF->chs ); } - // Make sure charset is not set in case of Symbol, otherwise in case a - // character is missing in our OpenSymbol, the character won't be replaced. - if (reCharSet == RTL_TEXTENCODING_SYMBOL && rName == "Symbol") - reCharSet = RTL_TEXTENCODING_DONTKNOW; - // make sure Font Family Code is set correctly // at least for the most important fonts // ( might be set wrong when Doc was not created by |