diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-08 06:37:42 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-10 07:18:08 +0000 |
| commit | 289124284f98bbea442871455cf7da5fe9ef3aae (patch) | |
| tree | 46a189dae7e80e9a7f4360372d4b8b1fd45aa698 | |
| parent | 3a9609653697ac851ee1c55a41aa143d3bca335e (diff) | |
Remove noop SalLayout::UseCommonLayout()
Change-Id: Ifc143f33bc4e087726ada1e3b1b5182bf830b0cb
Reviewed-on: https://gerrit.libreoffice.org/31821
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
| -rw-r--r-- | vcl/inc/sallayout.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 5 | ||||
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 7 |
3 files changed, 3 insertions, 11 deletions
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 5c7159543e86..2703f2d9b765 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 6f3b082e1929..9c4c48f55754 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 30f22e684283..5d2255a8c5f6 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++ ) ); |