4 files changed, 14 insertions, 2 deletions
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index da7ad04a0b18..aff22613f286 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -50,6 +50,9 @@ VCLXDevice::VCLXDevice()
 
 VCLXDevice::~VCLXDevice()
 {
+    //TODO: why was this empty, and everything done in ~VCLXVirtualDevice?
+    SolarMutexGuard g;
+    mpOutputDevice.reset();
 }
 
 void VCLXDevice::SetCreatedWithToolkit( bool bCreatedWithToolkit )
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 073afa5946fd..482e29c47021 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -80,6 +80,9 @@ VCLXGraphics::~VCLXGraphics()
     }
 
     delete mpClipRegion;
+
+    SolarMutexGuard g;
+    mpOutputDevice.reset();
 }
 
 void VCLXGraphics::SetOutputDevice( OutputDevice* pOutDev )
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 82ad2b84b3d5..ee1f9b8a4b9d 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1463,6 +1463,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 
 ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL VCLXToolkit::getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
+    SolarMutexGuard g;
+
     vcl::Window * pWindow = VCLUnoHelper::GetWindow( window );
 
     if( pWindow )
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index d5c6ebf6da51..6daf05055150 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -640,8 +640,12 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
         // Since the implementations for the listeners changed a lot towards 1.1, this
         // would not be the case anymore, if we would not do this listener-lock below
         // #i14703#
-        vcl::Window* pVclPeer = VCLUnoHelper::GetWindow( getPeer() );
-        VCLXWindow* pPeer = pVclPeer ? pVclPeer->GetWindowPeer() : NULL;
+        VCLXWindow* pPeer;
+        {
+            SolarMutexGuard g;
+            vcl::Window* pVclPeer = VCLUnoHelper::GetWindow( getPeer() );
+            pPeer = pVclPeer ? pVclPeer->GetWindowPeer() : NULL;
+        }
         VclListenerLock aNoVclEventMultiplexing( pPeer );
 
         // setting peer properties may result in an attempt to acquire the solar mutex, 'cause the peers