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

[Libreoffice Gerrit user]

 vcl/inc/PhysicalFontFamily.hxx         |    2 +-
 vcl/source/font/PhysicalFontFamily.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f34747e39ae034bb7bbfef6fd071662f1abcfa98
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 20 12:13:45 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Aug 20 22:10:43 2018 +0200

    FindBestFontFace can take FontSelectPatternAttributes instead
    
    Change-Id: I96d4a69c8530b9a80f6110666f4cc841f1812e23
    Reviewed-on: https://gerrit.libreoffice.org/59319
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx
index 990256590c88..8944c0d410ff 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -69,7 +69,7 @@ public:
 
     void                AddFontFace( PhysicalFontFace* );
 
-    PhysicalFontFace*   FindBestFontFace( const FontSelectPattern& rFSD ) const;
+    PhysicalFontFace*   FindBestFontFace( const FontSelectPatternAttributes& rFSD ) const;
 
     void                UpdateDevFontList( ImplDeviceFontList& ) const;
     void                UpdateCloneFontList(PhysicalFontCollection&) const;
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index 6953d259798f..9d3107fa461c 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -195,7 +195,7 @@ void PhysicalFontFamily::InitMatchData( const utl::FontSubstConfiguration& rFont
     mnMatchType |= lcl_IsCJKFont( maFamilyName );
 }
 
-PhysicalFontFace* PhysicalFontFamily::FindBestFontFace( const FontSelectPattern& rFSD ) const
+PhysicalFontFace* PhysicalFontFamily::FindBestFontFace( const FontSelectPatternAttributes& rFSD ) const
 {
     if( maFontFaces.empty() )
         return nullptr;