mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix OSX build

Browse Source 
by reverting part of commit
commit 752cd07d08
"InterfaceContainer2 with vector instead of Sequence"

cannot add comphelper as a dependency to a module that is part of URE

Change-Id: I40aeeff1fa39988af911b00a06fb1ac8edeb6f03
This commit is contained in:
Noel Grandin
2016-01-25 10:19:49 +02:00
parent d3947708e1
commit e6469c892d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
io/Library_io.mk
View File

@@ -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_udk_api,io))
$(eval $(call gb_Library_use_libraries,io,\ $(eval $(call gb_Library_use_libraries,io,\
comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
sal \ sal \

13
io/source/stm/opump.cxx
View File

@@ -35,7 +35,7 @@
#include <uno/mapping.hxx> #include <uno/mapping.hxx>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <osl/thread.h> #include <osl/thread.h>
@@ -44,7 +44,6 @@
using namespace osl; using namespace osl;
using namespace std; using namespace std;
using namespace cppu; using namespace cppu;
using namespace comphelper;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
using namespace com::sun::star::lang; using namespace com::sun::star::lang;
using namespace com::sun::star::registry; using namespace com::sun::star::registry;
@@ -64,7 +63,7 @@ namespace io_stm {
Reference< XConnectable > m_xSucc; Reference< XConnectable > m_xSucc;
Reference< XInputStream > m_xInput; Reference< XInputStream > m_xInput;
Reference< XOutputStream > m_xOutput; Reference< XOutputStream > m_xOutput;
OInterfaceContainerHelper2 m_cnt; OInterfaceContainerHelper m_cnt;
bool m_closeFired; bool m_closeFired;
void run(); void run();
@@ -124,7 +123,7 @@ Pump::~Pump()
void Pump::fireError( const Any & exception ) void Pump::fireError( const Any & exception )
{ {
OInterfaceIteratorHelper2 iter( m_cnt ); OInterfaceIteratorHelper iter( m_cnt );
while( iter.hasMoreElements() ) while( iter.hasMoreElements() )
{ {
try try
@@ -152,7 +151,7 @@ void Pump::fireClose()
if( bFire ) if( bFire )
{ {
OInterfaceIteratorHelper2 iter( m_cnt ); OInterfaceIteratorHelper iter( m_cnt );
while( iter.hasMoreElements() ) while( iter.hasMoreElements() )
{ {
try try
@@ -169,7 +168,7 @@ void Pump::fireClose()
void Pump::fireStarted() void Pump::fireStarted()
{ {
OInterfaceIteratorHelper2 iter( m_cnt ); OInterfaceIteratorHelper iter( m_cnt );
while( iter.hasMoreElements() ) while( iter.hasMoreElements() )
{ {
try try
@@ -185,7 +184,7 @@ void Pump::fireStarted()
void Pump::fireTerminated() void Pump::fireTerminated()
{ {
OInterfaceIteratorHelper2 iter( m_cnt ); OInterfaceIteratorHelper iter( m_cnt );
while( iter.hasMoreElements() ) while( iter.hasMoreElements() )
{ {
try try