diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-24 17:53:08 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-24 18:06:18 +0100 |
| commit | 4950c30e633ac2d1a12a9e4b086478ac7d4f790c (patch) | |
| tree | b59ed4747df776ba6614b64f7acc3406b2aa9353 /sfx2 | |
| parent | 5c31a1b5474f5284cf694d04de5734921891915c (diff) | |
sfx2: add missing locks to FrameActionListener
Change-Id: I67db5c42d1aea39cbf650de7854be853fc78e8a9
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/ControllerItem.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index a0de0e3ebae3..b2cdc7245262 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -62,6 +62,7 @@ namespace } virtual void SAL_CALL disposing (void) SAL_OVERRIDE { + SolarMutexGuard g; if (mxFrame.is()) mxFrame->removeFrameActionListener(this); } @@ -69,12 +70,15 @@ namespace throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { (void)rEvent; + + SolarMutexGuard g; mrControllerItem.ResetFrame(); mxFrame = NULL; } virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { + SolarMutexGuard g; if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED) mrControllerItem.NotifyFrameContextChange(); } |