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

[Chris Sherlock]

 vcl/inc/PhysicalFontCollection.hxx         |   13 ++++++-------
 vcl/source/font/PhysicalFontCollection.cxx |   14 +++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit c694c1812280e03fc04c77fb6483a2410097eb37
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Dec 23 11:03:02 2015 +1100

    vcl: private functions in PhysicalFontCollection start with Impl
    
    Not a fan, but I'll stick with convention and prefix private functions
    with Impl in PhysicalFontCollection.
    
    Change-Id: Ided081a19ec071ecd5c6a5a4929584ae0f3b0f05
    Reviewed-on: https://gerrit.libreoffice.org/20881
    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 b78c1ab..66a96c87 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -50,8 +50,8 @@ public:
     PhysicalFontFamily*     FindByFont( FontSelectPattern& ) const;
 
     // suggest fonts for glyph fallback
-    PhysicalFontFamily*    GetGlyphFallbackFont( FontSelectPattern&,
-                                                 OUString& rMissingCodes, int nFallbackLevel ) const;
+    PhysicalFontFamily*     GetGlyphFallbackFont( FontSelectPattern&,
+                                                  OUString& rMissingCodes, int nFallbackLevel ) const;
 
     // prepare platform specific font substitutions
     void                    SetPreMatchHook( ImplPreMatchFontSubstitution* );
@@ -78,16 +78,15 @@ private:
     mutable PhysicalFontFamily**  mpFallbackList;
     mutable int             mnFallbackCount;
 
-    void                    InitGenericGlyphFallback() const;
+    void                    ImplInitMatchData() const;
+    void                    ImplInitGenericGlyphFallback() const;
 
     PhysicalFontFamily*     ImplFindBySearchName( const OUString& ) const;
-    PhysicalFontFamily*     ImplFindByAliasName(const OUString& rSearchName,
-                                                const OUString& rShortName) const;
+    PhysicalFontFamily*     ImplFindByAliasName ( const OUString& rSearchName, const OUString& rShortName) const;
     PhysicalFontFamily*     ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
 
-    PhysicalFontFamily*     FindDefaultFont() const;
+    PhysicalFontFamily*     ImplFindDefaultFont() const;
 
-    void                    InitMatchData() const;
 };
 
 #endif // INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 39bcb26..13f0e81 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -115,7 +115,7 @@ void PhysicalFontCollection::Clear()
     mbMatchData = false;
 }
 
-void PhysicalFontCollection::InitGenericGlyphFallback() const
+void PhysicalFontCollection::ImplInitGenericGlyphFallback() const
 {
     // normalized family names of fonts suited for glyph fallback
     // if a font is available related fonts can be ignored
@@ -284,7 +284,7 @@ PhysicalFontFamily* PhysicalFontCollection::GetGlyphFallbackFont( FontSelectPatt
     {
         // initialize font candidates for generic glyph fallback if needed
         if( mnFallbackCount < 0 )
-            InitGenericGlyphFallback();
+            ImplInitGenericGlyphFallback();
 
         // TODO: adjust nFallbackLevel by number of levels resolved by the fallback hook
         if( nFallbackLevel < mnFallbackCount )
@@ -431,7 +431,7 @@ PhysicalFontFamily* PhysicalFontCollection::ImplFindBySubstFontAttr( const utl::
     return nullptr;
 }
 
-void PhysicalFontCollection::InitMatchData() const
+void PhysicalFontCollection::ImplInitMatchData() const
 {
     // short circuit if already done
     if( mbMatchData )
@@ -469,7 +469,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindByAttributes( ImplFontAttrs nSea
     && ((eSearchWidth == WIDTH_DONTKNOW) || (eSearchWidth == WIDTH_NORMAL)) )
         return nullptr;
 
-    InitMatchData();
+    ImplInitMatchData();
     PhysicalFontFamily* pFoundData = nullptr;
 
     long    nBestMatch = 40000;
@@ -876,7 +876,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindByAttributes( ImplFontAttrs nSea
     return pFoundData;
 }
 
-PhysicalFontFamily* PhysicalFontCollection::FindDefaultFont() const
+PhysicalFontFamily* PhysicalFontCollection::ImplFindDefaultFont() const
 {
     // try to find one of the default fonts of the
     // UNICODE, SANSSERIF, SERIF or FIXED default font lists
@@ -909,7 +909,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindDefaultFont() const
 
     // now try to find a reasonable non-symbol font
 
-    InitMatchData();
+    ImplInitMatchData();
 
     PhysicalFontFamilies::const_iterator it = maPhysicalFontFamilies.begin();
     for(; it !=  maPhysicalFontFamilies.end(); ++it )
@@ -1302,7 +1302,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindByFont( FontSelectPattern& rFSD
     else
     {
         // if still needed fall back to default fonts
-        pFoundData = FindDefaultFont();
+        pFoundData = ImplFindDefaultFont();
     }
 
     return pFoundData;