diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 10:35:22 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 10:35:22 +0000 |
| commit | e5831030aa2c07660a2277a1b68c15a71877d2f0 (patch) | |
| tree | 69ec7f08aaca54ef600de83e69cb9d8111dae599 /basic/source/comp | |
| parent | 3fb29e5345b10e55484bd72499689e87ef5d9854 (diff) | |
INTEGRATION: CWS geordi2q09 (1.10.56); FILE MERGED
2003/11/21 10:52:28 obo 1.10.56.1: #111934#: join CWS pmselectedfixes2
Diffstat (limited to 'basic/source/comp')
| -rw-r--r-- | basic/source/comp/dim.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index d97f5e46d7d5..07379425bc8f 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dim.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: vg $ $Date: 2003-05-22 08:53:04 $ + * last change: $Author: rt $ $Date: 2003-12-01 11:35:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -728,6 +728,8 @@ void SbiParser::SubFunc() // Einlesen einer Prozedur +BOOL runsInSetup( void ); + void SbiParser::DefProc( BOOL bStatic ) { USHORT l1 = nLine, l2 = nLine; @@ -750,7 +752,8 @@ void SbiParser::DefProc( BOOL bStatic ) pProc = NULL; } // #100027: Multiple declaration -> Error - else if( pProc->IsUsedForProcDecl() ) + // #112787: Not for setup, REMOVE for 8 + else if( !runsInSetup() && pProc->IsUsedForProcDecl() ) { Error( SbERR_PROC_DEFINED, pDef->GetName() ); delete pDef; |