diff options
Diffstat (limited to 'vcl/inc/fontinstance.hxx')
| -rw-r--r-- | vcl/inc/fontinstance.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx index 317b7181198d..149bb553c3eb 100644 --- a/vcl/inc/fontinstance.hxx +++ b/vcl/inc/fontinstance.hxx @@ -24,6 +24,7 @@ #include "impfontmetricdata.hxx" #include <rtl/ref.hxx> +#include <salhelper/simplereferenceobject.hxx> #include <unordered_map> #include <memory> @@ -35,7 +36,7 @@ class PhysicalFontFace; // TODO: allow sharing of metrics for related fonts -class VCL_PLUGIN_PUBLIC LogicalFontInstance +class VCL_PLUGIN_PUBLIC LogicalFontInstance : public salhelper::SimpleReferenceObject { // just declaring the factory function doesn't work AKA // friend LogicalFontInstance* PhysicalFontFace::CreateFontInstance(const FontSelectPattern&) const; @@ -43,7 +44,7 @@ class VCL_PLUGIN_PUBLIC LogicalFontInstance friend class ImplFontCache; public: // TODO: make data members private - virtual ~LogicalFontInstance(); + virtual ~LogicalFontInstance() override; ImplFontMetricDataRef mxFontMetric; // Font attributes const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol @@ -57,9 +58,6 @@ public: // TODO: make data members private bool GetFallbackForUnicode( sal_UCS4, FontWeight eWeight, OUString* pFontName ) const; void IgnoreFallbackForUnicode( sal_UCS4, FontWeight eWeight, const OUString& rFontName ); - void Acquire(); - void Release(); - inline hb_font_t* GetHbFont(); void SetAverageWidthFactor(double nFactor) { m_nAveWidthFactor = nFactor; } double GetAverageWidthFactor() const { return m_nAveWidthFactor; } @@ -88,7 +86,6 @@ private: typedef ::std::unordered_map< ::std::pair<sal_UCS4,FontWeight>, OUString > UnicodeFallbackList; std::unique_ptr<UnicodeFallbackList> mpUnicodeFallbackList; ImplFontCache * mpFontCache; - sal_uInt32 mnRefCount; const FontSelectPattern m_aFontSelData; hb_font_t* m_pHbFont; double m_nAveWidthFactor; |