diff options
Diffstat (limited to 'avmedia/source')
20 files changed, 258 insertions, 258 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 22c67208cb60..c6f82097e434 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -49,7 +49,7 @@ void SAL_CALL SoundHandler::release() throw() OWeakObject::release(); } -css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException ) +css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) { /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ /* Ask for my own supported interfaces ...*/ @@ -69,7 +69,7 @@ css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType return aReturn; } -css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() throw( css::uno::RuntimeException ) +css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() throw( css::uno::RuntimeException, std::exception ) { /* Create one Id for all instances of this class. */ /* Use ethernet address to do this! (sal_True) */ @@ -93,7 +93,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() thro return pID->getImplementationId(); } -css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException, std::exception ) { /* Optimize this method ! */ /* We initialize a static variable only one time. */ @@ -130,19 +130,19 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs /*===========================================================================================================*/ /* XServiceInfo */ /*===========================================================================================================*/ -OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } // XServiceInfo -sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } // XServiceInfo -css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } @@ -259,7 +259,7 @@ SoundHandler::~SoundHandler() *//*-*************************************************************************************************************/ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, - const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) { // SAFE { const ::osl::MutexGuard aLock( m_aLock ); @@ -309,7 +309,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& } void SAL_CALL SoundHandler::dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } @@ -338,7 +338,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& @onerror We return nothing. @threadsafe yes *//*-*************************************************************************************************************/ -OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) +OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) { // Our default is "nothing". So we can return it, if detection failed or file type is really unknown. OUString sTypeName; diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 1e9329bc10a0..f1d9b629926c 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -77,16 +77,16 @@ class SoundHandler : // interfaces virtual ~SoundHandler( ); // XInterface, XTypeProvider, XServiceInfo - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ); /* interface XServiceInfo */ - virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ); /* Helper for XServiceInfo */ static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); static OUString SAL_CALL impl_getStaticImplementationName ( ); @@ -99,19 +99,19 @@ class SoundHandler : // interfaces // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, - const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException); + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception); // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ); // not supported ! virtual void SAL_CALL addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) {}; + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) {}; virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) {}; + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) {}; // XExtendedFilterDetection - virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); // protected methods protected: diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 97efa0e0d3ac..acf025248506 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -105,7 +105,7 @@ FrameGrabber* FrameGrabber::create( const OUString &rURL ) } uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< graphic::XGraphic > xRet; @@ -204,19 +204,19 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe } OUString SAL_CALL FrameGrabber::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_GST_FRAMEGRABBER_SERVICENAME; diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx index ccacba2d4dea..45846d547919 100644 --- a/avmedia/source/gstreamer/gstframegrabber.hxx +++ b/avmedia/source/gstreamer/gstframegrabber.hxx @@ -44,12 +44,12 @@ public: virtual ~FrameGrabber(); // XFrameGrabber - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: FrameGrabber( const OUString &aURL ); diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index 96ecc4c1831c..374f68a49625 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -57,7 +57,7 @@ Manager::~Manager() uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Player* pPlayer( new Player( mxMgr ) ); uno::Reference< media::XPlayer > xRet( pPlayer ); @@ -74,7 +74,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& OUString SAL_CALL Manager::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME ); } @@ -82,7 +82,7 @@ OUString SAL_CALL Manager::getImplementationName( ) sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } @@ -90,7 +90,7 @@ sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_GST_MANAGER_SERVICENAME ; diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx index ca8318dcc825..1c73817af13d 100644 --- a/avmedia/source/gstreamer/gstmanager.hxx +++ b/avmedia/source/gstreamer/gstmanager.hxx @@ -39,12 +39,12 @@ public: ~Manager(); // XManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index f5e34e9ad95b..713b900e59ad 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -397,7 +397,7 @@ bool Player::create( const OUString& rURL ) void SAL_CALL Player::start() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -412,7 +412,7 @@ void SAL_CALL Player::start() void SAL_CALL Player::stop() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -427,7 +427,7 @@ void SAL_CALL Player::stop() sal_Bool SAL_CALL Player::isPlaying() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -447,7 +447,7 @@ sal_Bool SAL_CALL Player::isPlaying() double SAL_CALL Player::getDuration() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -464,7 +464,7 @@ double SAL_CALL Player::getDuration() void SAL_CALL Player::setMediaTime( double fTime ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -486,7 +486,7 @@ void SAL_CALL Player::setMediaTime( double fTime ) double SAL_CALL Player::getMediaTime() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -505,7 +505,7 @@ double SAL_CALL Player::getMediaTime() double SAL_CALL Player::getRate() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -520,7 +520,7 @@ double SAL_CALL Player::getRate() void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); // TODO check how to do with GST @@ -530,7 +530,7 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) sal_Bool SAL_CALL Player::isPlaybackLoop() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); // TODO check how to do with GST @@ -540,7 +540,7 @@ sal_Bool SAL_CALL Player::isPlaybackLoop() void SAL_CALL Player::setMute( sal_Bool bSet ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -564,7 +564,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) sal_Bool SAL_CALL Player::isMute() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -574,7 +574,7 @@ sal_Bool SAL_CALL Player::isMute() void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -592,7 +592,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) sal_Int16 SAL_CALL Player::getVolumeDB() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -612,7 +612,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB() awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -645,7 +645,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -687,7 +687,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); FrameGrabber* pFrameGrabber = NULL; @@ -703,7 +703,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() OUString SAL_CALL Player::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME ); } @@ -711,7 +711,7 @@ OUString SAL_CALL Player::getImplementationName() sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } @@ -719,7 +719,7 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_GST_PLAYER_SERVICENAME ; diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 7cef5cc2fd38..5ac00200c5ae 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -52,27 +52,27 @@ public: virtual GstBusSyncReply processSyncMessage( GstMessage *message ); // XPlayer - virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getRate( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getRate( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index fee4626f071d..b9f3e321e7e4 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -70,12 +70,12 @@ Window::~Window() void SAL_CALL Window::update( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bRet = false; @@ -94,13 +94,13 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) } media::ZoomLevel SAL_CALL Window::getZoomLevel( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return meZoomLevel; } void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { mnPointerType = nPointerType; } @@ -109,12 +109,12 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } awt::Rectangle SAL_CALL Window::getPosSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Rectangle aRet; @@ -126,77 +126,77 @@ awt::Rectangle SAL_CALL Window::getPosSize() } void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::setFocus( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -204,17 +204,17 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList void SAL_CALL Window::dispose( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -222,19 +222,19 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis OUString SAL_CALL Window::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_GST_WINDOW_SERVICENAME ; diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index e2e303cdc395..33d95e234dd3 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -47,39 +47,39 @@ public: void updatePointer(); // XPlayerWindow - virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XWindow - virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 966d83a026d0..3c411b9b4b08 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -52,14 +52,14 @@ void MediaEventListenersImpl::cleanUp() void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -79,7 +79,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt:: void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -98,7 +98,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt: void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -119,7 +119,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt // ----------------------------------------------gvd----------------------- void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -140,7 +140,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -153,7 +153,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -166,7 +166,7 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt: void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -181,7 +181,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -196,14 +196,14 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt:: void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { } diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx index 3b695e057c9b..6440f09d6e15 100644 --- a/avmedia/source/viewer/mediaevent_impl.hxx +++ b/avmedia/source/viewer/mediaevent_impl.hxx @@ -49,23 +49,23 @@ namespace avmedia protected: // XKeyListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XMouseListener - virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XMouseMotionListener - virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index af3fef91e40f..a1a2ae836ede 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -48,7 +48,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString } ::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { osl::Condition condition; @@ -95,19 +95,19 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString return Graphic( bitmap ).GetXGraphic(); } -::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) +::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME; } ::sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_VLC_GRABBER_SERVICENAME; diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx index 51ba6191b225..6be205ae9825 100644 --- a/avmedia/source/vlc/vlcframegrabber.hxx +++ b/avmedia/source/vlc/vlcframegrabber.hxx @@ -42,14 +42,14 @@ public: VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url ); ::com::sun::star::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::rtl::OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); }; } diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 8395d0caf994..296c35011a42 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -83,7 +83,7 @@ Manager::~Manager() } uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUString& rURL ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if ( !m_is_vlc_found ) throw uno::RuntimeException("VLC not found", 0); @@ -107,19 +107,19 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt } rtl::OUString SAL_CALL Manager::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return VLC_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::uno::Sequence< OUString > aRet(1); aRet[0] = VLC_SERVICENAME; diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index 30274d8bef14..297a99818a72 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -36,11 +36,11 @@ public: Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); ~Manager(); - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); - ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 598ed9269dfc..5cd516214ee2 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -47,7 +47,7 @@ unsigned VLCPlayer::getHeight() const return mPlayer.getHeight(); } -void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); if (!mPlayer.play()) @@ -56,19 +56,19 @@ void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException } } -void SAL_CALL VLCPlayer::stop() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::stop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.pause(); } -::sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( ::com::sun::star::uno::RuntimeException ) +::sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return mPlayer.isPlaying(); } -double SAL_CALL VLCPlayer::getDuration() throw ( ::com::sun::star::uno::RuntimeException ) +double SAL_CALL VLCPlayer::getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return static_cast<double>( mMedia.getDuration() ) / MS_IN_SEC; @@ -80,7 +80,7 @@ void SAL_CALL VLCPlayer::setScale( float factor ) mPlayer.setScale( factor ); } -void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); if ( fTime < 0.00000001 && !mPlayer.isPlaying() ) @@ -91,13 +91,13 @@ void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star:: mPlayer.setTime( fTime * MS_IN_SEC ); } -double SAL_CALL VLCPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException ) +double SAL_CALL VLCPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC; } -double SAL_CALL VLCPlayer::getRate() throw ( ::com::sun::star::uno::RuntimeException ) +double SAL_CALL VLCPlayer::getRate() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return mPlayer.getRate(); @@ -111,7 +111,7 @@ void VLCPlayer::replay() start(); } -void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); mPlaybackLoop = bSet; @@ -122,37 +122,37 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun:: mEventManager.onEndReached(); } -::sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException ) +::sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return mPlaybackLoop; } -void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.setVolume( static_cast<sal_Int16>( ( nDB + 40 ) * 10.0 / 4 ) ); } -::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException ) +::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return static_cast<sal_Int16>( mPlayer.getVolume() / 10.0 * 4 - 40 ); } -void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.setMute( bSet ); } -::sal_Bool SAL_CALL VLCPlayer::isMute() throw ( ::com::sun::star::uno::RuntimeException ) +::sal_Bool SAL_CALL VLCPlayer::isMute() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return mPlayer.getMute(); } -css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException ) +css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return css::awt::Size( 480, 360 ); } @@ -203,7 +203,7 @@ void VLCPlayer::setVideoSize( unsigned width, unsigned height ) } uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -226,7 +226,7 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind } uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -240,19 +240,19 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb } ::rtl::OUString SAL_CALL VLCPlayer::getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME; } ::sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_VLC_PLAYER_SERVICENAME; diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index d7c5e3e1c312..f5059a1fb55a 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -62,31 +62,31 @@ public: void SAL_CALL setScale( float factor ); void SAL_CALL setWindowID( const intptr_t windowID ); - void SAL_CALL start() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL stop() throw ( ::com::sun::star::uno::RuntimeException ); - ::sal_Bool SAL_CALL isPlaying() throw ( ::com::sun::star::uno::RuntimeException ); - double SAL_CALL getDuration() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException ); - double SAL_CALL getMediaTime() throw ( ::com::sun::star::uno::RuntimeException ); - double SAL_CALL getRate() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException ); - ::sal_Bool SAL_CALL isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException ); - ::sal_Int16 SAL_CALL getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException ); - ::sal_Bool SAL_CALL isMute() throw ( ::com::sun::star::uno::RuntimeException ); - css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL start() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL stop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + ::sal_Bool SAL_CALL isPlaying() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + double SAL_CALL getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + double SAL_CALL getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + double SAL_CALL getRate() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + ::sal_Bool SAL_CALL isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + ::sal_Int16 SAL_CALL getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + ::sal_Bool SAL_CALL isMute() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::rtl::OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) - throw ( ::com::sun::star::uno::RuntimeException );; + throw ( ::com::sun::star::uno::RuntimeException, std::exception );; ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException );; + throw ( ::com::sun::star::uno::RuntimeException, std::exception );; private: void replay(); diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index 65fbf6e323ef..cb20ed182860 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -27,11 +27,11 @@ VLCWindow::~VLCWindow() mPlayer.setWindowID( mPrevWinID ); } -void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException) +void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException, std::exception) { } -::sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException, std::exception) { sal_Bool bRet = false; @@ -63,48 +63,48 @@ void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException) return bRet; } -css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel() throw (css::uno::RuntimeException) +css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception) { return meZoomLevel; } -void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) throw (css::uno::RuntimeException) +void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) throw (css::uno::RuntimeException, std::exception) { } -::rtl::OUString SAL_CALL VLCWindow::getImplementationName() throw (css::uno::RuntimeException) +::rtl::OUString SAL_CALL VLCWindow::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME; } -::sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } -uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() throw (css::uno::RuntimeException) +uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_VLC_WINDOW_SERVICENAME; return aRet; } -void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException) +void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { mSize.X = X; mSize.Y = Y; @@ -113,83 +113,83 @@ void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, } awt::Rectangle SAL_CALL VLCWindow::getPosSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return mSize; } void SAL_CALL VLCWindow::setVisible( sal_Bool ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::setEnable( sal_Bool ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::setFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx index 022a1b580791..0d07ab434f89 100644 --- a/avmedia/source/vlc/vlcwindow.hxx +++ b/avmedia/source/vlc/vlcwindow.hxx @@ -36,36 +36,36 @@ public: VLCWindow( VLCPlayer& player, const intptr_t prevWinID ); virtual ~VLCWindow(); - void SAL_CALL update() throw (css::uno::RuntimeException); - ::sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException); - css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException); - void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException); + void SAL_CALL update() throw (css::uno::RuntimeException, std::exception); + ::sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception); + css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception); + void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception); - ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception); + ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); - void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } |