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

[Chris Sherlock]

 vcl/inc/PhysicalFontCollection.hxx         |    2 +-
 vcl/source/font/PhysicalFontCollection.cxx |   12 ++++++------
 vcl/win/gdi/salgdi3.cxx                    |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b628c642f5fffdf6008aed7915053f889b28ad84
Author: Chris Sherlock <chris.sherlock at collabora.com>
Date:   Tue Dec 22 15:38:16 2015 +1100

    vcl: rename ImplFindByTokenNames to FindByTokenNames
    
    This is part of the class's public interface, it's not just an
    implementation function. Therefore the prefix Impl is not needed, so
    removing it.
    
    Change-Id: I118db93e930ff42ef0b712da6cd4a6d04fd1f074
    Reviewed-on: https://gerrit.libreoffice.org/20861
    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 a5ed8bb..e52e752 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -62,7 +62,7 @@ public:
     ImplGetDevFontList*     GetDevFontList() const;
     ImplGetDevSizeList*     GetDevSizeList( const OUString& rFontName ) const;
 
-    PhysicalFontFamily*     ImplFindByTokenNames(const OUString& rTokenStr) const;
+    PhysicalFontFamily*     FindByTokenNames(const OUString& rTokenStr) const;
 
 protected:
     void                    InitMatchData() const;
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 75ac79b..02c85cb 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -379,7 +379,7 @@ PhysicalFontFamily *PhysicalFontCollection::FindOrCreateFamily( const OUString &
     return pFoundData;
 }
 
-PhysicalFontFamily* PhysicalFontCollection::ImplFindByTokenNames(const OUString& rTokenStr) const
+PhysicalFontFamily* PhysicalFontCollection::FindByTokenNames(const OUString& rTokenStr) const
 {
     PhysicalFontFamily* pFoundData = nullptr;
 
@@ -886,23 +886,23 @@ PhysicalFontFamily* PhysicalFontCollection::FindDefaultFont() const
         const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get();
         LanguageTag aLanguageTag( OUString( "en"));
         OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS_UNICODE );
-        pFoundData = ImplFindByTokenNames( aFontname );
+        pFoundData = FindByTokenNames( aFontname );
 
         if( pFoundData )
             return pFoundData;
 
         aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS );
-        pFoundData = ImplFindByTokenNames( aFontname );
+        pFoundData = FindByTokenNames( aFontname );
         if( pFoundData )
             return pFoundData;
 
         aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SERIF );
-        pFoundData = ImplFindByTokenNames( aFontname );
+        pFoundData = FindByTokenNames( aFontname );
         if( pFoundData )
             return pFoundData;
 
         aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::FIXED );
-        pFoundData = ImplFindByTokenNames( aFontname );
+        pFoundData = FindByTokenNames( aFontname );
         if( pFoundData )
             return pFoundData;
     }
@@ -1189,7 +1189,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindByFont( FontSelectPattern& rFSD
             aSearchName = "OpenSymbol";
         else
             aSearchName = utl::DefaultFontConfiguration::get().getDefaultFont( aDefaultLanguageTag, DefaultFontType::SYMBOL );
-        PhysicalFontFamily* pFoundData = ImplFindByTokenNames( aSearchName );
+        PhysicalFontFamily* pFoundData = FindByTokenNames( aSearchName );
         if( pFoundData )
             return pFoundData;
     }
diff --git a/vcl/win/gdi/salgdi3.cxx b/vcl/win/gdi/salgdi3.cxx
index 7b20a63..d091764 100644
--- a/vcl/win/gdi/salgdi3.cxx
+++ b/vcl/win/gdi/salgdi3.cxx
@@ -500,7 +500,7 @@ namespace
         // get the default font for a specified locale
         const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get();
         const OUString aDefault = rDefaults.getUserInterfaceFont(rLanguageTag);
-        return rFontCollection.ImplFindByTokenNames(aDefault);
+        return rFontCollection.FindByTokenNames(aDefault);
     }
 }