From 6ee8ba1e451f7a2bd890b265d0c0c0030519da31 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sat, 9 Jan 2016 04:03:26 +1100 Subject: vcl: FindFontFamilyByFont is not the best name after all On second thoughts, FindFontFamilyByName is not a good name at all. I'm changing it back to FindFontFamily. The parameter tells you how it's being found. Change-Id: Ie8278e1727075a49331135a149361a484aba91e5 --- vcl/inc/PhysicalFontCollection.hxx | 2 +- vcl/source/font/PhysicalFontCollection.cxx | 2 +- vcl/source/font/fontcache.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index 87f4181a56b7..5b506a30de80 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -47,7 +47,7 @@ public: // find the device font family PhysicalFontFamily* FindFontFamily( const OUString& rFontName ) const; PhysicalFontFamily* FindOrCreateFontFamily( const OUString &rFamilyName ); - PhysicalFontFamily* FindFontFamilyByFont( FontSelectPattern& ) const; + PhysicalFontFamily* FindFontFamily( FontSelectPattern& ) const; PhysicalFontFamily* FindFontFamilyByTokenNames(const OUString& rTokenStr) const; PhysicalFontFamily* FindFontFamilyByAttributes(ImplFontAttrs nSearchType, FontWeight, FontWidth, FontItalic, const OUString& rSearchFamily) const; diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index bcfd9a71ec72..07723101235a 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -986,7 +986,7 @@ ImplDeviceFontSizeList* PhysicalFontCollection::GetDeviceFontSizeList( const OUS return pDeviceFontSizeList; } -PhysicalFontFamily* PhysicalFontCollection::FindFontFamilyByFont( FontSelectPattern& rFSD ) const +PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& rFSD ) const { // give up if no fonts are available if( !Count() ) diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx index d9e0dffe5976..41723f85d63a 100644 --- a/vcl/source/font/fontcache.cxx +++ b/vcl/source/font/fontcache.cxx @@ -170,7 +170,7 @@ LogicalFontInstance* ImplFontCache::GetFontInstance( PhysicalFontCollection* pFo if( !pFontInstance ) // no direct cache hit { // find the best matching logical font family and update font selector accordingly - pFontFamily = pFontList->FindFontFamilyByFont( aFontSelData ); + pFontFamily = pFontList->FindFontFamily( aFontSelData ); DBG_ASSERT( (pFontFamily != nullptr), "ImplFontCache::Get() No logical font found!" ); if( pFontFamily ) aFontSelData.maSearchName = pFontFamily->GetSearchName(); -- cgit