vcl/inc/impfont.hxx | 7 ++-----
vcl/source/font/font.cxx | 9 ---------
2 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit 5a35ca12d98d7ad0bfc012d75d00f9eefb4ec078
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Nov 18 20:56:51 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 21 09:55:29 2022 +0100
drop ImplFont::SetSymbolFlag
Change-Id: I8da977c3464e82e8a159143f9d1c73446ceee159
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142960
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 450e227b34ad..b570f22a6e7c 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -49,7 +49,7 @@ public:
rtl_TextEncoding GetCharSet() const {
return meCharSet; }
const Size& GetFontSize() const { return
maAverageFontSize; }
- bool IsSymbolFont() const {
return mbSymbolFlag; }
+ bool IsSymbolFont() const {
return meCharSet == RTL_TEXTENCODING_SYMBOL; }
void SetFamilyName( const OUString& sFamilyName ) {
maFamilyName = sFamilyName; }
void SetStyleName( const OUString& sStyleName ) {
maStyleName = sStyleName; }
@@ -72,8 +72,6 @@ public:
maAverageFontSize = rSize;
}
- void SetSymbolFlag( const bool bSymbolFlag ) {
mbSymbolFlag = bSymbolFlag; }
-
// straight properties, no getting them from AskConfig()
FontFamily GetFamilyTypeNoAsk() const {
return meFamily; }
FontWeight GetWeightNoAsk() const {
return meWeight; }
@@ -127,8 +125,7 @@ private:
LanguageTag maCJKLanguageTag;
// Flags - device independent
- bool mbSymbolFlag:1,
- mbOutline:1,
+ bool mbOutline:1,
mbConfigLookup:1, // config lookup should only be
done once
mbShadow:1,
mbVertical:1,
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index afaa430e19f7..b6ed6926b33f 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -161,14 +161,7 @@ void Font::SetFamily( FontFamily eFamily )
void Font::SetCharSet( rtl_TextEncoding eCharSet )
{
if (const_cast<const ImplType&>(mpImplFont)->GetCharSet() != eCharSet)
- {
mpImplFont->SetCharSet( eCharSet );
-
- if ( eCharSet == RTL_TEXTENCODING_SYMBOL )
- mpImplFont->SetSymbolFlag( true );
- else
- mpImplFont->SetSymbolFlag( false );
- }
}
bool Font::IsSymbolFont() const
@@ -977,7 +970,6 @@ ImplFont::ImplFont() :
meCharSet( RTL_TEXTENCODING_DONTKNOW ),
maLanguageTag( LANGUAGE_DONTKNOW ),
maCJKLanguageTag( LANGUAGE_DONTKNOW ),
- mbSymbolFlag( false ),
mbOutline( false ),
mbConfigLookup( false ),
mbShadow( false ),
@@ -1011,7 +1003,6 @@ ImplFont::ImplFont( const ImplFont& rImplFont ) :
meCharSet( rImplFont.meCharSet ),
maLanguageTag( rImplFont.maLanguageTag ),
maCJKLanguageTag( rImplFont.maCJKLanguageTag ),
- mbSymbolFlag( rImplFont.mbSymbolFlag ),
mbOutline( rImplFont.mbOutline ),
mbConfigLookup( rImplFont.mbConfigLookup ),
mbShadow( rImplFont.mbShadow ),
