diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-10-22 23:49:31 -0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-23 11:05:43 +0200 |
| commit | 8f6d2eef50e1fabac30233c23a800da2c1c8ebc9 (patch) | |
| tree | 28a9920e2f1fe36aab244ea848d0262c587d8969 /editeng | |
| parent | 3e53bb6b67ca229a6a57b3d8847404b2feed8103 (diff) | |
fdo#54938: Kill ServiceInfoHelper::supportsService and use cppu's instead.
Change-Id: I1c2d95e4c3fb6242dcb4cdb88cf9733471a3412b
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/uno/unofield.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/uno/unotext.cxx | 5 | ||||
| -rw-r--r-- | editeng/source/uno/unotext2.cxx | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index f68419d7a7c2..13699a6d7d13 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -29,8 +29,8 @@ #include <editeng/measfld.hxx> #include <editeng/unofield.hxx> #include <editeng/unotext.hxx> -#include <comphelper/serviceinfohelper.hxx> #include <comphelper/servicehelper.hxx> +#include <cppuhelper/supportsservice.hxx> #include "editeng/unonames.hxx" @@ -868,7 +868,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames() sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return cppu::supportsService( this, ServiceName ); } uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index eb906110d4c1..fc58fffcae07 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -43,8 +43,9 @@ #include <editeng/editeng.hxx> #include <editeng/outliner.hxx> #include <editeng/unoipset.hxx> -#include <comphelper/serviceinfohelper.hxx> #include <comphelper/servicehelper.hxx> +#include <comphelper/serviceinfohelper.hxx> +#include <cppuhelper/supportsservice.hxx> #include "editeng/unonames.hxx" @@ -1481,7 +1482,7 @@ void SvxUnoTextRangeBase::GotoEnd(sal_Bool Expand) throw() sal_Bool SAL_CALL SvxUnoTextRangeBase::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames() diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index b82883fb5ed1..6a44ae92652f 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -25,8 +25,9 @@ #include <editeng/flditem.hxx> #include <editeng/unofield.hxx> #include <editeng/unotext.hxx> -#include <comphelper/serviceinfohelper.hxx> #include <comphelper/servicehelper.hxx> +#include <comphelper/serviceinfohelper.hxx> +#include <cppuhelper/supportsservice.hxx> using namespace ::rtl; using namespace ::cppu; @@ -682,7 +683,7 @@ OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeEx sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { - return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); + return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() throw(uno::RuntimeException) |