From 0d8e7c6a642525b8b2372f954983d279135ffdb2 Mon Sep 17 00:00:00 2001 From: Minh Ngo Date: Thu, 18 Jul 2013 22:59:30 +0300 Subject: Fixing a manager class Change-Id: Icaaa3e33ebb0e2ca650a279a8b094fbddbff2a4d --- avmedia/source/vlc/vlcmanager.cxx | 9 ++++++--- avmedia/source/vlc/vlcmanager.hxx | 2 +- avmedia/source/vlc/vlcwindow.cxx | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 1ded627034d7..0b2ad6a642b8 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -7,6 +7,7 @@ namespace avmedia { namespace vlc { const rtl::OUString VLC_IMPLEMENTATION_NAME = "com.sun.star.comp.avmedia.Manager_VLC"; +const ::rtl::OUString VLC_SERVICENAME = "com.sun.star.media.Manager_VLC"; Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : mxMgr( rxMgr ) @@ -32,16 +33,18 @@ rtl::OUString SAL_CALL Manager::getImplementationName() return VLC_IMPLEMENTATION_NAME; } -sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName ) throw (uno::RuntimeException) { - return false; + return serviceName == VLC_SERVICENAME; } uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames() throw (uno::RuntimeException) { - return uno::Sequence< rtl::OUString >(); + ::uno::Sequence< OUString > aRet(1); + aRet[0] = VLC_SERVICENAME; + return aRet; } } // end namespace vlc diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index 2632161c28dd..2e81a3533a27 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -37,7 +37,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); private: diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index 72f05720771d..39cb26b58062 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -82,7 +82,6 @@ void SAL_CALL VLCWindow::setVisible( sal_Bool Visible ) void SAL_CALL VLCWindow::setEnable( sal_Bool Enable ) throw (uno::RuntimeException) { - std::cout << __PRETTY_FUNCTION__ << " " << Enable << std::endl; } void SAL_CALL VLCWindow::setFocus() -- cgit v1.2.3