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

[Khaled Hosny]

 include/vcl/outdevstate.hxx |    5 ++---
 vcl/source/outdev/text.cxx  |    3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 72a311533a6b89dc7b268e2d6626816b24fcc61a
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Feb 11 18:14:23 2017 +0200

    LigaturesEnabled flag is never set
    
    Change-Id: Id4a4631ff7c69aa01deddd2b88626ff83fd5e7b1
    Reviewed-on: https://gerrit.libreoffice.org/34151
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index c1f42f6..8e2236b 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -66,11 +66,10 @@ enum class ComplexTextLayoutFlags
     BiDiRtl           = 0x0001,
     BiDiStrong        = 0x0002,
     TextOriginLeft    = 0x0004,
-    TextOriginRight   = 0x0008,
-    LigaturesEnabled  = 0x0200
+    TextOriginRight   = 0x0008
 };
 namespace o3tl {
-    template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x020f> {};
+    template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x000f> {};
 }
 
 class OutDevState
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 46eb2bd..7aa669f 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1186,9 +1186,6 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr,
     if( maFont.IsVertical() )
         nLayoutFlags |= SalLayoutFlags::Vertical;
 
-    if( mnTextLayoutMode & ComplexTextLayoutFlags::LigaturesEnabled )
-        nLayoutFlags |= SalLayoutFlags::EnableLigatures;
-
     if( meTextLanguage ) //TODO: (mnTextLayoutMode & ComplexTextLayoutFlags::SubstituteDigits)
     {
         // disable character localization when no digits used