diff options
Diffstat (limited to 'framework')
3 files changed, 18 insertions, 18 deletions
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 1dd41fd38bdf..fd18bb9b7c06 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -537,14 +537,14 @@ void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& } std::unique_lock aGuard(m_mutex); - m_aEventListeners.addInterface( xListener ); + m_aEventListeners.addInterface( aGuard, xListener ); } void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ std::unique_lock aGuard(m_mutex); - m_aEventListeners.removeInterface( xListener ); + m_aEventListeners.removeInterface( aGuard, xListener ); } // XInitialization @@ -1154,20 +1154,20 @@ void ImageManagerImpl::addConfigurationListener( const uno::Reference< css::ui:: } std::unique_lock aGuard(m_mutex); - m_aConfigListeners.addInterface( xListener ); + m_aConfigListeners.addInterface( aGuard, xListener ); } void ImageManagerImpl::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ std::unique_lock aGuard(m_mutex); - m_aConfigListeners.removeInterface( xListener ); + m_aConfigListeners.removeInterface( aGuard, xListener ); } void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { std::unique_lock aGuard(m_mutex); - comphelper::OInterfaceIteratorHelper4 pIterator( m_aConfigListeners ); + comphelper::OInterfaceIteratorHelper4 pIterator( aGuard, m_aConfigListeners ); while ( pIterator.hasMoreElements() ) { try @@ -1187,7 +1187,7 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent& } catch( const css::uno::RuntimeException& ) { - pIterator.remove(); + pIterator.remove(aGuard); } } } diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 28c2b150f9bb..65ff144913f9 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -943,14 +943,14 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X } std::unique_lock aGuard(m_mutex); - m_aEventListeners.addInterface( xListener ); + m_aEventListeners.addInterface( aGuard, xListener ); } void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ std::unique_lock aGuard(m_mutex); - m_aEventListeners.removeInterface( xListener ); + m_aEventListeners.removeInterface( aGuard, xListener ); } // XUIConfiguration @@ -965,14 +965,14 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe } std::unique_lock aGuard(m_mutex); - m_aConfigListeners.addInterface( xListener ); + m_aConfigListeners.addInterface( aGuard, xListener ); } void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ std::unique_lock aGuard(m_mutex); - m_aConfigListeners.removeInterface( xListener ); + m_aConfigListeners.removeInterface( aGuard, xListener ); } // XUIConfigurationManager @@ -1623,7 +1623,7 @@ sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::ConfigurationEvent& aEvent, NotifyOp eOp ) { std::unique_lock aGuard(m_mutex); - comphelper::OInterfaceIteratorHelper4 pIterator( m_aConfigListeners ); + comphelper::OInterfaceIteratorHelper4 pIterator( aGuard, m_aConfigListeners ); while ( pIterator.hasMoreElements() ) { try @@ -1643,7 +1643,7 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::Con } catch( const css::uno::RuntimeException& ) { - pIterator.remove(); + pIterator.remove(aGuard); } } } diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 002fde84daea..d44f4a45d418 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -727,14 +727,14 @@ void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventL } std::unique_lock aGuard(m_mutex); - m_aEventListeners.addInterface( xListener ); + m_aEventListeners.addInterface( aGuard, xListener ); } void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ std::unique_lock aGuard(m_mutex); - m_aEventListeners.removeInterface( xListener ); + m_aEventListeners.removeInterface( aGuard, xListener ); } // XUIConfigurationManager @@ -749,14 +749,14 @@ void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< } std::unique_lock aGuard(m_mutex); - m_aConfigListeners.addInterface( xListener ); + m_aConfigListeners.addInterface( aGuard, xListener ); } void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ std::unique_lock aGuard(m_mutex); - m_aConfigListeners.removeInterface( xListener ); + m_aConfigListeners.removeInterface( aGuard, xListener ); } void SAL_CALL UIConfigurationManager::reset() @@ -1347,7 +1347,7 @@ sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() void UIConfigurationManager::implts_notifyContainerListener( const ConfigurationEvent& aEvent, NotifyOp eOp ) { std::unique_lock aGuard(m_mutex); - comphelper::OInterfaceIteratorHelper4 pIterator( m_aConfigListeners ); + comphelper::OInterfaceIteratorHelper4 pIterator( aGuard, m_aConfigListeners ); while ( pIterator.hasMoreElements() ) { try @@ -1367,7 +1367,7 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration } catch( const css::uno::RuntimeException& ) { - pIterator.remove(); + pIterator.remove(aGuard); } } } |