[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                               |    4 ----
 patches/dev300/automation-testtool-oobuildfix.diff |   21 ---------------------
 2 files changed, 25 deletions(-)

New commits:
commit ac3a931ea2f3511c7e6d0fb2857af50534766881
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 14:04:39 2011 +0200

    pushed automation-testtool-oobuildfix.diff into git (bnc#145906)
    
    testtool doesn't like oobuild basic compatability defaults

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a0b2d8..866042e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -166,10 +166,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
 #FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
 
 [ Fixes ]
-# testtool doesn't like oobuild basic compatability defaults
-# ooo-build only fix n#145906#
-automation-testtool-oobuildfix.diff, n#145906, noelpwer
-
 # Added support for "application/octet-stream" mime type in package manager
 desktop-application-octet-stream-mime-type.diff, i#73301, flr
 
diff --git a/patches/dev300/automation-testtool-oobuildfix.diff b/patches/dev300/automation-testtool-oobuildfix.diff
deleted file mode 100644
index b075550..0000000
--- a/patches/dev300/automation-testtool-oobuildfix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- automation/source/testtool/objtest.cxx |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git automation/source/testtool/objtest.cxx automation/source/testtool/objtest.cxx
-index 38dfa61..665dd5a 100644
---- automation/source/testtool/objtest.cxx
-+++ automation/source/testtool/objtest.cxx
-@@ -2884,7 +2884,8 @@ void TestToolObj::DebugFindNoErrors( 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 );
--- 
-1.7.0.1
-