diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 13:48:03 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 13:48:03 +1100 |
| commit | adcd5038d9fc8a8ecf8f577330b8af2f7ff6b267 (patch) | |
| tree | e247ac73359a5fc12d1f9a20d584b7accac97ba4 /vcl/inc | |
| parent | a43b7cc56e3a3a145554932025acbca4156a15f1 (diff) | |
vcl: more harmonization of ImplFont and FontAttributes
+ Added function ImplFont::CompareDeviceIndependentFontAttributes
+ Renamed ImplFont::mbSymbol to ImplFont::mbSymbolFlag
Change-Id: I6325e87a2f38a9949c990453112284c3f8d1fb2f
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/impfont.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 74d541f02e62..8b7151d84da3 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -48,7 +48,7 @@ public: TextAlign GetAlignment() const { return meAlign; } rtl_TextEncoding GetCharSet() const { return meCharSet; } - bool IsSymbolFont() const { return mbSymbol; } + bool IsSymbolFont() const { return mbSymbolFlag; } void SetFamilyName( const OUString& sFamilyName ) { maFamilyName = sFamilyName; } void SetStyleName( const OUString& sStyleName ) { maStyleName = sStyleName; } @@ -61,7 +61,9 @@ public: void SetAlignment( const TextAlign eAlignment ) { meAlign = eAlignment; } void SetCharSet( const rtl_TextEncoding eCharSet ) { meCharSet = eCharSet; } - void SetSymbolFlag( const bool bSymbolFlag ) { mbSymbol = bSymbolFlag; } + void SetSymbolFlag( const bool bSymbolFlag ) { mbSymbolFlag = bSymbolFlag; } + + bool CompareDeviceIndependentFontAttributes(const ImplFont& rOther) const; // straight properties, no getting them from AskConfig() FontFamily GetFamilyTypeNoAsk() const { return meFamily; } @@ -128,7 +130,7 @@ private: LanguageTag maCJKLanguageTag; // Flags - device independent - bool mbSymbol:1, + bool mbSymbolFlag:1, mbOutline:1, mbConfigLookup:1, // there was a config lookup mbShadow:1, |