From 47ea13ef8dc8ab9aeded6121845e3ebd1d28b292 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Wed, 23 Nov 2016 23:28:53 +0200
Subject: Kill the old Unix layout engines

Change-Id: I9e1667faf9644dfab025c82cb11a6490d1e8f998
Reviewed-on: https://gerrit.libreoffice.org/31221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
---
 vcl/inc/unx/genpspgraphics.h |  1 -
 vcl/inc/unx/glyphcache.hxx   | 43 -------------------------------------------
 vcl/inc/unx/salgdi.h         |  2 --
 3 files changed, 46 deletions(-)

(limited to 'vcl/inc')

diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 792e44f832bb..5d0acd4484f5 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -34,7 +34,6 @@ class PhysicalFontCollection;
 namespace psp { struct JobData; class PrinterGfx; }
 
 class FreetypeFont;
-class ServerFontLayout;
 class FontAttributes;
 class SalInfoPrinter;
 class GlyphCache;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index ce5dd1f30885..28a3665e8e6d 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -43,8 +43,6 @@ class GlyphData;
 class FontConfigFontOptions;
 class PhysicalFontCollection;
 class FreetypeFont;
-class ServerFontLayout;
-class ServerFontLayoutEngine;
 class SvpGcpHelper;
 
 namespace basegfx { class B2DPolyPolygon; }
@@ -178,7 +176,6 @@ public:
 
 private:
     friend class GlyphCache;
-    friend class ServerFontLayout;
     friend class FreetypeFontInstance;
     friend class X11SalGraphics;
     friend class CairoTextRender;
@@ -193,9 +190,6 @@ private:
     void                    ReleaseFromGarbageCollect();
 
     void                    ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_* ) const;
-    void                    ApplyGSUB( const FontSelectPattern& );
-
-    ServerFontLayoutEngine* GetLayoutEngine();
 
     typedef std::unordered_map<int,GlyphData> GlyphList;
     mutable GlyphList       maGlyphList;
@@ -233,7 +227,6 @@ private:
     typedef std::unordered_map<int,int> GlyphSubstitution;
     GlyphSubstitution       maGlyphSubstitution;
 
-    ServerFontLayoutEngine* mpLayoutEngine;
     hb_font_t*              mpHbFont;
 };
 
@@ -250,42 +243,6 @@ private:
     FreetypeFont*           mpFreetypeFont;
 };
 
-class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout
-{
-public:
-                            ServerFontLayout( FreetypeFont& );
-
-    virtual bool            LayoutText( ImplLayoutArgs& ) override;
-    virtual void            AdjustLayout( ImplLayoutArgs& ) override;
-    virtual void            DrawText( SalGraphics& ) const override;
-
-    void                    SetNeedFallback(
-                                ImplLayoutArgs& rArgs,
-                                sal_Int32 nIndex,
-                                bool bRightToLeft);
-
-    FreetypeFont&           GetFreetypeFont() const   { return mrFreetypeFont; }
-
-    virtual std::shared_ptr<vcl::TextLayoutCache>
-        CreateTextLayoutCache(OUString const&) const override;
-
-private:
-    FreetypeFont&           mrFreetypeFont;
-    css::uno::Reference<css::i18n::XBreakIterator> mxBreak;
-
-                            ServerFontLayout( const ServerFontLayout& ) = delete;
-                            ServerFontLayout& operator=( const ServerFontLayout& ) = delete;
-
-};
-
-class ServerFontLayoutEngine
-{
-public:
-    virtual                 ~ServerFontLayoutEngine() {}
-
-    virtual bool            Layout(ServerFontLayout&, ImplLayoutArgs&) = 0;
-};
-
 #endif // INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index acdaa297b61f..3bad16eea681 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -54,7 +54,6 @@ class X11OpenGLSalGraphicsImpl;
 class X11OpenGLSalVirtualDevice;
 class FreetypeFont;
 class ImplLayoutArgs;
-class ServerFontLayout;
 class PhysicalFontCollection;
 class PhysicalFontFace;
 class SalGraphicsImpl;
@@ -66,7 +65,6 @@ namespace basegfx {
 
 class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics
 {
-    friend class ServerFontLayout;
     friend class X11SalGraphicsImpl;
     friend class X11OpenGLSalGraphicsImpl;
     friend class X11CairoTextRender;
-- 
cgit