filter/source/msfilter/util.cxx | 4 ++++ sd/qa/unit/export-tests-ooxml1.cxx | 2 ++ solenv/gbuild/platform/com_GCC_defs.mk | 4 ++-- sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit 3abcc645bb0ab65ee994435439887898acdcb1d7 Author: Michael Stahl <[email protected]> AuthorDate: Fri Apr 16 15:23:17 2021 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Apr 16 15:23:17 2021 +0200 bestFitOpenSymbolToMSFont() disable OpenSymbol replacement Change-Id: Ia30d52bc2f04de8dbdde0a773834b224447877d0 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") commit fd4fba569f2bd1dad2c80dbc944cc17e38b6f7f2 Author: Michael Stahl <[email protected]> AuthorDate: Sat Feb 27 22:30:41 2021 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Fri Apr 16 12:10:10 2021 +0200 gbuild: don't use -Wunused-macros with sccache In at least soltools, jurt and gperf generated files, build with GCC and sccache 0.2.16-alpha.0 reports spurious -Werror=implicit-fallthrough= due to comments and these go away by configuring sccache with rewrite_includes_only = true. But his results in cc1: error: ‘-fdirectives-only’ is incompatible with ‘-Wunused-macros’ so disable that like for clang-with-icecream builds. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111716 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 6fb9f368c6824a8ff7bc5bc5cf66fc2df7d055b7) Change-Id: I6dec38e86aa6e22591d7a700a8daddf3fed88b16 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 712a61df544f..9e3b695360cd 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -62,7 +62,7 @@ gb_CFLAGS_COMMON := \ -Wstrict-prototypes \ -Wundef \ -Wunreachable-code \ - $(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX)))),,-Wunused-macros) \ + $(if $(or $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX)))),$(findstring sccache,$(CC))),,-Wunused-macros) \ -finput-charset=UTF-8 \ -fmessage-length=0 \ -fno-common \ @@ -77,7 +77,7 @@ gb_CXXFLAGS_COMMON := \ -Wextra \ -Wundef \ -Wunreachable-code \ - $(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX)))),,-Wunused-macros) \ + $(if $(or $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CXX)),$(findstring icecc,$(CCACHE_PREFIX)))),$(findstring sccache,$(CXX))),,-Wunused-macros) \ -finput-charset=UTF-8 \ -fmessage-length=0 \ -fno-common \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
