Kaydet (Commit) 6ee8ba1e authored tarafından Chris Sherlock's avatar Chris Sherlock

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
üst ad241f51
......@@ -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;
......
......@@ -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() )
......
......@@ -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();
......
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