summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2012-08-09 22:05:53 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2012-08-09 22:33:03 +0900
commit2eb40e3cecd2fa503c6717acfad59b51918b5aaf (patch)
treeebbcaa344b2c7554bad2c1ab37e1ade65364696f /basic
parentfbf9794729337dd24ee11f85e052133db50d4d56 (diff)
Remove a member variable no one reads
Change-Id: Iacb037bebaf1c3d77ab61be6342b42319b8a2e7b
Diffstat (limited to 'basic')
-rw-r--r--basic/source/comp/exprnode.cxx12
-rw-r--r--basic/source/comp/exprtree.cxx1
-rw-r--r--basic/source/inc/expr.hxx1
3 files changed, 1 insertions, 13 deletions
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 0abb1d0a167a..1ca35fcb1d74 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -42,7 +42,6 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, SbiToken t, SbiExprNode*
nVal = 0;
eType = SbxVARIANT; // Nodes are always Variant
eNodeType = SbxNODE;
- bComposite= sal_True;
}
SbiExprNode::SbiExprNode( SbiParser* p, double n, SbxDataType t )
@@ -73,9 +72,6 @@ SbiExprNode::SbiExprNode( SbiParser* p, const SbiSymDef& r, SbxDataType t, SbiEx
aVar.pPar = l;
aVar.pvMorePar = NULL;
aVar.pNext= NULL;
-
- // Results of functions are at no time fixed
- bComposite= sal_Bool( aVar.pDef->GetProcDef() != NULL );
}
// #120061 TypeOf
@@ -107,7 +103,6 @@ void SbiExprNode::BaseInit( SbiParser* p )
pLeft = NULL;
pRight = NULL;
pWithParent = NULL;
- bComposite = sal_False;
bError = sal_False;
}
@@ -222,7 +217,7 @@ void SbiExprNode::Optimize()
CollectBits();
}
-// Lifting of the composite- and error-bits
+// Lifting of the error-bits
void SbiExprNode::CollectBits()
{
@@ -230,13 +225,11 @@ void SbiExprNode::CollectBits()
{
pLeft->CollectBits();
bError |= pLeft->bError;
- bComposite |= pLeft->bComposite;
}
if( pRight )
{
pRight->CollectBits();
bError |= pRight->bError;
- bComposite |= pRight->bComposite;
}
}
@@ -267,7 +260,6 @@ void SbiExprNode::FoldConstants()
String rr( pRight->GetString() );
delete pLeft; pLeft = NULL;
delete pRight; pRight = NULL;
- bComposite = sal_False;
if( eTok == PLUS || eTok == CAT )
{
eTok = CAT;
@@ -341,7 +333,6 @@ void SbiExprNode::FoldConstants()
nVal = 0;
eType = SbxDOUBLE;
eNodeType = SbxNUMVAL;
- bComposite = sal_False;
sal_Bool bCheckType = sal_False;
switch( eTok )
{
@@ -431,7 +422,6 @@ void SbiExprNode::FoldConstants()
pLeft = NULL;
eType = SbxDOUBLE;
eNodeType = SbxNUMVAL;
- bComposite = sal_False;
switch( eTok )
{
case NEG:
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index c36e5a4881b2..267576afa5ce 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -512,7 +512,6 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf )
}
}
nParenLevel--;
- pRes->bComposite = sal_True;
break;
default:
// keywords here are OK at the moment!
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index d59f56b31770..85804936c81b 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -102,7 +102,6 @@ class SbiExprNode { // operators (and operands)
SbiNodeType eNodeType;
SbxDataType eType;
SbiToken eTok;
- sal_Bool bComposite; // sal_True: composite expression
sal_Bool bError; // sal_True: error
void FoldConstants();
void CollectBits(); // converting numbers to strings