diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-08 07:17:00 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-11 00:26:54 +0000 |
| commit | 9db5cfc889403e923a41dc88b07d0c973d227552 (patch) | |
| tree | 7378e18b7138d8ff1a03293c44f8203587141ec5 /include | |
| parent | Drop a hack for Type 1, the future is here (diff) | |
| download | core-9db5cfc889403e923a41dc88b07d0c973d227552.tar.gz core-9db5cfc889403e923a41dc88b07d0c973d227552.zip | |
Drop ComplexDisabled flags that does nothing
There is no such thing as simple text layout in this brave new world.
Change-Id: I641b7efa5ec8fdd9839c291e7f2fdb736361ef1e
Reviewed-on: https://gerrit.libreoffice.org/31824
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/outdevstate.hxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 15bdb8f035d4..7cdda54c2a73 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -137,7 +137,6 @@ enum class SalLayoutFlags KerningPairs = 0x0010, KerningAsian = 0x0020, Vertical = 0x0040, - ComplexDisabled = 0x0100, EnableLigatures = 0x0200, SubstituteDigits = 0x0400, KashidaJustification = 0x0800, @@ -145,7 +144,7 @@ enum class SalLayoutFlags }; namespace o3tl { - template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x2f77> {}; + template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x2e77> {}; } typedef std::vector< Rectangle > MetricVector; diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx index 4a509a15e063..c1f42f65426f 100644 --- a/include/vcl/outdevstate.hxx +++ b/include/vcl/outdevstate.hxx @@ -67,11 +67,10 @@ enum class ComplexTextLayoutFlags BiDiStrong = 0x0002, TextOriginLeft = 0x0004, TextOriginRight = 0x0008, - ComplexDisabled = 0x0100, LigaturesEnabled = 0x0200 }; namespace o3tl { - template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x030f> {}; + template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x020f> {}; } class OutDevState |