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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |    4 ----
 include/vcl/outdev.hxx                                     |    4 +---
 vcl/source/gdi/sallayout.cxx                               |    2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 0111686c214fa269f8e3f001f2b776a8769164bd
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Nov 26 09:14:03 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 26 19:13:38 2018 +0100

    remove unused SalLayoutFlags enum values
    
    Change-Id: I5d1559c2cb201ec69fc6353aaf491fbb5c0534dd
    Reviewed-on: https://gerrit.libreoffice.org/64047
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

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