CWS-TOOLING: integrate CWS sb93

5 files changed, 18 insertions, 13 deletions

diff --git a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
index ac4a91bf3b0d..8c9cb27ecd04 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
+++ b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.5.42.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -40,7 +40,7 @@ PACKAGE = complex$/toolkit$/interface_tests
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar
+JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = _XAccessibleComponent.java         \
                   _XAccessibleContext.java           \
                   _XAccessibleExtendedComponent.java \
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
index 408ee2afd4a1..b375d1d5b238 100755
--- a/toolkit/qa/complex/toolkit/makefile.mk
+++ b/toolkit/qa/complex/toolkit/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.5.42.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -40,7 +40,7 @@ PACKAGE = complex$/toolkit
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar 
+JARFILES = mysql.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
 JAVAFILES       = CheckAccessibleStatusBar.java CheckAccessibleStatusBarItem.java CheckAsyncCallback.java CallbackClass.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 SUBDIRS		= interface_tests
diff --git a/toolkit/qa/complex/xunitconversion/makefile.mk b/toolkit/qa/complex/xunitconversion/makefile.mk
index 4ea2593a817d..a8be7a6ffb42 100644
--- a/toolkit/qa/complex/xunitconversion/makefile.mk
+++ b/toolkit/qa/complex/xunitconversion/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.2 $
+# $Revision: 1.2.26.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -40,7 +40,7 @@ PACKAGE = complex$/xunitconversion
 
 #----- compile .java files -----------------------------------------
 
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar 
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
 JAVAFILES       = XUnitConversionTest.java
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 SUBDIRS		= 
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index af7a8e46dfd7..72c24f4b25bd 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unocontrol.cxx,v $
- * $Revision: 1.54 $
+ * $Revision: 1.54.42.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -395,12 +395,18 @@ void UnoControl::disposeAccessibleContext()
 
 void UnoControl::dispose(  ) throw(RuntimeException)
 {
-    ::osl::MutexGuard aGuard( GetMutex() );
-
-    if( getPeer().is() && mbDisposePeer )
+    Reference< XWindowPeer > xPeer;
+    {
+        ::osl::MutexGuard aGuard( GetMutex() );
+        if( mbDisposePeer )
+        {
+            xPeer = mxPeer;
+        }
+        setPeer( NULL );
+    }
+    if( xPeer.is() )
     {
-        getPeer()->dispose();
-        setPeer( NULL);
+        xPeer->dispose();
     }
 
     // dispose and release our AccessibleContext
diff --git a/toolkit/src2xml/include.lst b/toolkit/src2xml/include.lst
index 27981912677a..7b35ccc73c73 100644
--- a/toolkit/src2xml/include.lst
+++ b/toolkit/src2xml/include.lst
@@ -21,7 +21,6 @@
 ../../icu/unxlngi6.pro/inc
 ../../idl/inc
 ../../idl/unxlngi6.pro/inc
-../../jut/unxlngi6.pro/inc
 ../../nas/unxlngi6.pro/inc
 ../../odk/inc
 ../../sal/qa/inc