diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 09:54:10 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 09:54:10 +0000 |
| commit | 08d5c4825f73ef6c4470f04d2b47e86fae41ab74 (patch) | |
| tree | 638add183a1abc3f5677f00ce40c2a0103859575 /basic/source/classes/sbxmod.cxx | |
| parent | 6759fc62698dac502ba680d50490a612f08ab0d3 (diff) | |
INTEGRATION: CWS ab27 (1.30.2); FILE MERGED
2006/07/20 12:47:35 ab 1.30.2.2: RESYNC: (1.30-1.31); FILE MERGED
2006/05/24 08:15:46 ab 1.30.2.1: #i65532# Clear CreateObject function as it can contain an Uno object
Diffstat (limited to 'basic/source/classes/sbxmod.cxx')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index a5dcd486b1..2888dde2e5 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sbxmod.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: hr $ $Date: 2006-06-19 17:40:39 $ + * last change: $Author: ihi $ $Date: 2006-08-04 10:54:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -644,12 +644,18 @@ void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic ) if( pVar ) pVar->SbxValue::Clear(); - // return-Wert von CreateUnoDialog loeschen + // return-Wert von CDec loeschen static String aName3( RTL_CONSTASCII_USTRINGPARAM("CDec") ); pVar = pBasic->GetRtl()->Find( aName3, SbxCLASS_METHOD ); if( pVar ) pVar->SbxValue::Clear(); + // return-Wert von CreateObject loeschen + static String aName4( RTL_CONSTASCII_USTRINGPARAM("CreateObject") ); + pVar = pBasic->GetRtl()->Find( aName4, SbxCLASS_METHOD ); + if( pVar ) + pVar->SbxValue::Clear(); + // Ueber alle Sub-Basics gehen SbxArray* pObjs = pBasic->GetObjects(); USHORT nCount = pObjs->Count(); |