[Libreoffice-commits] .: basic/source

Noel Power noelp at kemper.freedesktop.org
Fri Oct 15 08:13:53 PDT 2010


 basic/source/classes/sbxmod.cxx |   23 -----------------------
 1 file changed, 23 deletions(-)

New commits:
commit e106da87a95ddf9b93c25953416e58fedaa682a5
Author: Noel Power <noel.power at novell.com>
Date:   Fri Oct 15 16:12:11 2010 +0100

    fix fdo#30853 remove find related to Oracle specific MacroMigration

diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 7719814..813db18 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1131,29 +1131,6 @@ USHORT SbModule::Run( SbMethod* pMeth )
 
         pINST = new SbiInstance( (StarBASIC*) GetParent() );
 
-        // Launcher problem
-        // i80726 The Find below will genarate an error in Testtool so we reset it unless there was one before already
-        BOOL bWasError = SbxBase::GetError() != 0;
-        SbxVariable* pMSOMacroRuntimeLibVar = Find( aMSOMacroRuntimeLibName, SbxCLASS_OBJECT );
-        if ( !bWasError && (SbxBase::GetError() == SbxERR_PROC_UNDEFINED) )
-            SbxBase::ResetError();
-        if( pMSOMacroRuntimeLibVar )
-        {
-            StarBASIC* pMSOMacroRuntimeLib = PTR_CAST(StarBASIC,pMSOMacroRuntimeLibVar);
-            if( pMSOMacroRuntimeLib )
-            {
-                USHORT nGblFlag = pMSOMacroRuntimeLib->GetFlags() & SBX_GBLSEARCH;
-                pMSOMacroRuntimeLib->ResetFlag( SBX_GBLSEARCH );
-                SbxVariable* pAppSymbol = pMSOMacroRuntimeLib->Find( aMSOMacroRuntimeAppSymbol, SbxCLASS_METHOD );
-                pMSOMacroRuntimeLib->SetFlag( nGblFlag );
-                if( pAppSymbol )
-                {
-                    pMSOMacroRuntimeLib->SetFlag( SBX_EXTSEARCH );		// Could have been disabled before
-                    GetSbData()->pMSOMacroRuntimLib = pMSOMacroRuntimeLib;
-                }
-            }
-        }
-
         // Delete the Error-Stack
         SbErrorStack*& rErrStack = GetSbData()->pErrStack;
         delete rErrStack;


More information about the Libreoffice-commits mailing list