diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-26 09:14:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-26 19:13:38 +0100 |
| commit | 0111686c214fa269f8e3f001f2b776a8769164bd (patch) | |
| tree | 79a68a29c1a4398a34ff13d32ec0afc8cac9f942 | |
| parent | b8b79633021488a7f3400026357a66c4cdadb4b6 (diff) | |
remove unused SalLayoutFlags enum values
Change-Id: I5d1559c2cb201ec69fc6353aaf491fbb5c0534dd
Reviewed-on: https://gerrit.libreoffice.org/64047
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | compilerplugins/clang/unusedenumconstants.readonly.results | 4 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results index 922644280873..5406774ba33c 100644 --- a/compilerplugins/clang/unusedenumconstants.readonly.results +++ b/compilerplugins/clang/unusedenumconstants.readonly.results @@ -916,10 +916,6 @@ include/vcl/menu.hxx:76 enum PopupMenuFlags ExecuteLeft include/vcl/menu.hxx:84 enum PopupMenuFlags NoHorzPlacement -include/vcl/outdev.hxx:142 - enum SalLayoutFlags EnableLigatures -include/vcl/outdev.hxx:143 - enum SalLayoutFlags SubstituteDigits include/vcl/outdev.hxx:175 enum DrawTextFlags NewsEllipsis include/vcl/outdev.hxx:190 diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 47d8872a4960..81c47e63c7c6 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -139,15 +139,13 @@ enum class SalLayoutFlags DisableKerning = 0x0010, KerningAsian = 0x0020, Vertical = 0x0040, - EnableLigatures = 0x0200, - SubstituteDigits = 0x0400, KashidaJustification = 0x0800, ForFallback = 0x2000, GlyphItemsOnly = 0x4000, }; namespace o3tl { - template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x6e77> {}; + template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x6877> {}; } typedef std::vector< tools::Rectangle > MetricVector; diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 4cbca56d9b70..0fea93f90ee3 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -72,8 +72,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs const &rArgs) TEST(DisableKerning); TEST(KerningAsian); TEST(Vertical); - TEST(EnableLigatures); - TEST(SubstituteDigits); TEST(KashidaJustification); TEST(ForFallback); #undef TEST |