diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-02 08:58:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-02 08:58:03 +0000 |
| commit | a422e9f4d10afda5dbe0ab983c8f0927cf848715 (patch) | |
| tree | 0f27353c95275ddc46b0d52d893dad0f256de37f /basic | |
| parent | a737d69538418761b9577ef56b4a54322dced9f3 (diff) | |
INTEGRATION: CWS npower10 (1.16.132); FILE MERGED
2008/05/07 07:10:52 pflin 1.16.132.2: RESYNC: (1.16-1.17); FILE MERGED
2007/12/20 21:23:01 npower 1.16.132.1: #58089
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/comp/exprgen.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx index 19dfe21c14..3af79f89d8 100644 --- a/basic/source/comp/exprgen.cxx +++ b/basic/source/comp/exprgen.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: exprgen.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.19 $ * * This file is part of OpenOffice.org. * @@ -127,9 +127,17 @@ void SbiExprNode::Gen( RecursiveMode eRecMode ) (aVar.pDef->IsGlobal() ? _FIND_G : _FIND); } - if( eOp == _FIND && pGen->GetParser()->bClassModule ) - eOp = _FIND_CM; - + if( eOp == _FIND ) + { + + SbiProcDef* pProc = aVar.pDef->GetProcDef(); + if ( pGen->GetParser()->bClassModule ) + eOp = _FIND_CM; + else if ( aVar.pDef->IsStatic() || pProc && pProc->IsStatic() ) + { + eOp = _FIND_STATIC; + } + } for( SbiExprNode* p = this; p; p = p->aVar.pNext ) { if( p == this && pWithParent_ != NULL ) |