diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-07-07 16:21:25 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-07 11:56:46 +0000 |
| commit | 68585e3045e07c1b8d269d3e8d428d7a38646dbb (patch) | |
| tree | ccc4daddbddff5b5eaf5801f5c6e6f3475b4f316 | |
| parent | 3cecadbddd137770552ceaad018336e195233e4a (diff) | |
starmath: Remove a couple of unused error codes
Change-Id: Iae3118150cf9119e48b1740ea630dea0ebef895a
Reviewed-on: https://gerrit.libreoffice.org/26998
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | starmath/inc/error.hxx | 3 | ||||
| -rw-r--r-- | starmath/inc/starmath.hrc | 4 | ||||
| -rw-r--r-- | starmath/source/parse.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/smres.src | 10 |
4 files changed, 2 insertions, 17 deletions
diff --git a/starmath/inc/error.hxx b/starmath/inc/error.hxx index 65171f0d1fef..48d7512d3f58 100644 --- a/starmath/inc/error.hxx +++ b/starmath/inc/error.hxx @@ -28,8 +28,7 @@ enum SmParseError PE_NONE, PE_UNEXPECTED_CHAR, PE_UNEXPECTED_TOKEN, PE_FUNC_EXPECTED, PE_UNOPER_EXPECTED, - PE_SYMBOL_EXPECTED, - PE_IDENTIFIER_EXPECTED, PE_POUND_EXPECTED, + PE_POUND_EXPECTED, PE_COLOR_EXPECTED, PE_LGROUP_EXPECTED, PE_RGROUP_EXPECTED, PE_LBRACE_EXPECTED, PE_RBRACE_EXPECTED, PE_PARENT_MISMATCH, diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index e46bdc8b41b8..8805c60c04bd 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -126,9 +126,7 @@ #define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926) #define RID_ERR_FUNCEXPECTED (RID_APP_START + 927) #define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928) - -#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930) -#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931) +// blank: 929 - 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 96cbc2062cb7..f1434c9939d2 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2376,8 +2376,6 @@ void SmParser::AddError(SmParseError Type, SmNode *pNode) case PE_RBRACE_EXPECTED: nRID = RID_ERR_RBRACEEXPECTED; break; case PE_FUNC_EXPECTED: nRID = RID_ERR_FUNCEXPECTED; break; case PE_UNOPER_EXPECTED: nRID = RID_ERR_UNOPEREXPECTED; break; - case PE_SYMBOL_EXPECTED: nRID = RID_ERR_SYMBOLEXPECTED; break; - case PE_IDENTIFIER_EXPECTED: nRID = RID_ERR_IDENTEXPECTED; break; case PE_POUND_EXPECTED: nRID = RID_ERR_POUNDEXPECTED; break; case PE_COLOR_EXPECTED: nRID = RID_ERR_COLOREXPECTED; break; case PE_RIGHT_EXPECTED: nRID = RID_ERR_RIGHTEXPECTED; break; diff --git a/starmath/source/smres.src b/starmath/source/smres.src index d1525e2f25f9..50ba4a756a24 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -206,16 +206,6 @@ String RID_ERR_UNOPEREXPECTED Text [ en-US ] = "Unary operator expected" ; }; -String RID_ERR_SYMBOLEXPECTED -{ - Text [ en-US ] = "Symbol expected" ; -}; - -String RID_ERR_IDENTEXPECTED -{ - Text [ en-US ] = "Identifier expected" ; -}; - String RID_ERR_POUNDEXPECTED { Text [ en-US ] = "'#' expected" ; |