diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-09-25 15:41:29 -0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-07 17:01:33 +0000 |
| commit | 7235d23267e4591e5cf47762abd3f63421b06904 (patch) | |
| tree | 6353239b1c586642e22c5df892a7c0560e632fa5 /uui | |
| parent | 8e37c7ae282f10724d6322aa028a7dd6b698f071 (diff) | |
fdo#54938: Adapt supportsService implementations to cppu::supportsService
Change-Id: I683c0d30c3286ed5d725d4eefe8b3977b82ee316
Reviewed-on: https://gerrit.libreoffice.org/6035
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/interactionhandler.cxx | 8 | ||||
| -rw-r--r-- | uui/source/passwordcontainer.cxx | 10 | ||||
| -rw-r--r-- | uui/source/requeststringresolver.cxx | 8 |
3 files changed, 6 insertions, 20 deletions
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index de0a13ca61dc..207b9688b678 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -21,6 +21,7 @@ #include "interactionhandler.hxx" #include "comphelper/namedvaluecollection.hxx" #include "comphelper/processfactory.hxx" +#include <cppuhelper/supportsservice.hxx> #include "com/sun/star/awt/XWindow.hpp" using namespace com::sun::star; @@ -48,12 +49,7 @@ sal_Bool SAL_CALL UUIInteractionHandler::supportsService(OUString const & rServiceName) throw (uno::RuntimeException) { - 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); } uno::Sequence< OUString > SAL_CALL diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 1ee48589f9b9..a0bca1197259 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -19,6 +19,7 @@ #include "comphelper/processfactory.hxx" #include "cppuhelper/factory.hxx" +#include <cppuhelper/supportsservice.hxx> #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/task/NoMasterException.hpp" @@ -308,14 +309,7 @@ PasswordContainerInteractionHandler::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::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); } //========================================================================= diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index 918b1ff2cfbf..28698a1106ed 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -20,6 +20,7 @@ #include "requeststringresolver.hxx" #include "iahndl.hxx" #include <comphelper/processfactory.hxx> +#include <cppuhelper/supportsservice.hxx> using namespace com::sun; @@ -48,12 +49,7 @@ UUIInteractionRequestStringResolver::supportsService( OUString const & rServiceName) throw (star::uno::RuntimeException) { - star::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); } star::uno::Sequence< OUString > SAL_CALL |