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

[Libreoffice Gerrit user]

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

New commits:
commit c1a06ec8779ffb6fe442379735bcdeab5fb3532e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 20 11:45:25 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Aug 20 16:37:20 2018 +0200

    IsBetterMatch just uses FontSelectPatternAttributes
    
    Change-Id: I5d0ca9059bc5717b345332e18ef983db982a2966
    Reviewed-on: https://gerrit.libreoffice.org/59316
    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/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index c350a6c81649..b0eb23cc2889 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -60,7 +60,7 @@ public:
     int                     GetWidth() const            { return mnWidth; }
     virtual sal_IntPtr      GetFontId() const = 0;
 
-    bool                    IsBetterMatch( const FontSelectPattern&, FontMatchStatus& ) const;
+    bool                    IsBetterMatch( const FontSelectPatternAttributes&, FontMatchStatus& ) const;
     sal_Int32               CompareWithSize( const PhysicalFontFace& ) const;
     sal_Int32               CompareIgnoreSize( const PhysicalFontFace& ) const;
 
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx
index 1b0940c8fb76..a244e7966eb6 100644
--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -89,7 +89,7 @@ sal_Int32 PhysicalFontFace::CompareWithSize( const PhysicalFontFace& rOther ) co
     return 0;
 }
 
-bool PhysicalFontFace::IsBetterMatch( const FontSelectPattern& rFSD, FontMatchStatus& rStatus ) const
+bool PhysicalFontFace::IsBetterMatch( const FontSelectPatternAttributes& rFSD, FontMatchStatus& rStatus ) const
 {
     int nMatch = 0;