basic/source/comp/exprnode.cxx | 12 +----------- basic/source/comp/exprtree.cxx | 1 - basic/source/inc/expr.hxx | 1 - basic/source/inc/sbjsmeth.hxx | 3 --- 4 files changed, 1 insertion(+), 16 deletions(-)
New commits: commit 414ecabbd56ab0ea7c041de4268e1c18187a070a Author: Takeshi Abe <t...@fixedpoint.jp> Date: Thu Aug 9 22:19:37 2012 +0900 Remove useless #ifndef guard Change-Id: Iddb666611ff11db0912832a73bd8b95438985383 diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx index 055c957..e53473a 100644 --- a/basic/source/inc/sbjsmeth.hxx +++ b/basic/source/inc/sbjsmeth.hxx @@ -37,10 +37,7 @@ public: TYPEINFO(); }; -#ifndef __SB_SBJSCRIPTMETHODREF_HXX -#define __SB_SBJSCRIPTMETHODREF_HXX SV_DECL_IMPL_REF(SbJScriptMethod) -#endif #endif commit 2eb40e3cecd2fa503c6717acfad59b51918b5aaf Author: Takeshi Abe <t...@fixedpoint.jp> Date: Thu Aug 9 22:05:53 2012 +0900 Remove a member variable no one reads Change-Id: Iacb037bebaf1c3d77ab61be6342b42319b8a2e7b diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index 0abb1d0..1ca35fc 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 c36e5a4..267576a 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 d59f56b..8580493 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits