summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-08-03 08:56:23 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-08-03 08:56:23 +0000
commitf97a739d5424d3c470d73799146460132e40cc71 (patch)
tree2bb56560a47525463940aac571bd4122560a91d5
parenta2697937ed61e54a2d2ca4a3a71ef5ea08dca4fd (diff)
INTEGRATION: CWS ab34 (1.27.50); FILE MERGED
2007/06/27 12:51:54 ab 1.27.50.2: RESYNC: (1.27-1.30); FILE MERGED 2007/06/20 10:48:59 ab 1.27.50.1: #i75428# Search MSO Macro Runtime lib and disable search for vba mode
-rw-r--r--basic/source/runtime/step2.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 68c85bb73087..f490a95e080e 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: step2.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: ihi $ $Date: 2007-06-05 15:11:21 $
+ * last change: $Author: hr $ $Date: 2007-08-03 09:56:23 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -117,8 +117,13 @@ SbxVariable* VBAFind( const String& rName, SbxClassType t )
SbxVariable* SbiRuntime::FindElement
( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal )
{
-
bool bIsVBAInterOp = SbiRuntime::isVBAEnabled();
+ if( bIsVBAInterOp )
+ {
+ StarBASIC* pMSOMacroRuntimeLib = GetSbData()->pMSOMacroRuntimLib;
+ if( pMSOMacroRuntimeLib != NULL )
+ pMSOMacroRuntimeLib->ResetFlag( SBX_EXTSEARCH );
+ }
SbxVariable* pElem = NULL;
if( !pObj )