sfx2/source/dialog/backingcomp.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5b30054ee1088491335f41efd4243bf258a5cab8
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 17 21:40:39 2016 +0100
fix JunitTest_sfx2_complex
post...
commit 6ebf9cfbf54052d7fae50cdab146cc5c63ba262a
Date: Tue May 10 19:16:47 2016 +0200
Set different ui file for NotebookBar in each app
this stuff needs to be inside the SolarMutex
Change-Id: Idad938f413c7ef7f8574231116ea4cd518e3a035
diff --git a/sfx2/source/dialog/backingcomp.cxx
b/sfx2/source/dialog/backingcomp.cxx
index 0654b3e..c4ac85f 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -594,6 +594,9 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const
css::lang::EventObject& aEven
void SAL_CALL BackingComp::dispose()
throw(css::uno::RuntimeException, std::exception)
{
+ /* SAFE { */
+ SolarMutexGuard aGuard;
+
if (m_xFrame.is())
{
css::uno::Reference< css::awt::XWindow > xParentWindow =
m_xFrame->getContainerWindow();
@@ -605,9 +608,6 @@ void SAL_CALL BackingComp::dispose()
pSysWindow->GetNotebookBar()->Hide();
}
- /* SAFE { */
- SolarMutexGuard aGuard;
-
// stop listening at the window
if (m_xWindow.is())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
