strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use more OInterfaceContainerHelper3 in ContentImplHelper_Impl

Browse source 
Change-Id: Id4e4fca8a5a4e2d050752e666a843e7d8661ec0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125635
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2021-11-21 20:32:47 +02:00 committed by Noel Grandin
parent b67257c5dc
commit 9b0ea78959
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ucbhelper/source/provider/contenthelper.cxx
View file

@ -28,6 +28,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyExistException.hpp>
#include <com/sun/star/beans/PropertySetInfoChange.hpp>
#include <comphelper/interfacecontainer3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/queryinterface.hxx>
@ -108,8 +109,10 @@ struct ContentImplHelper_Impl
rtl::Reference< ::ucbhelper::PropertySetInfo > m_xPropSetInfo;
rtl::Reference< ::ucbhelper::CommandProcessorInfo > m_xCommandsInfo;
std::unique_ptr<cppu::OInterfaceContainerHelper> m_pDisposeEventListeners;
std::unique_ptr<cppu::OInterfaceContainerHelper> m_pContentEventListeners;
std::unique_ptr<cppu::OInterfaceContainerHelper> m_pPropSetChangeListeners;
std::unique_ptr<comphelper::OInterfaceContainerHelper3<css::ucb::XContentEventListener>>
m_pContentEventListeners;
std::unique_ptr<comphelper::OInterfaceContainerHelper3<beans::XPropertySetInfoChangeListener>>
m_pPropSetChangeListeners;
std::unique_ptr<cppu::OInterfaceContainerHelper> m_pCommandChangeListeners;
std::unique_ptr<PropertyChangeListeners> m_pPropertyChangeListeners;
};
@ -270,7 +273,7 @@ void SAL_CALL ContentImplHelper::addContentEventListener(
if ( !m_pImpl->m_pContentEventListeners )
m_pImpl->m_pContentEventListeners.reset(
new cppu::OInterfaceContainerHelper( m_aMutex ));
new comphelper::OInterfaceContainerHelper3<css::ucb::XContentEventListener>( m_aMutex ));
m_pImpl->m_pContentEventListeners->addInterface( Listener );
}
@ -563,7 +566,7 @@ void SAL_CALL ContentImplHelper::addPropertySetInfoChangeListener(
if ( !m_pImpl->m_pPropSetChangeListeners )
m_pImpl->m_pPropSetChangeListeners.reset(
new cppu::OInterfaceContainerHelper( m_aMutex ));
new comphelper::OInterfaceContainerHelper3<beans::XPropertySetInfoChangeListener>( m_aMutex ));
m_pImpl->m_pPropSetChangeListeners->addInterface( Listener );
}
@ -721,15 +724,9 @@ void ContentImplHelper::notifyPropertySetInfoChange(
return;
// Notify event listeners.
cppu::OInterfaceIteratorHelper aIter( *m_pImpl->m_pPropSetChangeListeners );
comphelper::OInterfaceIteratorHelper3 aIter( *m_pImpl->m_pPropSetChangeListeners );
while ( aIter.hasMoreElements() )
{
// Propagate event.
uno::Reference< beans::XPropertySetInfoChangeListener >
xListener( aIter.next(), uno::UNO_QUERY );
if ( xListener.is() )
xListener->propertySetInfoChange( evt );
}
aIter.next()->propertySetInfoChange( evt );
}
void ContentImplHelper::notifyContentEvent(
@ -739,16 +736,9 @@ void ContentImplHelper::notifyContentEvent(
return;
// Notify event listeners.
cppu::OInterfaceIteratorHelper aIter( *m_pImpl->m_pContentEventListeners );
comphelper::OInterfaceIteratorHelper3 aIter( *m_pImpl->m_pContentEventListeners );
while ( aIter.hasMoreElements() )
{
// Propagate event.
uno::Reference<
css::ucb::XContentEventListener > xListener(
aIter.next(), uno::UNO_QUERY );
if ( xListener.is() )
xListener->contentEvent( evt );
}
aIter.next()->contentEvent( evt );
}
void ContentImplHelper::inserted()