summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2016-07-06 18:32:17 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2016-07-07 06:52:48 +0000
commit048f298d9c87ec46c2415a1d23b87b20a1035cab (patch)
treee60797cfef8bba8b3b284fb2241661190ea6336c
parent9547d9f7ac91cbca162270d429b1e776aea5fc51 (diff)
starmath: Drop useless PE_BINOPER_EXPECTED
as no code generates the error. Change-Id: I86f2db28030090e0a9284e7771f26821468bb685 Reviewed-on: https://gerrit.libreoffice.org/26974 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
-rw-r--r--starmath/inc/error.hxx2
-rw-r--r--starmath/inc/starmath.hrc2
-rw-r--r--starmath/source/parse.cxx1
-rw-r--r--starmath/source/smres.src5
4 files changed, 2 insertions, 8 deletions
diff --git a/starmath/inc/error.hxx b/starmath/inc/error.hxx
index 648b18ff3a21..65171f0d1fef 100644
--- a/starmath/inc/error.hxx
+++ b/starmath/inc/error.hxx
@@ -28,7 +28,7 @@ enum SmParseError
PE_NONE,
PE_UNEXPECTED_CHAR, PE_UNEXPECTED_TOKEN,
PE_FUNC_EXPECTED, PE_UNOPER_EXPECTED,
- PE_BINOPER_EXPECTED, PE_SYMBOL_EXPECTED,
+ PE_SYMBOL_EXPECTED,
PE_IDENTIFIER_EXPECTED, PE_POUND_EXPECTED,
PE_COLOR_EXPECTED, PE_LGROUP_EXPECTED,
PE_RGROUP_EXPECTED, PE_LBRACE_EXPECTED,
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 4c3f2a3ed621..e46bdc8b41b8 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -126,7 +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_BINOPEREXPECTED (RID_APP_START + 929)
+
#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930)
#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931)
#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932)
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index a25b3a110a42..96cbc2062cb7 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2376,7 +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_BINOPER_EXPECTED: nRID = RID_ERR_BINOPEREXPECTED; 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;
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index a0a51268acda..d1525e2f25f9 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -206,11 +206,6 @@ String RID_ERR_UNOPEREXPECTED
Text [ en-US ] = "Unary operator expected" ;
};
-String RID_ERR_BINOPEREXPECTED
-{
- Text [ en-US ] = "Binary operator expected" ;
-};
-
String RID_ERR_SYMBOLEXPECTED
{
Text [ en-US ] = "Symbol expected" ;