[Libreoffice-commits] core.git: vcl/inc vcl/source
Chris Sherlock
chris.sherlock at collabora.com
Tue Dec 22 06:25:21 PST 2015
vcl/inc/PhysicalFontCollection.hxx | 2 +-
vcl/source/font/PhysicalFontCollection.cxx | 2 +-
vcl/source/outdev/font.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7526f6c6f973d546e2887ff9d794e7214f261889
Author: Chris Sherlock <chris.sherlock at collabora.com>
Date: Tue Dec 22 15:31:28 2015 +1100
vcl: rename PhysicalFontCollection::ImplFindByFont to FindByFont
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: I15540e470cfb20d312e8bf31109acfc6ff8fe7dc
Reviewed-on: https://gerrit.libreoffice.org/20860
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 d9d7719..a5ed8bb 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -47,7 +47,7 @@ public:
// find the device font
PhysicalFontFamily* FindFontFamily( const OUString& rFontName ) const;
PhysicalFontFamily* FindOrCreateFamily( const OUString &rFamilyName );
- PhysicalFontFamily* ImplFindByFont( FontSelectPattern& ) const;
+ PhysicalFontFamily* FindByFont( FontSelectPattern& ) const;
// suggest fonts for glyph fallback
PhysicalFontFamily* GetGlyphFallbackFont( FontSelectPattern&,
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 0098b3a..75ac79b 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -985,7 +985,7 @@ ImplGetDevSizeList* PhysicalFontCollection::GetDevSizeList( const OUString& rFon
return pGetDevSizeList;
}
-PhysicalFontFamily* PhysicalFontCollection::ImplFindByFont( FontSelectPattern& rFSD ) const
+PhysicalFontFamily* PhysicalFontCollection::FindByFont( FontSelectPattern& rFSD ) const
{
// give up if no fonts are available
if( !Count() )
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 537671d..89fa8873 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1283,7 +1283,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( PhysicalFontCollection* pFontList,
if( !pEntry ) // no direct cache hit
{
// find the best matching logical font family and update font selector accordingly
- pFontFamily = pFontList->ImplFindByFont( aFontSelData );
+ pFontFamily = pFontList->FindByFont( aFontSelData );
DBG_ASSERT( (pFontFamily != nullptr), "ImplFontCache::Get() No logical font found!" );
if( pFontFamily )
aFontSelData.maSearchName = pFontFamily->GetSearchName();
More information about the Libreoffice-commits
mailing list