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

use more comphelper::OInterfaceContainerHelper2

Browse Source 
Change-Id: I255133e1823fd63620f27421b69cd23d75ebb6fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120127
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-08-06 19:50:14 +02:00
committed by Noel Grandin
parent 26cfb57abf
commit 6af2e7d21c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
io/Library_io.mk
View File

@@ -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 \

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

@@ -28,7 +28,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
#include <osl/thread.h>
@@ -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