[Libreoffice-commits] .: embeddedobj/Library_embobj.mk embeddedobj/prj embeddedobj/source

[Libreoffice Gerrit user]

 embeddedobj/Library_embobj.mk                   |    1 +
 embeddedobj/prj/build.lst                       |    2 +-
 embeddedobj/source/commonembedding/embedobj.cxx |   11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 74670bf04e0dc693de6ea060d0dd2c10ee3b184d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 7 16:14:33 2012 +0100

    fdo#56818 Work around deadlock caused by differing lock orders
    
    Change-Id: Iaabe36bf0c1f051f9cebc2b65e614063698959fa

diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index 99456ed..1fa1c5a 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,embobj,\
 	cppu \
 	cppuhelper \
 	sal \
+	vcl \
 	$(gb_UWINAPI) \
 ))
 
diff --git a/embeddedobj/prj/build.lst b/embeddedobj/prj/build.lst
index eed683e..fea2c33 100644
--- a/embeddedobj/prj/build.lst
+++ b/embeddedobj/prj/build.lst
@@ -1,2 +1,2 @@
-eo	embeddedobj	:	offapi sal cppu cppuhelper comphelper tools unotools LIBXSLT:libxslt NULL
+eo	embeddedobj	:	offapi sal cppu cppuhelper comphelper tools unotools vcl LIBXSLT:libxslt NULL
 eo	embeddedobj\prj		nmake	-	all	eo_prj NULL
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index df75afe..941186d 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -40,6 +40,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include <rtl/logfile.hxx>
+#include <vcl/svapp.hxx>
 
 #include <targetstatecontrol.hxx>
 
@@ -529,6 +530,16 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
 {
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OCommonEmbeddedObject::doVerb" );
 
+    SolarMutexGuard aSolarGuard;
+        //TODO: a gross hack to avoid deadlocks when this is called from the
+        // outside and OCommonEmbeddedObject::changeState, with m_aMutex locked,
+        // calls into framework code that tries to lock the solar mutex, while
+        // another thread (through Window::ImplCallPaint, say) calls
+        // OCommonEmbeddedObject::getComponent with the solar mutex locked and
+        // then tries to lock m_aMutex (see fdo#56818); the alternative would be
+        // to get locking done right in this class, but that looks like a
+        // daunting task
+
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO