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 /sd/source/ui/slideshow/slideshow.cxx | |
| 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 'sd/source/ui/slideshow/slideshow.cxx')
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 2d50fc3ebf4f..7c305e85032f 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/util/URL.hpp> #include <cppuhelper/bootstrap.hxx> +#include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> @@ -260,24 +261,17 @@ void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Wind } -// -------------------------------------------------------------------- // XServiceInfo -// -------------------------------------------------------------------- - OUString SAL_CALL SlideShow::getImplementationName( ) throw(RuntimeException) { return OUString( "com.sun.star.comp.sd.SlideShow" ); } -// -------------------------------------------------------------------- - sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException) { - return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames( ) ); + return cppu::supportsService( this, ServiceName ); } -// -------------------------------------------------------------------- - Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(RuntimeException) { OUString aService( "com.sun.star.presentation.Presentation" ); @@ -285,10 +279,7 @@ Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(Runt return aSeq; } -// -------------------------------------------------------------------- // XPropertySet -// -------------------------------------------------------------------- - Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(RuntimeException) { SolarMutexGuard aGuard; @@ -296,8 +287,6 @@ Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(Run return xInfo; } -// -------------------------------------------------------------------- - void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { SolarMutexGuard aGuard; |