[Libreoffice-commits] core.git: vcl/inc

Chris Sherlock chris.sherlock79 at gmail.com
Wed Dec 23 16:23:47 PST 2015


 vcl/inc/PhysicalFontCollection.hxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7379306004363d0fc2820c1ace6c4aef4421b7e4
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Dec 24 11:17:32 2015 +1100

    vcl: group public find functions, clarify comments in PhysFontCollection
    
    Change-Id: I0044a5f467f2620203aa9ebcda57bbd9f81db7e5
    Reviewed-on: https://gerrit.libreoffice.org/20915
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index 66a96c87..083fc7f 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -39,15 +39,18 @@ public:
     explicit                PhysicalFontCollection();
     virtual                 ~PhysicalFontCollection();
 
-    // fill the list with device fonts
+    // fill the list with device font faces
     void                    Add( PhysicalFontFace* );
     void                    Clear();
     int                     Count() const { return maPhysicalFontFamilies.size(); }
 
-    // find the device font
+    // find the device font family
     PhysicalFontFamily*     FindFontFamily( const OUString& rFontName ) const;
     PhysicalFontFamily*     FindOrCreateFamily( const OUString &rFamilyName );
     PhysicalFontFamily*     FindByFont( FontSelectPattern& ) const;
+    PhysicalFontFamily*     FindByTokenNames(const OUString& rTokenStr) const;
+    PhysicalFontFamily*     FindByAttributes(ImplFontAttrs nSearchType, FontWeight, FontWidth,
+                                             FontItalic, const OUString& rSearchFamily) const;
 
     // suggest fonts for glyph fallback
     PhysicalFontFamily*     GetGlyphFallbackFont( FontSelectPattern&,
@@ -62,9 +65,6 @@ public:
     ImplGetDevFontList*     GetDevFontList() const;
     ImplGetDevSizeList*     GetDevSizeList( const OUString& rFontName ) const;
 
-    PhysicalFontFamily*     FindByTokenNames(const OUString& rTokenStr) const;
-    PhysicalFontFamily*     FindByAttributes(ImplFontAttrs nSearchType, FontWeight, FontWidth,
-                                             FontItalic, const OUString& rSearchFamily) const;
 private:
     mutable bool            mbMatchData;    // true if matching attributes are initialized
     bool                    mbMapNames;     // true if MapNames are available


More information about the Libreoffice-commits mailing list