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

[Takeshi Abe]

 starmath/inc/error.hxx    |    1 -
 starmath/inc/starmath.hrc |    3 +--
 starmath/source/parse.cxx |    3 +--
 starmath/source/smres.src |    5 -----
 4 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit dabcb80966a25b9f092d7ffd4feef0e7e4a2caab
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Mar 2 16:09:49 2017 +0900

    starmath: Replace SmParseError::FuncExpected with assertion
    
    Change-Id: I7d1089fd615ac09a6e59c06c094f79364510b290
    Reviewed-on: https://gerrit.libreoffice.org/34800
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/starmath/inc/error.hxx b/starmath/inc/error.hxx
index aff5faf..a05123d 100644
--- a/starmath/inc/error.hxx
+++ b/starmath/inc/error.hxx
@@ -28,7 +28,6 @@ enum class SmParseError
     None,
     UnexpectedChar,
     UnexpectedToken,
-    FuncExpected,
     PoundExpected,
     ColorExpected,
     LgroupExpected,
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 508ad28..3eba1d4 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -132,8 +132,7 @@
 #define RID_ERR_RGROUPEXPECTED      (RID_APP_START + 924)
 #define RID_ERR_LBRACEEXPECTED      (RID_APP_START + 925)
 #define RID_ERR_RBRACEEXPECTED      (RID_APP_START + 926)
-#define RID_ERR_FUNCEXPECTED        (RID_APP_START + 927)
-// blank: 928 - 931
+// blank: 927 - 931
 #define RID_ERR_POUNDEXPECTED       (RID_APP_START + 932)
 #define RID_ERR_COLOREXPECTED       (RID_APP_START + 933)
 #define RID_ERR_LPARENTEXPECTED     (RID_APP_START + 934)
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 0d38459..4bb9ff7 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2097,7 +2097,7 @@ void SmParser::DoFunction()
             break;
 
         default:
-            Error(SmParseError::FuncExpected);
+            assert(false);
     }
 }
 
@@ -2345,7 +2345,6 @@ void SmParser::AddError(SmParseError Type, SmNode *pNode)
         case SmParseError::RgroupExpected: nRID = RID_ERR_RGROUPEXPECTED;      break;
         case SmParseError::LbraceExpected: nRID = RID_ERR_LBRACEEXPECTED;      break;
         case SmParseError::RbraceExpected: nRID = RID_ERR_RBRACEEXPECTED;      break;
-        case SmParseError::FuncExpected:   nRID = RID_ERR_FUNCEXPECTED;        break;
         case SmParseError::PoundExpected:  nRID = RID_ERR_POUNDEXPECTED;       break;
         case SmParseError::ColorExpected:  nRID = RID_ERR_COLOREXPECTED;       break;
         case SmParseError::RightExpected:  nRID = RID_ERR_RIGHTEXPECTED;       break;
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index b5efdeb..615c6dc 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -196,11 +196,6 @@ String RID_ERR_RBRACEEXPECTED
     Text [ en-US ] = "')' expected" ;
 };
 
-String RID_ERR_FUNCEXPECTED
-{
-    Text [ en-US ] = "Function expected" ;
-};
-
 String RID_ERR_POUNDEXPECTED
 {
     Text [ en-US ] = "'#' expected" ;