summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
Diffstat (limited to 'bridges')
-rw-r--r--bridges/test/java_uno/acquire/testacquire.cxx10
-rw-r--r--bridges/test/java_uno/equals/testequals.cxx8
2 files changed, 4 insertions, 14 deletions
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index e88be55b3e01..7a8de19cb44d 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -35,6 +35,7 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase3.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include "cppuhelper/weak.hxx"
#include "osl/conditn.hxx"
#include "osl/interlck.h"
@@ -319,14 +320,7 @@ private:
sal_Bool Service::supportsService(OUString const & serviceName)
throw (css::uno::RuntimeException)
{
- css::uno::Sequence< OUString > names(
- getSupportedServiceNames_static());
- for (sal_Int32 i = 0; i< names.getLength(); ++i) {
- if (names[i] == serviceName) {
- return true;
- }
- }
- return false;
+ return cppu::supportsService(this, serviceName);
}
namespace {
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index a56e5b928a39..9124b757a57b 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -36,6 +36,7 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/supportsservice.hxx>
#include "cppuhelper/weak.hxx"
#include "rtl/string.h"
#include "rtl/ustring.hxx"
@@ -94,12 +95,7 @@ private:
sal_Bool Service::supportsService(OUString const & rServiceName)
throw (css::uno::RuntimeException)
{
- css::uno::Sequence< OUString > aNames(
- getSupportedServiceNames_static());
- for (sal_Int32 i = 0; i< aNames.getLength(); ++i)
- if (aNames[i] == rServiceName)
- return true;
- return false;
+ return cppu::supportsService(this, rServiceName);
}
void Service::connect(OUString const & rConnection,