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

[Khaled Hosny]

 include/vcl/outdev.hxx                   |    3 +--
 vcl/source/gdi/sallayout.cxx             |    1 -
 vcl/unx/generic/gdi/cairotextrender.cxx  |   13 ++++---------
 vcl/unx/generic/print/genpspgraphics.cxx |   18 ++++--------------
 4 files changed, 9 insertions(+), 26 deletions(-)

New commits:
commit 8c173ce9ba4d90770cd85b148fe3122a097396a7
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Nov 24 01:12:17 2016 +0200

    DisableGlyphProcessing flag is never set now
    
    Change-Id: I4a56c5d7490dd78f5cb72f2b821fb43c93f64b2d
    Reviewed-on: https://gerrit.libreoffice.org/31223
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>
    Tested-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0088136..2403fc9 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -141,13 +141,12 @@ enum class SalLayoutFlags
     EnableLigatures         = 0x0200,
     SubstituteDigits        = 0x0400,
     KashidaJustification    = 0x0800,
-    DisableGlyphProcessing  = 0x1000,
     ForFallback             = 0x2000,
     DrawBullet              = 0x4000,
 };
 namespace o3tl
 {
-    template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x7f77> {};
+    template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x6f77> {};
 }
 
 typedef std::vector< Rectangle > MetricVector;
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 4c15c8f..63a65e6 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -75,7 +75,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs)
         TEST(EnableLigatures);
         TEST(SubstituteDigits);
         TEST(KashidaJustification);
-        TEST(DisableGlyphProcessing);
         TEST(ForFallback);
 #undef TEST
         s << "}";
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index ea5ab47..5109470 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -478,17 +478,12 @@ bool CairoTextRender::GetGlyphOutline( sal_GlyphId aGlyphId,
     return false;
 }
 
-SalLayout* CairoTextRender::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
+SalLayout* CairoTextRender::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel)
 {
-    SalLayout* pLayout = nullptr;
+    if (mpFreetypeFont[nFallbackLevel])
+        return new CommonSalLayout(*mpFreetypeFont[nFallbackLevel]);
 
-    if( mpFreetypeFont[ nFallbackLevel ]
-    && !(rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing) )
-    {
-        pLayout = new CommonSalLayout(*mpFreetypeFont[nFallbackLevel]);
-    }
-
-    return pLayout;
+    return nullptr;
 }
 
 #if ENABLE_CAIRO_CANVAS
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 3f346b5..d6e6c03 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -946,22 +946,12 @@ bool GenPspGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
     return false;
 }
 
-SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
+SalLayout* GenPspGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel)
 {
-    if( nFallbackLevel > 0 )
-        rArgs.mnFlags &= ~SalLayoutFlags::DisableGlyphProcessing;
-
-    GenericSalLayout* pLayout = nullptr;
-
-    if( m_pFreetypeFont[ nFallbackLevel ]
-        && !(rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing) )
-    {
-        pLayout = new PspCommonSalLayout(*m_pPrinterGfx, *m_pFreetypeFont[nFallbackLevel]);
-    }
+    if (m_pFreetypeFont[nFallbackLevel])
+        return new PspCommonSalLayout(*m_pPrinterGfx, *m_pFreetypeFont[nFallbackLevel]);
     else
-        pLayout = new PspFontLayout( *m_pPrinterGfx );
-
-    return pLayout;
+        return new PspFontLayout(*m_pPrinterGfx);
 }
 
 bool GenPspGraphics::CreateFontSubset(