diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-13 17:47:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-13 17:47:36 +0000 |
| commit | 34083844dfef3faff3004c17b0248409c661300b (patch) | |
| tree | 8e70f2fbf72ca08f04495829c44a2b297b483857 /basic | |
| parent | 5d98ed5c6a4afc0a7943318c510e56aef8c45193 (diff) | |
INTEGRATION: CWS ab12fixes (1.5.92); FILE MERGED
2004/12/17 15:37:09 ab 1.5.92.2: RESYNC: (1.5-1.6); FILE MERGED
2004/11/15 13:15:29 ab 1.5.92.1: #i31510# SbModule::Compile(): Clear only variables of own library if Basic is running
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/comp/sbcomp.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index 87bcdc53b271..1d99a28a0cb0 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sbcomp.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2004-11-15 16:35:10 $ + * last change: $Author: kz $ $Date: 2005-01-13 18:47:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,11 +170,15 @@ BOOL SbModule::Compile() { pBasic->ClearAllModuleVars(); - SbxObject* pParent = pBasic->GetParent(); - if( pParent ) - pBasic = PTR_CAST(StarBASIC,pParent); - if( pBasic ) - pBasic->ClearAllModuleVars(); + // #i31510 Init other libs only if Basic isn't running + if( pINST == NULL ) + { + SbxObject* pParent = pBasic->GetParent(); + if( pParent ) + pBasic = PTR_CAST(StarBASIC,pParent); + if( pBasic ) + pBasic->ClearAllModuleVars(); + } } #ifdef DBG_SAVE_DISASSEMBLY |