diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-04-16 15:23:17 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-04-16 15:23:17 +0200 |
| commit | 3abcc645bb0ab65ee994435439887898acdcb1d7 (patch) | |
| tree | d9f462fb3202a11777c8d5378942d8c9fbe57c84 | |
| parent | fd4fba569f2bd1dad2c80dbc944cc17e38b6f7f2 (diff) | |
bestFitOpenSymbolToMSFont() disable OpenSymbol replacement
Change-Id: Ia30d52bc2f04de8dbdde0a773834b224447877d0
| -rw-r--r-- | filter/source/msfilter/util.cxx | 4 | ||||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml1.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index a007c709b66a..7d5b1f4eae00 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -92,6 +92,7 @@ DateTime DTTM2DateTime( long lDTTM ) sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, rtl_TextEncoding& rChrSet, OUString& rFontName) { +#if 0 std::unique_ptr<StarSymbolToMSMultiFont> pConvert(CreateStarSymbolToMSMultiFont()); OUString sFont = pConvert->ConvertChar(cChar); pConvert.reset(); @@ -123,6 +124,9 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, rFontName = "Wingdings"; cChar = u'\x6C'; } +#endif + rFontName = "OpenSymbol"; + rChrSet = RTL_TEXTENCODING_UNICODE; return cChar; } diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 769bf6e52456..da0dac9c4fed 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -633,6 +633,7 @@ void SdOOXMLExportTest1::testBulletColor() void SdOOXMLExportTest1::testBulletCharAndFont() { +#if 0 ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/bulletCharAndFont.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -657,6 +658,7 @@ void SdOOXMLExportTest1::testBulletCharAndFont() } } xDocShRef->DoClose(); +#endif } void SdOOXMLExportTest1::testBulletMarginAndIndentation() diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index 467a6ce099b2..b2f88b44ad7c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -969,7 +969,8 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf94628, "tdf94628.docx") ->Value.get<OUString>(); // Actually for 'BLACK UPPER RIGHT TRIANGLE' is \u25E5 // But we use Wingdings 3 font here, so code is different - CPPUNIT_ASSERT_EQUAL(OUString(u"\uF07B"), sBulletChar); + //CPPUNIT_ASSERT_EQUAL(OUString(u"\uF07B"), sBulletChar); + CPPUNIT_ASSERT_EQUAL(OUString(u"\u25E5"), sBulletChar); } DECLARE_OOXMLEXPORT_TEST(testTdf122594, "tdf122594.docx") |