diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-17 21:40:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-17 21:41:13 +0100 |
| commit | 5b30054ee1088491335f41efd4243bf258a5cab8 (patch) | |
| tree | f8b45dbc771cc312e8bf8f12e461eaa68ff69f17 /sfx2 | |
| parent | 2d15020ea29d5541d1c44ff44a06eb5bcb35c52e (diff) | |
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
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/backingcomp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 0654b3e38373..c4ac85fb20e3 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()) { |