diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-10-23 14:35:10 -0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-25 08:19:58 +0000 |
| commit | 704f95e5255ff72bfb548d50d66d4da61dc483ef (patch) | |
| tree | 3b0799aa8ce5185f4775966f733e1acb2df6285c /shell/source/backends | |
| parent | a95ecd8b65ea2275a66f6694f0c09e3faaef4407 (diff) | |
fdo#54938: More uses of cppu::supportsService
Change-Id: I90a7a07a43559b8d7e1d4b886b2624255200d46b
Reviewed-on: https://gerrit.libreoffice.org/6406
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'shell/source/backends')
| -rw-r--r-- | shell/source/backends/localebe/localebackend.cxx | 17 | ||||
| -rw-r--r-- | shell/source/backends/macbe/macbackend.mm | 15 | ||||
| -rw-r--r-- | shell/source/backends/wininetbe/wininetbackend.cxx | 16 |
3 files changed, 6 insertions, 42 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 42405d76f0db..35f43d4e2c05 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -20,6 +20,7 @@ #include "localebackend.hxx" #include <com/sun/star/beans/Optional.hpp> +#include <cppuhelper/supportsservice.hxx> #include <osl/time.h> #include <stdio.h> @@ -311,16 +312,12 @@ OUString SAL_CALL LocaleBackend::getBackendName(void) { return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; } -//------------------------------------------------------------------------------ - OUString SAL_CALL LocaleBackend::getImplementationName(void) throw (uno::RuntimeException) { return getBackendName() ; } -//------------------------------------------------------------------------------ - uno::Sequence<OUString> SAL_CALL LocaleBackend::getBackendServiceNames(void) { uno::Sequence<OUString> aServiceNameList(1); @@ -328,22 +325,12 @@ uno::Sequence<OUString> SAL_CALL LocaleBackend::getBackendServiceNames(void) return aServiceNameList ; } -//------------------------------------------------------------------------------ - sal_Bool SAL_CALL LocaleBackend::supportsService(const OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< OUString > const svc = getBackendServiceNames(); - - for(sal_Int32 i = 0; i < svc.getLength(); ++i ) - if(svc[i] == aServiceName) - return true; - - return false; + return cppu::supportsService(this, aServiceName); } -//------------------------------------------------------------------------------ - uno::Sequence<OUString> SAL_CALL LocaleBackend::getSupportedServiceNames(void) throw (uno::RuntimeException) { diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm index e57013e5297c..4a095ff75996 100644 --- a/shell/source/backends/macbe/macbackend.mm +++ b/shell/source/backends/macbe/macbackend.mm @@ -29,6 +29,7 @@ #include "macbackend.hxx" #include "com/sun/star/beans/Optional.hpp" +#include <cppuhelper/supportsservice.hxx> #include "rtl/ustrbuf.hxx" #include "osl/file.h" @@ -447,8 +448,6 @@ rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void) return getBackendName(); } -//------------------------------------------------------------------------------ - uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getBackendServiceNames(void) { uno::Sequence<rtl::OUString> aServiceNameList(1); @@ -457,22 +456,12 @@ uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getBackendServiceNames(void return aServiceNameList; } -//------------------------------------------------------------------------------ - sal_Bool SAL_CALL MacOSXBackend::supportsService(const rtl::OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > const svc = getBackendServiceNames(); - - for(sal_Int32 i = 0; i < svc.getLength(); ++i ) - if(svc[i] == aServiceName) - return true; - - return false; + return cppu::supportsService(this, aServiceName); } -//------------------------------------------------------------------------------ - uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(void) throw (uno::RuntimeException) { diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 559eb0e51d5b..69b8f28a8e24 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include <cppuhelper/supportsservice.hxx> #include "rtl/ustrbuf.hxx" #include "wininetbackend.hxx" @@ -374,8 +374,6 @@ OUString SAL_CALL WinInetBackend::getImplementationName(void) return getBackendName() ; } -//------------------------------------------------------------------------------ - uno::Sequence<OUString> SAL_CALL WinInetBackend::getBackendServiceNames(void) { uno::Sequence<OUString> aServiceNameList(1); @@ -384,22 +382,12 @@ uno::Sequence<OUString> SAL_CALL WinInetBackend::getBackendServiceNames(void) return aServiceNameList ; } -//------------------------------------------------------------------------------ - sal_Bool SAL_CALL WinInetBackend::supportsService(const OUString& aServiceName) throw (uno::RuntimeException) { - uno::Sequence< OUString > const svc = getBackendServiceNames(); - - for(sal_Int32 i = 0; i < svc.getLength(); ++i ) - if(svc[i] == aServiceName) - return true; - - return false; + return cppu::supportsService(this, aServiceName); } -//------------------------------------------------------------------------------ - uno::Sequence<OUString> SAL_CALL WinInetBackend::getSupportedServiceNames(void) throw (uno::RuntimeException) { |