[Libreoffice-commits] .: Branch 'libreoffice-3-4' - automation/source

Petr Mladek pmladek at kemper.freedesktop.org
Wed Apr 27 05:04:15 PDT 2011


 automation/source/testtool/objtest.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 235cd2dd573faa233817a8b8229c2d3572bba1c8
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 14:02:40 2011 +0200

    automation-testtool-oobuildfix.diff: testtool and basic compatability defaults
    
    testtool doesn't like some basic compatability defaults (bnc#145906)

diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 7c05142..8b41527 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -2695,7 +2695,8 @@ void TestToolObj::DebugFindNoErrors( sal_Bool bDebugFindNoErrors )
 
 SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
 {
-    if ( BasicRuntimeAccess::IsRunInit() )            // wegen Find im "Global" Befehl des Basic
+    if ( BasicRuntimeAccess::IsRunInit()
+    || ( aStr == String( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) ) ) )            // wegen Find im "Global" Befehl des Basic
         return NULL;
 
     SbxVariableRef Old = SbxObject::Find(aStr, aType );


More information about the Libreoffice-commits mailing list