From 6af2e7d21ce050758ad07fbb951a38b2da2b6c4c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 6 Aug 2021 19:50:14 +0200 Subject: use more comphelper::OInterfaceContainerHelper2 Change-Id: I255133e1823fd63620f27421b69cd23d75ebb6fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120127 Tested-by: Jenkins Reviewed-by: Noel Grandin --- io/Library_io.mk | 1 + io/source/stm/opump.cxx | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'io') diff --git a/io/Library_io.mk b/io/Library_io.mk index b961b437cd46..6512cfac8122 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 7ba8752d8dfb..bef9aa2d3f1c 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include @@ -55,7 +55,7 @@ namespace io_stm { Reference< XConnectable > m_xSucc; Reference< XInputStream > m_xInput; Reference< XOutputStream > m_xOutput; - OInterfaceContainerHelper m_cnt; + comphelper::OInterfaceContainerHelper2 m_cnt; bool m_closeFired; void run(); @@ -117,7 +117,7 @@ Pump::~Pump() void Pump::fireError( const Any & exception ) { - OInterfaceIteratorHelper iter( m_cnt ); + comphelper::OInterfaceIteratorHelper2 iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -146,7 +146,7 @@ void Pump::fireClose() if( !bFire ) return; - OInterfaceIteratorHelper iter( m_cnt ); + comphelper::OInterfaceIteratorHelper2 iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -162,7 +162,7 @@ void Pump::fireClose() void Pump::fireStarted() { - OInterfaceIteratorHelper iter( m_cnt ); + comphelper::OInterfaceIteratorHelper2 iter( m_cnt ); while( iter.hasMoreElements() ) { try @@ -178,7 +178,7 @@ void Pump::fireStarted() void Pump::fireTerminated() { - OInterfaceIteratorHelper iter( m_cnt ); + comphelper::OInterfaceIteratorHelper2 iter( m_cnt ); while( iter.hasMoreElements() ) { try -- cgit ora/co-22.05-testflight LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author