[Libreoffice-commits] core.git: starmath/inc starmath/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Sep 6 07:32:44 UTC 2016
starmath/inc/node.hxx | 2 +-
starmath/source/cursor.cxx | 2 +-
starmath/source/parse.cxx | 2 +-
starmath/source/visitors.cxx | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit c966bac490bb161cb2f5ede962a6e3e7f002e178
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Sep 6 13:56:18 2016 +0900
starmath: Drop unused 1st argument of SmErrorNode's ctor
Change-Id: I01d8fa4bcfbfd4757230ff54902967f709216111
Reviewed-on: https://gerrit.libreoffice.org/28678
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 91414ec..4a659b3 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -597,7 +597,7 @@ public:
class SmErrorNode : public SmMathSymbolNode
{
public:
- SmErrorNode(SmParseError /*eError*/, const SmToken &rNodeToken)
+ explicit SmErrorNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NERROR, rNodeToken)
{
SetText(OUString(MS_ERROR));
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index bdf5d31..c961741 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1661,7 +1661,7 @@ SmNode* SmNodeListParser::Postfix(){
}
SmNode* SmNodeListParser::Error(){
- return new SmErrorNode(PE_UNEXPECTED_TOKEN, SmToken());
+ return new SmErrorNode(SmToken());
}
bool SmNodeListParser::IsOperator(const SmToken &token) {
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 7a6c995..1a441e0 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2287,7 +2287,7 @@ void SmParser::DoGlyphSpecial()
void SmParser::Error(SmParseError eError)
{
SmStructureNode *pSNode = new SmExpressionNode(m_aCurToken);
- SmErrorNode *pErr = new SmErrorNode(eError, m_aCurToken);
+ SmErrorNode *pErr = new SmErrorNode(m_aCurToken);
pSNode->SetSubNodes(pErr, nullptr);
//! put a structure node on the stack (instead of the error node itself)
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index ecedac1..0c3b0ca 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -1830,8 +1830,7 @@ void SmCloningVisitor::Visit( SmBlankNode* pNode )
void SmCloningVisitor::Visit( SmErrorNode* pNode )
{
- //PE_NONE is used the information have been discarded and isn't used
- pResult = new SmErrorNode( PE_NONE, pNode->GetToken( ) );
+ pResult = new SmErrorNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult );
}
More information about the Libreoffice-commits
mailing list