diff options
Diffstat (limited to 'ucb')
22 files changed, 90 insertions, 79 deletions
diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index 9cccba356753..d8acf21a48e7 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Library_use_external,srtrs1,boost_headers)) $(eval $(call gb_Library_use_sdk_api,srtrs1)) $(eval $(call gb_Library_use_libraries,srtrs1,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index ebad2c624f98..af67d8294ec8 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -33,6 +33,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace com::sun::star::util; +using namespace comphelper; using namespace cppu; @@ -427,7 +428,7 @@ void SAL_CALL ContentResultSetWrapper::addEventListener( const Reference< XEvent if ( !m_pDisposeEventListeners ) m_pDisposeEventListeners = - new OInterfaceContainerHelper( m_aContainerMutex ); + new OInterfaceContainerHelper2( m_aContainerMutex ); m_pDisposeEventListeners->addInterface( Listener ); } diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index baf84f181f2d..2570429eea7a 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> @@ -132,7 +133,7 @@ private: bool m_bDisposed; ///Dispose call ready. bool m_bInDispose;///In dispose call osl::Mutex m_aContainerMutex; - cppu::OInterfaceContainerHelper* + comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; PropertyChangeListenerContainer_Impl* m_pPropertyChangeListeners; diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index b3f30b3c7115..27024a6674bd 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using namespace cppu; +using namespace comphelper; @@ -178,7 +178,7 @@ void SAL_CALL DynamicResultSetWrapper::addEventListener( const Reference< XEvent if ( !m_pDisposeEventListeners ) m_pDisposeEventListeners = - new OInterfaceContainerHelper( m_aContainerMutex ); + new OInterfaceContainerHelper2( m_aContainerMutex ); m_pDisposeEventListeners->addInterface( Listener ); } diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index e04f75875a67..70e481cee331 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -24,6 +24,7 @@ #include <osl/conditn.hxx> #include <ucbhelper/macros.hxx> #include <cppuhelper/weak.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/interfacecontainer.hxx> @@ -46,7 +47,7 @@ private: bool m_bDisposed; ///Dispose call ready. bool m_bInDispose;///In dispose call osl::Mutex m_aContainerMutex; - cppu::OInterfaceContainerHelper* + comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; protected: css::uno::Reference< css::ucb::XDynamicResultSetListener > diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index b25e266b9c53..0798bb060e55 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -25,7 +25,7 @@ *************************************************************************/ #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/ucb/GlobalTransferCommandArgument2.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp> @@ -44,7 +44,7 @@ #include "ucb.hxx" -using namespace cppu; +using namespace comphelper; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ucb; @@ -318,7 +318,7 @@ void SAL_CALL UniversalContentBroker::addEventListener( throw( css::uno::RuntimeException, std::exception ) { if ( !m_pDisposeEventListeners ) - m_pDisposeEventListeners = new OInterfaceContainerHelper( m_aMutex ); + m_pDisposeEventListeners = new OInterfaceContainerHelper2( m_aMutex ); m_pDisposeEventListeners->addInterface( Listener ); } diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index a280832b2372..e8ee6d871628 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -46,7 +46,7 @@ -namespace cppu { class OInterfaceContainerHelper; } +namespace comphelper { class OInterfaceContainerHelper2; } namespace com { namespace sun { namespace star { namespace ucb { class XCommandInfo; @@ -209,7 +209,7 @@ private: css::uno::Sequence< css::uno::Any > m_aArguments; ProviderMap_Impl m_aProviders; osl::Mutex m_aMutex; - cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; + comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; sal_Int32 m_nCommandId; }; diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 2d88f2cff660..57e73057aba7 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -29,6 +29,7 @@ #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertySetInfoChange.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> @@ -47,6 +48,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace com::sun::star::util; +using namespace comphelper; using namespace cppu; @@ -1094,8 +1096,8 @@ struct PersistentPropertySet_Impl OUString m_aKey; OUString m_aFullKey; osl::Mutex m_aMutex; - OInterfaceContainerHelper* m_pDisposeEventListeners; - OInterfaceContainerHelper* m_pPropSetChangeListeners; + OInterfaceContainerHelper2* m_pDisposeEventListeners; + OInterfaceContainerHelper2* m_pPropSetChangeListeners; PropertyListeners_Impl* m_pPropertyChangeListeners; PersistentPropertySet_Impl( PropertySetRegistry& rCreator, @@ -1197,7 +1199,7 @@ void SAL_CALL PersistentPropertySet::addEventListener( { if ( !m_pImpl->m_pDisposeEventListeners ) m_pImpl->m_pDisposeEventListeners = - new OInterfaceContainerHelper( m_pImpl->m_aMutex ); + new OInterfaceContainerHelper2( m_pImpl->m_aMutex ); m_pImpl->m_pDisposeEventListeners->addInterface( Listener ); } @@ -1813,7 +1815,7 @@ void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener( { if ( !m_pImpl->m_pPropSetChangeListeners ) m_pImpl->m_pPropSetChangeListeners = - new OInterfaceContainerHelper( m_pImpl->m_aMutex ); + new OInterfaceContainerHelper2( m_pImpl->m_aMutex ); m_pImpl->m_pPropSetChangeListeners->addInterface( Listener ); } @@ -2144,7 +2146,7 @@ void PersistentPropertySet::notifyPropertySetInfoChange( return; // Notify event listeners. - OInterfaceIteratorHelper aIter( *( m_pImpl->m_pPropSetChangeListeners ) ); + OInterfaceIteratorHelper2 aIter( *( m_pImpl->m_pPropSetChangeListeners ) ); while ( aIter.hasMoreElements() ) { // Propagate event. diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 4487e979918c..b9aae2f37ca2 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -19,7 +19,7 @@ #include <vector> #include <sortdynres.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/ucb/ContentResultSetCapability.hpp> #include <com/sun/star/ucb/ListActionType.hpp> @@ -33,7 +33,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using namespace cppu; +using namespace comphelper; // The mutex to synchronize access to containers. @@ -158,7 +158,7 @@ void SAL_CALL SortedDynamicResultSet::addEventListener( if ( !mpDisposeEventListeners ) mpDisposeEventListeners = - new OInterfaceContainerHelper( getContainerMutex() ); + new OInterfaceContainerHelper2( getContainerMutex() ); mpDisposeEventListeners->addInterface( Listener ); } diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index ebc6a6757d77..6931eaa237ad 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -31,8 +31,8 @@ #include "sortresult.hxx" -namespace cppu { - class OInterfaceContainerHelper; +namespace comphelper { + class OInterfaceContainerHelper2; } #define DYNAMIC_RESULTSET_SERVICE_NAME "com.sun.star.ucb.SortedDynamicResultSet" @@ -44,7 +44,7 @@ class SortedDynamicResultSet: public cppu::WeakImplHelper < css::lang::XServiceInfo, css::ucb::XDynamicResultSet > { - cppu::OInterfaceContainerHelper *mpDisposeEventListeners; + comphelper::OInterfaceContainerHelper2 *mpDisposeEventListeners; css::uno::Reference < css::ucb::XDynamicResultSetListener > mxListener; css::uno::Reference < css::ucb::XDynamicResultSetListener > mxOwnListener; diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 945fee5c9834..f113cc9fffce 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/ucb/XAnyCompareFactory.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> #include <memory> @@ -40,6 +41,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace com::sun::star::util; +using namespace comphelper; using namespace cppu; @@ -238,7 +240,7 @@ void SAL_CALL SortedResultSet::addEventListener( if ( !mpDisposeEventListeners ) mpDisposeEventListeners = - new OInterfaceContainerHelper( getContainerMutex() ); + new OInterfaceContainerHelper2( getContainerMutex() ); mpDisposeEventListeners->addInterface( Listener ); } diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index 5f45da992782..c93863d1e893 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -37,8 +37,8 @@ #include <cppuhelper/implbase.hxx> #include <deque> -namespace cppu { - class OInterfaceContainerHelper; +namespace comphelper { + class OInterfaceContainerHelper2; } @@ -123,7 +123,7 @@ class SortedResultSet: public cppu::WeakImplHelper < css::sdbc::XResultSetMetaDataSupplier, css::beans::XPropertySet > { - cppu::OInterfaceContainerHelper *mpDisposeEventListeners; + comphelper::OInterfaceContainerHelper2 *mpDisposeEventListeners; PropertyChangeListeners_Impl *mpPropChangeListeners; PropertyChangeListeners_Impl *mpVetoChangeListeners; diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 030c487e0588..68ae2bd50310 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -186,7 +186,7 @@ BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener if ( ! m_pDisposeEventListeners ) m_pDisposeEventListeners = - new cppu::OInterfaceContainerHelper( m_aEventListenerMutex ); + new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); m_pDisposeEventListeners->addInterface( Listener ); } @@ -208,9 +208,9 @@ BaseContent::dispose() throw( RuntimeException, std::exception ) { lang::EventObject aEvt; - cppu::OInterfaceContainerHelper* pDisposeEventListeners; - cppu::OInterfaceContainerHelper* pContentEventListeners; - cppu::OInterfaceContainerHelper* pPropertySetInfoChangeListeners; + comphelper::OInterfaceContainerHelper2* pDisposeEventListeners; + comphelper::OInterfaceContainerHelper2* pContentEventListeners; + comphelper::OInterfaceContainerHelper2* pPropertySetInfoChangeListeners; PropertyListeners* pPropertyListener; { @@ -545,7 +545,7 @@ BaseContent::addContentEventListener( if ( ! m_pContentEventListeners ) m_pContentEventListeners = - new cppu::OInterfaceContainerHelper( m_aEventListenerMutex ); + new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); m_pContentEventListeners->addInterface( Listener ); @@ -688,7 +688,7 @@ BaseContent::addPropertySetInfoChangeListener( { osl::MutexGuard aGuard( m_aMutex ); if( ! m_pPropertySetInfoChangeListeners ) - m_pPropertySetInfoChangeListeners = new cppu::OInterfaceContainerHelper( m_aEventListenerMutex ); + m_pPropertySetInfoChangeListeners = new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); m_pPropertySetInfoChangeListeners->addInterface( Listener ); } @@ -1262,10 +1262,12 @@ BaseContent::cDEL() ContentEventNotifier* p; if( m_pContentEventListeners ) + { p = new ContentEventNotifier( m_pMyShell, this, m_xContentIdentifier, m_pContentEventListeners->getElements() ); + } else p = nullptr; diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index d35a139af6b3..b798caef1008 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -24,7 +24,7 @@ #include "rtl/ustring.hxx" #include <cppuhelper/weak.hxx> #include <ucbhelper/macros.hxx> -#include <cppuhelper/interfacecontainer.h> +#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -275,9 +275,9 @@ namespace fileaccess { osl::Mutex m_aMutex; osl::Mutex m_aEventListenerMutex; - cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; - cppu::OInterfaceContainerHelper* m_pContentEventListeners; - cppu::OInterfaceContainerHelper* m_pPropertySetInfoChangeListeners; + comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; + comphelper::OInterfaceContainerHelper2* m_pContentEventListeners; + comphelper::OInterfaceContainerHelper2* m_pPropertySetInfoChangeListeners; PropertyListeners* m_pPropertyListener; diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index f8b496287c52..7c2958d7ccec 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::ucb; ContentEventNotifier::ContentEventNotifier( shell* pMyShell, const uno::Reference< XContent >& xCreatorContent, const uno::Reference< XContentIdentifier >& xCreatorId, - const uno::Sequence< uno::Reference< uno::XInterface > >& sListeners ) + const std::vector< uno::Reference< uno::XInterface > >& sListeners ) : m_pMyShell( pMyShell ), m_xCreatorContent( xCreatorContent ), m_xCreatorId( xCreatorId ), @@ -48,7 +48,7 @@ ContentEventNotifier::ContentEventNotifier( shell* pMyShell, const uno::Reference< XContent >& xCreatorContent, const uno::Reference< XContentIdentifier >& xCreatorId, const uno::Reference< XContentIdentifier >& xOldId, - const uno::Sequence< uno::Reference< uno::XInterface > >& sListeners ) + const std::vector< uno::Reference< uno::XInterface > >& sListeners ) : m_pMyShell( pMyShell ), m_xCreatorContent( xCreatorContent ), m_xCreatorId( xCreatorId ), @@ -71,9 +71,9 @@ void ContentEventNotifier::notifyChildInserted( const OUString& aChildName ) xChildContent, m_xCreatorId ); - for( sal_Int32 i = 0; i < m_sListeners.getLength(); ++i ) + for( const auto& r : m_sListeners ) { - uno::Reference< XContentEventListener > ref( m_sListeners[i],uno::UNO_QUERY ); + uno::Reference< XContentEventListener > ref( r, uno::UNO_QUERY ); if( ref.is() ) ref->contentEvent( aEvt ); } @@ -88,9 +88,9 @@ void ContentEventNotifier::notifyDeleted() m_xCreatorId ); - for( sal_Int32 i = 0; i < m_sListeners.getLength(); ++i ) + for( const auto& r : m_sListeners ) { - uno::Reference< XContentEventListener > ref( m_sListeners[i],uno::UNO_QUERY ); + uno::Reference< XContentEventListener > ref( r, uno::UNO_QUERY ); if( ref.is() ) ref->contentEvent( aEvt ); } @@ -117,9 +117,9 @@ void ContentEventNotifier::notifyRemoved( const OUString& aChildName ) xDeletedContent, m_xCreatorId ); - for( sal_Int32 i = 0; i < m_sListeners.getLength(); ++i ) + for( const auto& r : m_sListeners ) { - uno::Reference< XContentEventListener > ref( m_sListeners[i],uno::UNO_QUERY ); + uno::Reference< XContentEventListener > ref( r, uno::UNO_QUERY ); if( ref.is() ) ref->contentEvent( aEvt ); } @@ -132,9 +132,9 @@ void ContentEventNotifier::notifyExchanged() m_xCreatorContent, m_xOldId ); - for( sal_Int32 i = 0; i < m_sListeners.getLength(); ++i ) + for( const auto& r : m_sListeners ) { - uno::Reference< XContentEventListener > ref( m_sListeners[i],uno::UNO_QUERY ); + uno::Reference< XContentEventListener > ref( r, uno::UNO_QUERY ); if( ref.is() ) ref->contentEvent( aEvt ); } @@ -149,7 +149,7 @@ void ContentEventNotifier::notifyExchanged() PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier( const uno::Reference< XContent >& xCreatorContent, - const uno::Sequence< uno::Reference< uno::XInterface > >& sListeners ) + const std::vector< uno::Reference< uno::XInterface > >& sListeners ) : m_xCreatorContent( xCreatorContent ), m_sListeners( sListeners ) { @@ -165,9 +165,9 @@ PropertySetInfoChangeNotifier::notifyPropertyAdded( const OUString & aPropertyNa -1, beans::PropertySetInfoChange::PROPERTY_INSERTED ); - for( sal_Int32 i = 0; i < m_sListeners.getLength(); ++i ) + for( const auto& r : m_sListeners ) { - uno::Reference< beans::XPropertySetInfoChangeListener > ref( m_sListeners[i],uno::UNO_QUERY ); + uno::Reference< beans::XPropertySetInfoChangeListener > ref( r, uno::UNO_QUERY ); if( ref.is() ) ref->propertySetInfoChange( aEvt ); } @@ -182,9 +182,9 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aProperty -1, beans::PropertySetInfoChange::PROPERTY_REMOVED ); - for( sal_Int32 i = 0; i < m_sListeners.getLength(); ++i ) + for( const auto& r : m_sListeners ) { - uno::Reference< beans::XPropertySetInfoChangeListener > ref( m_sListeners[i],uno::UNO_QUERY ); + uno::Reference< beans::XPropertySetInfoChangeListener > ref( r, uno::UNO_QUERY ); if( ref.is() ) ref->propertySetInfoChange( aEvt ); } diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index be304b821447..ffecfe7910b1 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/ucb/XContentIdentifier.hpp> #include "filglob.hxx" #include <unordered_map> +#include <vector> namespace fileaccess { @@ -37,21 +38,21 @@ namespace fileaccess { css::uno::Reference< css::ucb::XContent > m_xCreatorContent; css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; css::uno::Reference< css::ucb::XContentIdentifier > m_xOldId; - css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners; + std::vector< css::uno::Reference< css::uno::XInterface > > m_sListeners; public: ContentEventNotifier( shell* pMyShell, const css::uno::Reference< css::ucb::XContent >& xCreatorContent, const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, - const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); + const std::vector< css::uno::Reference< css::uno::XInterface > >& sListeners ); ContentEventNotifier( shell* pMyShell, const css::uno::Reference< css::ucb::XContent >& xCreatorContent, const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId, - const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); + const std::vector< css::uno::Reference< css::uno::XInterface > >& sListeners ); void notifyChildInserted( const OUString& aChildName ); void notifyDeleted(); @@ -64,11 +65,11 @@ namespace fileaccess { { private: css::uno::Reference< css::ucb::XContent > m_xCreatorContent; - css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners; + std::vector< css::uno::Reference< css::uno::XInterface > > m_sListeners; public: PropertySetInfoChangeNotifier( const css::uno::Reference< css::ucb::XContent >& xCreatorContent, - const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); + const std::vector< css::uno::Reference< css::uno::XInterface > >& sListeners ); void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName ); void SAL_CALL notifyPropertyRemoved( const OUString & aPropertyName ); diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 1210817e360e..03ecedd53eb8 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -114,7 +114,7 @@ XResultSet_impl::addEventListener( if ( ! m_pDisposeEventListeners ) m_pDisposeEventListeners = - new cppu::OInterfaceContainerHelper( m_aEventListenerMutex ); + new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); m_pDisposeEventListeners->addInterface( Listener ); } @@ -161,7 +161,7 @@ XResultSet_impl::dispose() void XResultSet_impl::rowCountChanged() { sal_Int32 aOldValue,aNewValue; - uno::Sequence< uno::Reference< uno::XInterface > > seq; + std::vector< uno::Reference< uno::XInterface > > seq; { osl::MutexGuard aGuard( m_aMutex ); if( m_pRowCountListeners ) @@ -175,10 +175,10 @@ void XResultSet_impl::rowCountChanged() aEv.PropertyHandle = -1; aEv.OldValue <<= aOldValue; aEv.NewValue <<= aNewValue; - for( sal_Int32 i = 0; i < seq.getLength(); ++i ) + for( const auto& r : seq ) { uno::Reference< beans::XPropertyChangeListener > listener( - seq[i], uno::UNO_QUERY ); + r, uno::UNO_QUERY ); if( listener.is() ) listener->propertyChange( aEv ); } @@ -187,7 +187,7 @@ void XResultSet_impl::rowCountChanged() void XResultSet_impl::isFinalChanged() { - uno::Sequence< uno::Reference< XInterface > > seq; + std::vector< uno::Reference< XInterface > > seq; { osl::MutexGuard aGuard( m_aMutex ); if( m_pIsFinalListeners ) @@ -202,10 +202,10 @@ void XResultSet_impl::isFinalChanged() bool tval = true; aEv.OldValue <<= fval; aEv.NewValue <<= tval; - for( sal_Int32 i = 0; i < seq.getLength(); ++i ) + for( const auto& r : seq ) { uno::Reference< beans::XPropertyChangeListener > listener( - seq[i], uno::UNO_QUERY ); + r, uno::UNO_QUERY ); if( listener.is() ) listener->propertyChange( aEv ); } @@ -797,7 +797,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) m_pIsFinalListeners = - new cppu::OInterfaceContainerHelper( m_aEventListenerMutex ); + new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); m_pIsFinalListeners->addInterface( xListener ); } @@ -806,7 +806,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) m_pRowCountListeners = - new cppu::OInterfaceContainerHelper( m_aEventListenerMutex ); + new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); m_pRowCountListeners->addInterface( xListener ); } else diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 505994b5519a..cfea9e6c5bdf 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -22,7 +22,7 @@ #include <vector> #include <osl/file.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -604,10 +604,10 @@ class XResultSet_impl : public Notifier, osl::Mutex m_aMutex; osl::Mutex m_aEventListenerMutex; - cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; + comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; - cppu::OInterfaceContainerHelper* m_pRowCountListeners; - cppu::OInterfaceContainerHelper* m_pIsFinalListeners; + comphelper::OInterfaceContainerHelper2* m_pRowCountListeners; + comphelper::OInterfaceContainerHelper2* m_pIsFinalListeners; css::uno::Reference< css::ucb::XDynamicResultSetListener > m_xListener; bool m_bStatic; diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 12acee990451..fde89797120e 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -105,7 +105,7 @@ ResultSetBase::addEventListener( if ( ! m_pDisposeEventListeners ) m_pDisposeEventListeners = - new cppu::OInterfaceContainerHelper( m_aMutex ); + new comphelper::OInterfaceContainerHelper2( m_aMutex ); m_pDisposeEventListeners->addInterface( Listener ); } @@ -567,7 +567,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) m_pIsFinalListeners = - new cppu::OInterfaceContainerHelper( m_aMutex ); + new comphelper::OInterfaceContainerHelper2( m_aMutex ); m_pIsFinalListeners->addInterface( xListener ); } @@ -576,7 +576,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) m_pRowCountListeners = - new cppu::OInterfaceContainerHelper( m_aMutex ); + new comphelper::OInterfaceContainerHelper2( m_aMutex ); m_pRowCountListeners->addInterface( xListener ); } else diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index b98e7f8756f0..6cfcaee8ce14 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -21,7 +21,7 @@ #include <vector> #include <cppuhelper/weak.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/sdbc/XCloseable.hpp> @@ -537,10 +537,10 @@ namespace ftp { m_sProperty; osl::Mutex m_aMutex; - cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; + comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; - cppu::OInterfaceContainerHelper* m_pRowCountListeners; - cppu::OInterfaceContainerHelper* m_pIsFinalListeners; + comphelper::OInterfaceContainerHelper2* m_pRowCountListeners; + comphelper::OInterfaceContainerHelper2* m_pIsFinalListeners; }; diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 398a044047a9..d9b9e8ce2e53 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -31,7 +31,7 @@ #include "osl/doublecheckedlocking.h" #include <comphelper/processfactory.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> @@ -322,7 +322,7 @@ void SAL_CALL HierarchyDataSource::addEventListener( if ( !m_pDisposeEventListeners ) m_pDisposeEventListeners - = new cppu::OInterfaceContainerHelper( m_aMutex ); + = new comphelper::OInterfaceContainerHelper2( m_aMutex ); m_pDisposeEventListeners->addInterface( Listener ); } diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index 8ee2ac3d2a6e..dc750fc2b0a1 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -29,7 +29,7 @@ #include <cppuhelper/weak.hxx> #include <ucbhelper/macros.hxx> -namespace cppu { class OInterfaceContainerHelper; } +namespace comphelper { class OInterfaceContainerHelper2; } namespace hierarchy_ucp { @@ -44,7 +44,7 @@ class HierarchyDataSource : public cppu::OWeakObject, osl::Mutex m_aMutex; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider; - cppu::OInterfaceContainerHelper * m_pDisposeEventListeners; + comphelper::OInterfaceContainerHelper2 * m_pDisposeEventListeners; public: explicit HierarchyDataSource( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); |