diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-21 15:05:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-22 13:24:47 +0000 |
| commit | 5032262fccd0ef7f274323ae481b3230ffd42d3a (patch) | |
| tree | 5f8c69e47764a907faf497c1c6932cf3962e3ddb /framework/source/uielement/newmenucontroller.cxx | |
| parent | 47cd9b65efa662719950866ab9c45fb3f130e1b4 (diff) | |
BaseMutex->std::mutex in PopupMenuControllerBase
Change-Id: I26877ac7b6e5e39f511418d978199189c62cca6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147416
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/uielement/newmenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/newmenucontroller.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 3e2260e3fae8..55c4d324801f 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -336,7 +336,7 @@ void SAL_CALL NewMenuController::disposing( const EventObject& ) { Reference< css::awt::XMenuListener > xHolder(this); - osl::MutexGuard aLock( m_aMutex ); + std::unique_lock aLock( m_aMutex ); m_xFrame.clear(); m_xDispatch.clear(); m_xContext.clear(); @@ -359,7 +359,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent Reference< XComponentContext > xContext; { - osl::MutexGuard aLock(m_aMutex); + std::unique_lock aLock(m_aMutex); xPopupMenu = m_xPopupMenu; xContext = m_xContext; } @@ -435,15 +435,13 @@ void NewMenuController::impl_setPopupMenu() } // XInitialization -void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) +void NewMenuController::initializeImpl( std::unique_lock<std::mutex>& rGuard, const Sequence< Any >& aArguments ) { - osl::MutexGuard aLock( m_aMutex ); - bool bInitialized( m_bInitialized ); if ( bInitialized ) return; - svt::PopupMenuControllerBase::initialize( aArguments ); + svt::PopupMenuControllerBase::initializeImpl( rGuard, aArguments ); if ( m_bInitialized ) { |