[Libreoffice-commits] core.git: vcl/source

[Chris Sherlock]

 vcl/source/outdev/font.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 2c000fbf50adcf80e12cdc8f7689e6d3c8a888f7
Author: Chris Sherlock <chris.sherlock at collabora.com>
Date:   Tue Dec 22 14:40:52 2015 +1100

    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 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index d8c9ce2..537671d 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() );