summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--io/source/stm/omark.cxx25
-rw-r--r--io/source/stm/opipe.cxx15
-rw-r--r--io/source/stm/opump.cxx13
3 files changed, 7 insertions, 46 deletions
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 44baddc36d9b..7f0261e40b41 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -32,6 +32,7 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
#include <rtl/ustrbuf.hxx>
@@ -429,14 +430,7 @@ OUString OMarkableOutputStream::getImplementationName() throw ()
// XServiceInfo
sal_Bool OMarkableOutputStream::supportsService(const OUString& ServiceName) throw ()
{
- Sequence< OUString > aSNL = getSupportedServiceNames();
- const OUString * pArray = aSNL.getConstArray();
-
- for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
- if( pArray[i] == ServiceName )
- return sal_True;
-
- return sal_False;
+ return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
@@ -445,9 +439,6 @@ Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames(void) throw
return OMarkableOutputStream_getSupportedServiceNames();
}
-
-
-
/*------------------------
*
* external binding
@@ -946,8 +937,6 @@ void OMarkableInputStream::checkMarksAndFlush()
}
}
-
-
// XServiceInfo
OUString OMarkableInputStream::getImplementationName() throw ()
{
@@ -957,14 +946,7 @@ OUString OMarkableInputStream::getImplementationName() throw ()
// XServiceInfo
sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) throw ()
{
- Sequence< OUString > aSNL = getSupportedServiceNames();
- const OUString * pArray = aSNL.getConstArray();
-
- for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
- if( pArray[i] == ServiceName )
- return sal_True;
-
- return sal_False;
+ return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
@@ -973,7 +955,6 @@ Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw
return OMarkableInputStream_getSupportedServiceNames();
}
-
/*------------------------
*
* external binding
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index b59496722008..847a9a0bb351 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -27,8 +27,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/factory.hxx>
-
#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <osl/conditn.hxx>
#include <osl/mutex.hxx>
@@ -415,14 +415,7 @@ OUString OPipeImpl::getImplementationName() throw( )
// XServiceInfo
sal_Bool OPipeImpl::supportsService(const OUString& ServiceName) throw( )
{
- Sequence< OUString > aSNL = getSupportedServiceNames();
- const OUString * pArray = aSNL.getConstArray();
-
- for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
- if( pArray[i] == ServiceName )
- return sal_True;
-
- return sal_False;
+ return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
@@ -431,10 +424,6 @@ Sequence< OUString > OPipeImpl::getSupportedServiceNames(void) throw( )
return OPipeImpl_getSupportedServiceNames();
}
-
-
-
-
/* implementation functions
*
*
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 72f1570f23cd..93b4f51e49ed 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -36,6 +36,7 @@
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
#include <osl/thread.h>
@@ -430,15 +431,12 @@ void Pump::setOutputStream( const Reference< XOutputStream >& xOut ) throw()
// data transfer starts in XActiveDataControl::start
}
-// ------------------------------------------------------------
-
Reference< XOutputStream > Pump::getOutputStream() throw()
{
Guard< Mutex > aGuard( m_aMutex );
return m_xOutput;
}
-
// XServiceInfo
OUString Pump::getImplementationName() throw( )
{
@@ -448,14 +446,7 @@ OUString Pump::getImplementationName() throw( )
// XServiceInfo
sal_Bool Pump::supportsService(const OUString& ServiceName) throw( )
{
- Sequence< OUString > aSNL = getSupportedServiceNames();
- const OUString * pArray = aSNL.getConstArray();
-
- for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
- if( pArray[i] == ServiceName )
- return sal_True;
-
- return sal_False;
+ return cppu::supportsService(this, ServiceName);
}
// XServiceInfo