Kill old Core Text layout engine

Change-Id: If80d65899255d8be72f374fbec232d103a08a006
Reviewed-on: https://gerrit.libreoffice.org/31232
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>

1 files changed, 5 insertions, 13 deletions

diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index a58870f825af..0333bbf0f6c2 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -380,11 +380,8 @@ void AquaSalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection )
     // Copy all PhysicalFontFace objects contained in the SystemFontList
     pSalData->mpFontList->AnnounceFonts( *pFontCollection );
 
-    if (SalLayout::UseCommonLayout())
-    {
-        static CoreTextGlyphFallbackSubstititution aSubstFallback;
-        pFontCollection->SetFallbackHook(&aSubstFallback);
-    }
+    static CoreTextGlyphFallbackSubstititution aSubstFallback;
+    pFontCollection->SetFallbackHook(&aSubstFallback);
 }
 
 void AquaSalGraphics::ClearDevFontCache()
@@ -534,15 +531,10 @@ void AquaSalGraphics::SetFont(FontSelectPattern* pReqFont, int nFallbackLevel)
 
 SalLayout* AquaSalGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel)
 {
-    SalLayout* pSalLayout = nullptr;
     if (mpTextStyle[nFallbackLevel])
-    {
-        if (SalLayout::UseCommonLayout())
-            pSalLayout = new CommonSalLayout(*mpTextStyle[nFallbackLevel]);
-        else
-            pSalLayout = mpTextStyle[nFallbackLevel]->GetTextLayout();
-    }
-    return pSalLayout;
+        return new CommonSalLayout(*mpTextStyle[nFallbackLevel]);
+
+    return nullptr;
 }
 
 const FontCharMapRef AquaSalGraphics::GetFontCharMap() const