From ff0d0d0797701e38afb4f6d48486c5cd45f142cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 21 Nov 2022 09:55:48 +0000 Subject: [PATCH] add some checks for OpenSymbol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I98e1ee9f854d144cea3a305be6d53f8e86f6a7a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143020 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- editeng/source/editeng/impedit4.cxx | 3 +++ vcl/source/gdi/metaact.cxx | 1 + 2 files changed, 4 insertions(+) diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 9f2b617428fa..5affeff55455 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -363,7 +363,10 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) // on export what encoding we claim to use for these // fonts. if (IsOpenSymbol(pFontItem->GetFamilyName())) + { + SAL_WARN_IF(eChrSet == RTL_TEXTENCODING_SYMBOL, "editeng", "OpenSymbol should not have charset of RTL_TEXTENCODING_SYMBOL in new documents"); eChrSet = RTL_TEXTENCODING_UTF8; + } DBG_ASSERT( eChrSet != 9, "SystemCharSet?!" ); if( RTL_TEXTENCODING_DONTKNOW == eChrSet ) eChrSet = osl_getThreadTextEncoding(); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index cc92677c72b7..ef32bc0f3fb3 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1686,6 +1686,7 @@ MetaFontAction::MetaFontAction( vcl::Font aFont ) : if ( IsOpenSymbol( maFont.GetFamilyName() ) && ( maFont.GetCharSet() != RTL_TEXTENCODING_UNICODE ) ) { + SAL_WARN_IF(maFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL, "vcl", "OpenSymbol should not have charset of RTL_TEXTENCODING_SYMBOL in new documents"); maFont.SetCharSet( RTL_TEXTENCODING_UNICODE ); } }