mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LigaturesEnabled flag is never set

Browse Source 
Change-Id: Id4a4631ff7c69aa01deddd2b88626ff83fd5e7b1
Reviewed-on: https://gerrit.libreoffice.org/34151
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
This commit is contained in:
Khaled Hosny
2017-02-11 18:14:23 +02:00
parent 71eab1c4b0
commit 72a311533a
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/vcl/outdevstate.hxx
View File

@@ -66,11 +66,10 @@ enum class ComplexTextLayoutFlags
BiDiRtl = 0x0001, BiDiRtl = 0x0001,
BiDiStrong = 0x0002, BiDiStrong = 0x0002,
TextOriginLeft = 0x0004, TextOriginLeft = 0x0004,
TextOriginRight = 0x0008, TextOriginRight = 0x0008
LigaturesEnabled = 0x0200
}; };
namespace o3tl { namespace o3tl {
template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x020f> {}; template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x000f> {};
} }
class OutDevState class OutDevState

3
vcl/source/outdev/text.cxx
View File

@@ -1186,9 +1186,6 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr,
if( maFont.IsVertical() ) if( maFont.IsVertical() )
nLayoutFlags |= SalLayoutFlags::Vertical; nLayoutFlags |= SalLayoutFlags::Vertical;
if( mnTextLayoutMode & ComplexTextLayoutFlags::LigaturesEnabled )
nLayoutFlags |= SalLayoutFlags::EnableLigatures;
if( meTextLanguage ) //TODO: (mnTextLayoutMode & ComplexTextLayoutFlags::SubstituteDigits) if( meTextLanguage ) //TODO: (mnTextLayoutMode & ComplexTextLayoutFlags::SubstituteDigits)
{ {
// disable character localization when no digits used // disable character localization when no digits used