[Libreoffice-commits] core.git: starmath/inc starmath/source

[Takeshi Abe]

 starmath/inc/token.hxx    |    3 +--
 starmath/source/parse.cxx |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 70aa5799336de6cbd1d964e2e9a176b44d438db2
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed May 18 11:30:38 2016 +0900

    starmath: Remove obsolete TG::Discarded
    
    which was originally TGDISCARDED until cc1a0ba927ad6f85103059aa8e6108017f436304,
    and its usage was gone with 9adcd261054a0e99ae032be5e7428e28a6663975.
    
    Change-Id: Idb01f30b7b140b17deead7c5a83128fa1f3bdf4c
    Reviewed-on: https://gerrit.libreoffice.org/25074
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index acb944a..eea2262 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -42,12 +42,11 @@ enum class TG {
     Color         = 0x001000,
     Font          = 0x002000,
     Standalone    = 0x004000,
-    Discarded     = 0x008000,
     Limit         = 0x010000,
     FontAttr      = 0x020000
 };
 namespace o3tl {
-    template<> struct typed_flags<TG> : is_typed_flags<TG, 0x03ffff> {};
+    template<> struct typed_flags<TG> : is_typed_flags<TG, 0x037fff> {};
 }
 
 enum SmTokenType
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index b3bef50..1c88da9 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -70,12 +70,12 @@ static const SmTokenTableEntry aTokenTable[] =
     { "arcoth", TACOTH, '\0', TG::Function, 5 },
     { "acute", TACUTE, MS_ACUTE, TG::Attribute, 5 },
     { "aleph" , TALEPH, MS_ALEPH, TG::Standalone, 5 },
-    { "alignb", TALIGNC, '\0', TG::Align | TG::Discarded, 0},
+    { "alignb", TALIGNC, '\0', TG::Align, 0},
     { "alignc", TALIGNC, '\0', TG::Align, 0},
     { "alignl", TALIGNL, '\0', TG::Align, 0},
-    { "alignm", TALIGNC, '\0', TG::Align | TG::Discarded, 0},
+    { "alignm", TALIGNC, '\0', TG::Align, 0},
     { "alignr", TALIGNR, '\0', TG::Align, 0},
-    { "alignt", TALIGNC, '\0', TG::Align | TG::Discarded, 0},
+    { "alignt", TALIGNC, '\0', TG::Align, 0},
     { "and", TAND, MS_AND, TG::Product, 0},
     { "approx", TAPPROX, MS_APPROX, TG::Relation, 0},
     { "aqua", TAQUA, '\0', TG::Color, 0},