From b1f8cf37828d5f37527e54774aa4935610aa6325 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 2 Nov 2016 10:57:21 +0200
Subject: loplugin:singlevalfields
Change-Id: I65f96d9cd24572c8d0946acf4d2d45eb3db83a76
Reviewed-on: https://gerrit.libreoffice.org/30476
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
basic/source/comp/exprtree.cxx | 2 +-
basic/source/comp/io.cxx | 2 --
basic/source/inc/expr.hxx | 3 +--
3 files changed, 2 insertions(+), 5 deletions(-)
(limited to 'basic/source')
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 179aaf3b488e..e7a2210ada0c 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -192,7 +192,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
return pNd;
}
- SbiToken eTok = (pKeywordSymbolInfo == nullptr) ? pParser->Next() : pKeywordSymbolInfo->m_eTok;
+ SbiToken eTok = (pKeywordSymbolInfo == nullptr) ? pParser->Next() : SYMBOL;
// memorize the parsing's begin
pParser->LockColumn();
OUString aSym( (pKeywordSymbolInfo == nullptr) ? pParser->GetSym() : pKeywordSymbolInfo->m_aKeywordSymbol );
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 6e1c161923e7..5314874f3521 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -118,7 +118,6 @@ void SbiParser::Line()
KeywordSymbolInfo aInfo;
aInfo.m_aKeywordSymbol = "line";
aInfo.m_eSbxDataType = GetType();
- aInfo.m_eTok = SYMBOL;
Symbol( &aInfo );
}
@@ -282,7 +281,6 @@ void SbiParser::Name()
KeywordSymbolInfo aInfo;
aInfo.m_aKeywordSymbol = "name";
aInfo.m_eSbxDataType = GetType();
- aInfo.m_eTok = SYMBOL;
Symbol( &aInfo );
return;
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 68a7bf90be0f..a43f4544031f 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -24,6 +24,7 @@
#include "opcodes.hxx"
#include "token.hxx"
+#include <vector>
class SbiExprNode;
class SbiExpression;
@@ -34,7 +35,6 @@ class SbiSymDef;
class SbiProcDef;
-#include <vector>
typedef ::std::unique_ptr<SbiExprList> SbiExprListPtr;
typedef ::std::vector<SbiExprListPtr> SbiExprListVector;
@@ -49,7 +49,6 @@ struct KeywordSymbolInfo
{
OUString m_aKeywordSymbol;
SbxDataType m_eSbxDataType;
- SbiToken m_eTok;
};
enum SbiExprType { // expression types:
--
cgit