[Libreoffice-commits] core.git: io/Library_io.mk io/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 6 20:26:47 UTC 2021
io/Library_io.mk | 1 +
io/source/stm/opump.cxx | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 6af2e7d21ce050758ad07fbb951a38b2da2b6c4c
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Fri Aug 6 19:50:14 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Aug 6 22:26:13 2021 +0200
use more comphelper::OInterfaceContainerHelper2
Change-Id: I255133e1823fd63620f27421b69cd23d75ebb6fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120127
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
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 <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
More information about the Libreoffice-commits
mailing list