diff options
| author | Noel Grandin <noel@peralex.com> | 2016-01-25 10:19:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-01-25 10:21:13 +0200 |
| commit | e6469c892d4875fbcc11382d273ea7ab5b9a3dfc (patch) | |
| tree | e2ad301b7f40cc7d5cff39140a0349d9c9e91962 /io | |
| parent | d3947708e1a3b9c1b4a7073b7fe5ff3d6b05bdf0 (diff) | |
fix OSX build
by reverting part of commit
commit 752cd07d085ac0aadc99bd512d49072843139032
"InterfaceContainer2 with vector instead of Sequence"
cannot add comphelper as a dependency to a module that is part of URE
Change-Id: I40aeeff1fa39988af911b00a06fb1ac8edeb6f03
Diffstat (limited to 'io')
| -rw-r--r-- | io/Library_io.mk | 1 | ||||
| -rw-r--r-- | io/source/stm/opump.cxx | 13 |
2 files changed, 6 insertions, 8 deletions
diff --git a/io/Library_io.mk b/io/Library_io.mk index 3468c9edca81..cfe879f5e155 100644 --- a/io/Library_io.mk +++ b/io/Library_io.mk @@ -14,7 +14,6 @@ $(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 01faa23ae7d4..3386ba48966f 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 <comphelper/interfacecontainer2.hxx> +#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> #include <osl/thread.h> @@ -44,7 +44,6 @@ 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; @@ -64,7 +63,7 @@ namespace io_stm { Reference< XConnectable > m_xSucc; Reference< XInputStream > m_xInput; Reference< XOutputStream > m_xOutput; - OInterfaceContainerHelper2 m_cnt; + OInterfaceContainerHelper m_cnt; bool m_closeFired; void run(); @@ -124,7 +123,7 @@ Pump::~Pump() void Pump::fireError( const Any & exception ) { - OInterfaceIteratorHelper2 iter( m_cnt ); + OInterfaceIteratorHelper iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -152,7 +151,7 @@ void Pump::fireClose() if( bFire ) { - OInterfaceIteratorHelper2 iter( m_cnt ); + OInterfaceIteratorHelper iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -169,7 +168,7 @@ void Pump::fireClose() void Pump::fireStarted() { - OInterfaceIteratorHelper2 iter( m_cnt ); + OInterfaceIteratorHelper iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -185,7 +184,7 @@ void Pump::fireStarted() void Pump::fireTerminated() { - OInterfaceIteratorHelper2 iter( m_cnt ); + OInterfaceIteratorHelper iter( m_cnt ); while( iter.hasMoreElements() ) { try |