Kaydet (Commit) b628c642 authored tarafından Chris Sherlock's avatar Chris Sherlock Kaydeden (comit) Chris Sherlock

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/20861Reviewed-by: 's avatarChris Sherlock <chris.sherlock79@gmail.com>
Tested-by: 's avatarChris Sherlock <chris.sherlock79@gmail.com>
üst cd945a00
...@@ -62,7 +62,7 @@ public: ...@@ -62,7 +62,7 @@ public:
ImplGetDevFontList* GetDevFontList() const; ImplGetDevFontList* GetDevFontList() const;
ImplGetDevSizeList* GetDevSizeList( const OUString& rFontName ) const; ImplGetDevSizeList* GetDevSizeList( const OUString& rFontName ) const;
PhysicalFontFamily* ImplFindByTokenNames(const OUString& rTokenStr) const; PhysicalFontFamily* FindByTokenNames(const OUString& rTokenStr) const;
protected: protected:
void InitMatchData() const; void InitMatchData() const;
......
...@@ -379,7 +379,7 @@ PhysicalFontFamily *PhysicalFontCollection::FindOrCreateFamily( const OUString & ...@@ -379,7 +379,7 @@ PhysicalFontFamily *PhysicalFontCollection::FindOrCreateFamily( const OUString &
return pFoundData; return pFoundData;
} }
PhysicalFontFamily* PhysicalFontCollection::ImplFindByTokenNames(const OUString& rTokenStr) const PhysicalFontFamily* PhysicalFontCollection::FindByTokenNames(const OUString& rTokenStr) const
{ {
PhysicalFontFamily* pFoundData = nullptr; PhysicalFontFamily* pFoundData = nullptr;
...@@ -886,23 +886,23 @@ PhysicalFontFamily* PhysicalFontCollection::FindDefaultFont() const ...@@ -886,23 +886,23 @@ PhysicalFontFamily* PhysicalFontCollection::FindDefaultFont() const
const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get();
LanguageTag aLanguageTag( OUString( "en")); LanguageTag aLanguageTag( OUString( "en"));
OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS_UNICODE ); OUString aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS_UNICODE );
pFoundData = ImplFindByTokenNames( aFontname ); pFoundData = FindByTokenNames( aFontname );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS ); aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SANS );
pFoundData = ImplFindByTokenNames( aFontname ); pFoundData = FindByTokenNames( aFontname );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SERIF ); aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::SERIF );
pFoundData = ImplFindByTokenNames( aFontname ); pFoundData = FindByTokenNames( aFontname );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::FIXED ); aFontname = rDefaults.getDefaultFont( aLanguageTag, DefaultFontType::FIXED );
pFoundData = ImplFindByTokenNames( aFontname ); pFoundData = FindByTokenNames( aFontname );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
} }
...@@ -1189,7 +1189,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindByFont( FontSelectPattern& rFSD ...@@ -1189,7 +1189,7 @@ PhysicalFontFamily* PhysicalFontCollection::FindByFont( FontSelectPattern& rFSD
aSearchName = "OpenSymbol"; aSearchName = "OpenSymbol";
else else
aSearchName = utl::DefaultFontConfiguration::get().getDefaultFont( aDefaultLanguageTag, DefaultFontType::SYMBOL ); aSearchName = utl::DefaultFontConfiguration::get().getDefaultFont( aDefaultLanguageTag, DefaultFontType::SYMBOL );
PhysicalFontFamily* pFoundData = ImplFindByTokenNames( aSearchName ); PhysicalFontFamily* pFoundData = FindByTokenNames( aSearchName );
if( pFoundData ) if( pFoundData )
return pFoundData; return pFoundData;
} }
......
...@@ -500,7 +500,7 @@ namespace ...@@ -500,7 +500,7 @@ namespace
// get the default font for a specified locale // get the default font for a specified locale
const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get(); const utl::DefaultFontConfiguration& rDefaults = utl::DefaultFontConfiguration::get();
const OUString aDefault = rDefaults.getUserInterfaceFont(rLanguageTag); const OUString aDefault = rDefaults.getUserInterfaceFont(rLanguageTag);
return rFontCollection.ImplFindByTokenNames(aDefault); return rFontCollection.FindByTokenNames(aDefault);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment