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

[Khaled Hosny]

 vcl/inc/sallayout.hxx        |    2 --
 vcl/source/gdi/sallayout.cxx |    5 -----
 vcl/win/gdi/salfont.cxx      |    7 +++----
 3 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 289124284f98bbea442871455cf7da5fe9ef3aae
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Dec 8 06:37:42 2016 +0200

    Remove noop SalLayout::UseCommonLayout()
    
    Change-Id: Ifc143f33bc4e087726ada1e3b1b5182bf830b0cb
    Reviewed-on: https://gerrit.libreoffice.org/31821
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 5c71595..2703f2d 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -196,8 +196,6 @@ public:
     virtual std::shared_ptr<vcl::TextLayoutCache>
         CreateTextLayoutCache(OUString const&) const;
 
-    static bool     UseCommonLayout();
-
 protected:
     // used by layout engines
                     SalLayout();
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 6f3b082..9c4c48f 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -732,11 +732,6 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph )
     return bRet;
 }
 
-bool SalLayout::UseCommonLayout()
-{
-    return true;
-}
-
 GenericSalLayout::GenericSalLayout()
 {}
 
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 30f22e6..5d2255a 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1062,10 +1062,9 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe,
         if (nFontType & RASTER_FONTTYPE)
             return 1;
 
-        // Ignore font formats not supported by CommonSalLayout.
-        if (SalLayout::UseCommonLayout())
-            if ((pMetric->ntmTm.ntmFlags & NTM_TYPE1) || (pMetric->ntmTm.ntmFlags & NTM_MULTIPLEMASTER))
-                return 1;
+        // Ignore font formats we don’t support.
+        if ((pMetric->ntmTm.ntmFlags & NTM_TYPE1) || (pMetric->ntmTm.ntmFlags & NTM_MULTIPLEMASTER))
+            return 1;
 
         WinFontFace* pData = ImplLogMetricToDevFontDataW( pLogFont, &(pMetric->ntmTm), nFontType );
         pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );