diff options
| author | Chris Sherlock <chris.sherlock@collabora.com> | 2015-12-22 14:40:52 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-12-22 08:44:12 +0000 |
| commit | 2c000fbf50adcf80e12cdc8f7689e6d3c8a888f7 (patch) | |
| tree | a31041e71a48c227571ba6cf45188fdcf9791076 /vcl | |
| parent | 235a10d49eb1b7becbac32965633447b97a684bc (diff) | |
vcl: switch from ImplFindBySearchName to FindFontFamily
ImplFindBySearchName is an implementation function, which I frown on
using if it can be avoided. In actual fact, the code in
OutputDevice::GetDefaultFont is just duplicating the
PhysicalFontFamily::FindFontFamily function anyway, so I'm switching to
using this instead.
Change-Id: I1491a09aa935e9fdb288dd6787fce1b1096d29a9
Reviewed-on: https://gerrit.libreoffice.org/20857
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/outdev/font.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index d8c9ce2074ec..537671deb838 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -870,13 +870,10 @@ vcl::Font OutputDevice::GetDefaultFont( DefaultFontType nType, LanguageType eLan // Search Font in the FontList OUString aName; - OUString aSearchName; sal_Int32 nIndex = 0; do { - aSearchName = GetEnglishSearchFontName( GetNextFontToken( aSearch, nIndex ) ); - - PhysicalFontFamily* pFontFamily = pOutDev->mpFontCollection->ImplFindBySearchName( aSearchName ); + PhysicalFontFamily* pFontFamily = pOutDev->mpFontCollection->FindFontFamily( GetNextFontToken( aSearch, nIndex ) ); if( pFontFamily ) { AddTokenFontName( aName, pFontFamily->GetFamilyName() ); |