os141: ensure the VCLXWindow is not destroyed while the callback event is underway

1 files changed, 9 insertions, 0 deletions

diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index fe906d8557d3..dd4d56586b03 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -306,12 +306,18 @@ void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback )
     DBG_TESTSOLARMUTEX();
     maCallbackEvents.push_back( i_callback );
     if ( !mnCallbackEventId )
+    {
+        // ensure our VCLXWindow is not destroyed while the event is underway
+        mrAntiImpl.acquire();
         mnCallbackEventId = Application::PostUserEvent( LINK( this, VCLXWindowImpl, OnProcessCallbacks ) );
+    }
 }
 
 //----------------------------------------------------------------------------------------------------------------------
 IMPL_LINK( VCLXWindowImpl, OnProcessCallbacks, void*, EMPTYARG )
 {
+    const Reference< uno::XInterface > xKeepAlive( mrAntiImpl );
+
     // work on a copy of the callback array
     CallbackArray aCallbacksCopy;
     {
@@ -319,6 +325,9 @@ IMPL_LINK( VCLXWindowImpl, OnProcessCallbacks, void*, EMPTYARG )
         aCallbacksCopy = maCallbackEvents;
         maCallbackEvents.clear();
 
+        // we acquired our VCLXWindow once before posting the event, release this one ref now
+        mrAntiImpl.release();
+
         if ( !mnCallbackEventId )
             // we were disposed while waiting for the mutex to lock
             return 1L;