diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-08-21 09:39:50 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-22 00:25:03 +0200 |
commit | cbce9044b075f22a936c8a15bacf3cb57130c984 (patch) | |
tree | c0891d57768de0382d56590bed977e64d49e95a1 /vcl/inc/fontinstance.hxx | |
parent | 450b89b61d3a061174194acb1c18cb859cfc0123 (diff) |
rename FontSelectPatternAttributes to FontSelectPattern
Change-Id: I2c018e2e61707c0d89178b0cb38a0918906e23cb
Reviewed-on: https://gerrit.libreoffice.org/59390
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc/fontinstance.hxx')
-rw-r--r-- | vcl/inc/fontinstance.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx index e5b42e831ea6..597c747553ac 100644 --- a/vcl/inc/fontinstance.hxx +++ b/vcl/inc/fontinstance.hxx @@ -39,7 +39,7 @@ class PhysicalFontFace; class VCL_PLUGIN_PUBLIC LogicalFontInstance : public salhelper::SimpleReferenceObject { // just declaring the factory function doesn't work AKA - // friend LogicalFontInstance* PhysicalFontFace::CreateFontInstance(const FontSelectPatternAttributes&) const; + // friend LogicalFontInstance* PhysicalFontFace::CreateFontInstance(const FontSelectPattern&) const; friend class PhysicalFontFace; friend class ImplFontCache; @@ -62,7 +62,7 @@ public: // TODO: make data members private void SetAverageWidthFactor(double nFactor) { m_nAveWidthFactor = nFactor; } void SetNonAntialiased(bool bNonAntialiased); double GetAverageWidthFactor() const { return m_nAveWidthFactor; } - const FontSelectPatternAttributes& GetFontSelectPattern() const { return m_aFontSelData; } + const FontSelectPattern& GetFontSelectPattern() const { return m_aFontSelData; } const PhysicalFontFace* GetFontFace() const { return m_pFontFace.get(); } const ImplFontCache* GetFontCache() const { return mpFontCache; } @@ -73,7 +73,7 @@ public: // TODO: make data members private static inline void DecodeOpenTypeTag(const uint32_t nTableTag, char* pTagName); protected: - explicit LogicalFontInstance(const PhysicalFontFace&, const FontSelectPatternAttributes&); + explicit LogicalFontInstance(const PhysicalFontFace&, const FontSelectPattern&); // Takes ownership of pHbFace. hb_font_t* InitHbFont(hb_face_t* pHbFace) const; @@ -87,7 +87,7 @@ private: typedef ::std::unordered_map< ::std::pair<sal_UCS4,FontWeight>, OUString > UnicodeFallbackList; std::unique_ptr<UnicodeFallbackList> mpUnicodeFallbackList; ImplFontCache * mpFontCache; - const FontSelectPatternAttributes m_aFontSelData; + const FontSelectPattern m_aFontSelData; hb_font_t* m_pHbFont; double m_nAveWidthFactor; rtl::Reference<PhysicalFontFace> m_pFontFace; |