[Libreoffice-commits] core.git: toolkit/source vcl/source

[Stephan Bergmann]

 toolkit/source/awt/vclxtoolkit.cxx |    4 ++++
 vcl/source/helper/xconnection.cxx  |    2 ++
 2 files changed, 6 insertions(+)

New commits:
commit 47088ac9a04bd7e5198e7a6c3160e0dbeea0000b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 18 15:50:02 2014 +0200

    Missing SolarMutexGuards
    
    ...as can be seen e.g. with CppunitTest_dbaccess_dialog_save:
    
    vcl::DisplayConnection::start
    Application::GetDisplayConnection
    Window::GetDragSource
    Window::GetDropTarget
    (anonymous namespace)::VCLXToolkit::getDropTarget
    (anonymous namespace)::Frame::implts_startWindowListening
    (anonymous namespace)::Frame::initialize
    (anonymous namespace)::TaskCreatorService::implts_createFrame
    (anonymous namespace)::TaskCreatorService::createInstanceWithArguments
    framework::TaskCreator::createTask
    framework::Desktop::findFrame
    framework::LoadEnv::impl_loadContent
    framework::LoadEnv::startLoading
    framework::LoadEnv::loadComponentFromURL
    framework::Desktop::loadComponentFromURL
    unotest::MacrosTest::loadFromDesktop
    DialogSaveTest::test
    ...
    
    Change-Id: I9523ea47cab23d1f23f73a37d2d44453aa7d56a3

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 4b66356..88aa88f 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1466,6 +1466,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 
 ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > SAL_CALL VCLXToolkit::getDragSource( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
+    SolarMutexGuard g;
+
     Window * pWindow = VCLUnoHelper::GetWindow( window );
 
     if( pWindow )
@@ -1476,6 +1478,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 
 ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > SAL_CALL VCLXToolkit::getDropTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
+    SolarMutexGuard g;
+
     Window * pWindow = VCLUnoHelper::GetWindow( window );
 
     if( pWindow )
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index 570bd71..6c86f83 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -49,12 +49,14 @@ DisplayConnection::~DisplayConnection()
 
 void DisplayConnection::start()
 {
+    DBG_TESTSOLARMUTEX();
     ImplSVData* pSVData = ImplGetSVData();
     pSVData->mpDefInst->SetEventCallback( this );
 }
 
 void DisplayConnection::terminate()
 {
+    DBG_TESTSOLARMUTEX();
     ImplSVData* pSVData = ImplGetSVData();
 
     if( pSVData )