summaryrefslogtreecommitdiff
path: root/basic/source/comp/exprgen.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 16:41:29 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 16:41:29 +0000
commit1edb7475170bdf186dc57ec95573a8947b269fc6 (patch)
treeaae4527c533ca48cc885f933a63742bc4efc4df0 /basic/source/comp/exprgen.cxx
parent5b513b0e2748b0d078a1862c347822146db8bf09 (diff)
INTEGRATION: CWS warnings01 (1.10.8); FILE MERGED
2006/04/07 18:38:29 sb 1.10.8.3: RESYNC: (1.12-1.13); FILE MERGED 2005/12/01 14:55:56 ab 1.10.8.2: #i53898# Removed warnings for unxlngi6 2005/11/07 12:02:43 ab 1.10.8.1: #i53898# Removed warnings
Diffstat (limited to 'basic/source/comp/exprgen.cxx')
-rw-r--r--basic/source/comp/exprgen.cxx15
1 files changed, 7 insertions, 8 deletions
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 46c0a3a796c9..c657eed5c8c9 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: exprgen.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: rt $ $Date: 2006-02-09 12:46:49 $
+ * last change: $Author: hr $ $Date: 2006-06-19 17:41:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -34,7 +34,6 @@
************************************************************************/
#include "sbcomp.hxx"
-#pragma hdrstop
#include "expr.hxx"
// Umsetztabelle fuer Token-Operatoren und Opcodes
@@ -93,7 +92,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
}
else if( IsOperand() )
{
- SbiExprNode* pWithParent = NULL;
+ SbiExprNode* pWithParent_ = NULL;
SbiOpcode eOp;
if( aVar.pDef->GetScope() == SbPARAM )
{
@@ -115,7 +114,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
}
}
// AB: 17.12.1995, Spezialbehandlung fuer WITH
- else if( (pWithParent = GetWithParent()) != NULL )
+ else if( (pWithParent_ = GetWithParent()) != NULL )
{
eOp = _ELEM; // .-Ausdruck in WITH
}
@@ -135,8 +134,8 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
for( SbiExprNode* p = this; p; p = p->aVar.pNext )
{
- if( p == this && pWithParent != NULL )
- pWithParent->Gen();
+ if( p == this && pWithParent_ != NULL )
+ pWithParent_->Gen();
p->GenElement( eOp );
eOp = _ELEM;
}
@@ -205,7 +204,7 @@ void SbiExprList::Gen()
pParser->aGen.Gen( _ARGC );
// AB 10.1.96: Typ-Anpassung bei DECLARE
USHORT nCount = 1, nParAnz = 0;
- SbiSymPool* pPool;
+ SbiSymPool* pPool = NULL;
if( pProc )
{
pPool = &pProc->GetParams();