diff options
Diffstat (limited to 'io')
-rw-r--r-- | io/Library_io.mk | 1 | ||||
-rw-r--r-- | io/source/stm/opump.cxx | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/io/Library_io.mk b/io/Library_io.mk index cfe879f5e155..3468c9edca81 100644 --- a/io/Library_io.mk +++ b/io/Library_io.mk @@ -14,6 +14,7 @@ $(eval $(call gb_Library_use_external,io,boost_headers)) $(eval $(call gb_Library_use_udk_api,io)) $(eval $(call gb_Library_use_libraries,io,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 3386ba48966f..01faa23ae7d4 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -35,7 +35,7 @@ #include <uno/mapping.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> #include <osl/thread.h> @@ -44,6 +44,7 @@ using namespace osl; using namespace std; using namespace cppu; +using namespace comphelper; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; @@ -63,7 +64,7 @@ namespace io_stm { Reference< XConnectable > m_xSucc; Reference< XInputStream > m_xInput; Reference< XOutputStream > m_xOutput; - OInterfaceContainerHelper m_cnt; + OInterfaceContainerHelper2 m_cnt; bool m_closeFired; void run(); @@ -123,7 +124,7 @@ Pump::~Pump() void Pump::fireError( const Any & exception ) { - OInterfaceIteratorHelper iter( m_cnt ); + OInterfaceIteratorHelper2 iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -151,7 +152,7 @@ void Pump::fireClose() if( bFire ) { - OInterfaceIteratorHelper iter( m_cnt ); + OInterfaceIteratorHelper2 iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -168,7 +169,7 @@ void Pump::fireClose() void Pump::fireStarted() { - OInterfaceIteratorHelper iter( m_cnt ); + OInterfaceIteratorHelper2 iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -184,7 +185,7 @@ void Pump::fireStarted() void Pump::fireTerminated() { - OInterfaceIteratorHelper iter( m_cnt ); + OInterfaceIteratorHelper2 iter( m_cnt ); while( iter.hasMoreElements() ) { try |