diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 2995acf47f4d..24e478f28bf8 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -113,7 +113,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs /*===========================================================================================================*/ OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { - return impl_getStaticImplementationName(); + return IMPLEMENTATIONNAME_SOUNDHANDLER; } // XServiceInfo @@ -124,28 +124,12 @@ sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) // XServiceInfo css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) -{ - return impl_getStaticSupportedServiceNames(); -} - -// Helper for XServiceInfo -css::uno::Sequence< OUString > SoundHandler::impl_getStaticSupportedServiceNames() { css::uno::Sequence< OUString > seqServiceNames( 1 ); seqServiceNames.getArray() [0] = "com.sun.star.frame.ContentHandler"; return seqServiceNames; } -// Helper for XServiceInfo -OUString SoundHandler::impl_getStaticImplementationName() -{ - return IMPLEMENTATIONNAME_SOUNDHANDLER; -} - -void SAL_CALL SoundHandler::impl_initService() -{ -} - /*-************************************************************************************************************ @short standard ctor @descr These initialize a new instance of this class with needed information for work. @@ -156,13 +140,12 @@ void SAL_CALL SoundHandler::impl_initService() @onerror Show an assertion and do nothing else. @threadsafe yes *//*-*************************************************************************************************************/ -SoundHandler::SoundHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) +SoundHandler::SoundHandler() // Init baseclasses first : ThreadHelpBase ( ) , ::cppu::OWeakObject ( ) // Init member , m_bError ( false ) - , m_xFactory ( xFactory ) { m_aUpdateIdle.SetIdleHdl(LINK(this, SoundHandler, implts_PlayerNotify)); } @@ -357,13 +340,10 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify) extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_framework_SoundHandler_get_implementation(::com::sun::star::uno::XComponentContext* context, +com_sun_star_comp_framework_SoundHandler_get_implementation(::com::sun::star::uno::XComponentContext*, ::com::sun::star::uno::Sequence const &) { - css::uno::Reference< css::lang::XMultiServiceFactory> xSM(context->getServiceManager(), css::uno::UNO_QUERY_THROW); - avmedia::SoundHandler* pClass = new avmedia::SoundHandler( xSM ); - pClass->impl_initService(); - return cppu::acquire( pClass ); + return cppu::acquire(new avmedia::SoundHandler); } diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 2a39c9dabd13..30b9b2623f08 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -21,7 +21,6 @@ #define INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_SOUNDHANDLER_HXX #include -#include #include #include #include @@ -74,7 +73,7 @@ class SoundHandler : // interfaces public: // constructor / destructor - SoundHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); + SoundHandler(); virtual ~SoundHandler( ); // XInterface, XTypeProvider, XServiceInfo @@ -88,11 +87,6 @@ class SoundHandler : // interfaces virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - /* Helper for XServiceInfo */ - static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); - static OUString SAL_CALL impl_getStaticImplementationName ( ); - /* Helper for initialization of service by using own reference! */ - void SAL_CALL impl_initService ( ); // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL , @@ -123,7 +117,6 @@ class SoundHandler : // interfaces private: bool m_bError; - css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; // global uno service factory to create new services css::uno::Reference< css::uno::XInterface > m_xSelfHold ; // we must protect us against dying during async(!) dispatch() call! css::uno::Reference< css::media::XPlayer > m_xPlayer ; // uses avmedia player to play sounds... diff --git a/avmedia/util/avmedia.component b/avmedia/util/avmedia.component index eec2b9a2ff6d..c10946051d8d 100644 --- a/avmedia/util/avmedia.component +++ b/avmedia/util/avmedia.component @@ -18,7 +18,7 @@ --> + xmlns="http://openoffice.org/2010/uno-components">