diff options
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/PhysicalFontFace.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/qt5/Qt5FontFace.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/quartz/salgdi.h | 4 | ||||
| -rw-r--r-- | vcl/inc/unx/glyphcache.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/win/salgdi.h | 8 |
5 files changed, 4 insertions, 17 deletions
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index 3992bb91bf41..679420a05fd1 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -22,6 +22,7 @@ #include <hb.h> +#include <vcl/fontcapabilities.hxx> #include <salhelper/simplereferenceobject.hxx> #include <rtl/ref.hxx> #include <vcl/dllapi.h> @@ -70,6 +71,7 @@ public: sal_Int32 CompareIgnoreSize( const PhysicalFontFace& ) const; const FontCharMapRef& GetCharMap() const; + bool GetCapabilities(vcl::FontCapabilities &rCapabilities) const; hb_face_t* GetHbFace() const; virtual hb_blob_t* GetHbTable(hb_tag_t nTag) const = 0; @@ -84,6 +86,8 @@ protected: mutable hb_face_t* mpHbFace; mutable FontCharMapRef mxCharMap; + mutable bool mbCapabilitiesRead; + mutable vcl::FontCapabilities maCapabilities; }; #endif // INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx index a179438cf2a5..03884fc31df9 100644 --- a/vcl/inc/qt5/Qt5FontFace.hxx +++ b/vcl/inc/qt5/Qt5FontFace.hxx @@ -42,8 +42,6 @@ public: int GetFontTable(const char pTagName[5], unsigned char*) const; - bool GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const; - rtl::Reference<LogicalFontInstance> CreateFontInstance(const FontSelectPattern& rFSD) const override; @@ -55,8 +53,6 @@ protected: private: const QString m_aFontId; - mutable vcl::FontCapabilities m_aFontCapabilities; - mutable bool m_bFontCapabilitiesRead; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 3be470f0caf6..540d695a3a11 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -67,16 +67,12 @@ public: int GetFontTable( uint32_t nTagCode, unsigned char* ) const; int GetFontTable( const char pTagName[5], unsigned char* ) const; - bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; - rtl::Reference<LogicalFontInstance> CreateFontInstance(const FontSelectPattern&) const override; hb_blob_t* GetHbTable(hb_tag_t nTag) const override; private: const sal_IntPtr mnFontId; - mutable vcl::FontCapabilities maFontCapabilities; - mutable bool mbFontCapabilitiesRead; }; class CoreTextStyle final : public LogicalFontInstance diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index c072752db6a7..12800ae0458c 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -107,7 +107,6 @@ public: void GetFontMetric(ImplFontMetricDataRef const &) const; const unsigned char* GetTable( const char* pName, sal_uLong* pLength ) const; - bool GetFontCapabilities(vcl::FontCapabilities &) const; bool GetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const; bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 0cc2fd05ba2d..5eeb0747c253 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -71,24 +71,16 @@ public: BYTE GetCharSet() const { return meWinCharSet; } BYTE GetPitchAndFamily() const { return mnPitchAndFamily; } - bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; - hb_blob_t* GetHbTable(hb_tag_t nTag) const override; private: sal_IntPtr mnId; - // some members that are initialized lazily when the font gets selected into a HDC - mutable bool mbFontCapabilitiesRead; - mutable vcl::FontCapabilities maFontCapabilities; - BYTE meWinCharSet; BYTE mnPitchAndFamily; bool mbAliasSymbolsHigh; bool mbAliasSymbolsLow; - void GetFontCapabilities( HDC hDC ) const; - mutable HDC mhDC; }; |