diff options
author | Chris Sherlock <chris.sherlock@collabora.com> | 2015-12-22 15:18:14 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-12-22 05:52:52 +0000 |
commit | 0b1da98da44bc9acb9e42a5cd1842adf9d82a415 (patch) | |
tree | be0a698a3b61c33072b3bf9c6c3311ab180ef960 | |
parent | 30b8dbdcf15721be020d29df1059b54b5098ed00 (diff) |
vcl: cleanup PhysicalFontCollection class formatting
Change-Id: I943dd3ebc12eab96cd5e1e2e20d46382a4a63202
Reviewed-on: https://gerrit.libreoffice.org/20858
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
-rw-r--r-- | vcl/inc/PhysicalFontCollection.hxx | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index b201a3be5458..42655ec1553c 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -35,17 +35,6 @@ class ImplPreMatchFontSubstitution; class VCL_PLUGIN_PUBLIC PhysicalFontCollection { -private: - friend class WinGlyphFallbackSubstititution; - mutable bool mbMatchData; // true if matching attributes are initialized - bool mbMapNames; // true if MapNames are available - - typedef std::unordered_map<OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies; - PhysicalFontFamilies maPhysicalFontFamilies; - - ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution - ImplGlyphFallbackFontSubstitution* mpFallbackHook; // device specific glyph fallback substitution - public: explicit PhysicalFontCollection(); virtual ~PhysicalFontCollection(); @@ -56,14 +45,14 @@ public: int Count() const { return maPhysicalFontFamilies.size(); } // find the device font - PhysicalFontFamily* FindFontFamily( const OUString& rFontName ) const; - PhysicalFontFamily* FindOrCreateFamily( const OUString &rFamilyName ); - PhysicalFontFamily* ImplFindByFont( FontSelectPattern& ) const; - PhysicalFontFamily* ImplFindBySearchName( const OUString& ) const; + PhysicalFontFamily* FindFontFamily( const OUString& rFontName ) const; + PhysicalFontFamily* FindOrCreateFamily( const OUString &rFamilyName ); + PhysicalFontFamily* ImplFindByFont( FontSelectPattern& ) const; + PhysicalFontFamily* ImplFindBySearchName( const OUString& ) const; // suggest fonts for glyph fallback PhysicalFontFamily* GetGlyphFallbackFont( FontSelectPattern&, - OUString& rMissingCodes, int nFallbackLevel ) const; + OUString& rMissingCodes, int nFallbackLevel ) const; // prepare platform specific font substitutions void SetPreMatchHook( ImplPreMatchFontSubstitution* ); @@ -74,22 +63,32 @@ public: ImplGetDevFontList* GetDevFontList() const; ImplGetDevSizeList* GetDevSizeList( const OUString& rFontName ) const; - PhysicalFontFamily* ImplFindByTokenNames(const OUString& rTokenStr) const; + PhysicalFontFamily* ImplFindByTokenNames(const OUString& rTokenStr) const; protected: void InitMatchData() const; - PhysicalFontFamily* ImplFindByAliasName(const OUString& rSearchName, - const OUString& rShortName) const; - PhysicalFontFamily* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const; - PhysicalFontFamily* ImplFindByAttributes(ImplFontAttrs nSearchType, FontWeight, FontWidth, + PhysicalFontFamily* ImplFindByAliasName(const OUString& rSearchName, + const OUString& rShortName) const; + PhysicalFontFamily* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const; + PhysicalFontFamily* ImplFindByAttributes(ImplFontAttrs nSearchType, FontWeight, FontWidth, FontItalic, const OUString& rSearchFamily) const; - PhysicalFontFamily* FindDefaultFont() const; + PhysicalFontFamily* FindDefaultFont() const; private: + friend class WinGlyphFallbackSubstititution; + mutable bool mbMatchData; // true if matching attributes are initialized + bool mbMapNames; // true if MapNames are available + + typedef std::unordered_map<OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies; + PhysicalFontFamilies maPhysicalFontFamilies; + + ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution + ImplGlyphFallbackFontSubstitution* mpFallbackHook; // device specific glyph fallback substitution + void InitGenericGlyphFallback() const; - mutable PhysicalFontFamily** mpFallbackList; - mutable int mnFallbackCount; + mutable PhysicalFontFamily** mpFallbackList; + mutable int mnFallbackCount; }; #endif // INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX |