summaryrefslogtreecommitdiff
path: root/avmedia/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /avmedia/source
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'avmedia/source')
-rw-r--r--avmedia/source/framework/soundhandler.cxx18
-rw-r--r--avmedia/source/framework/soundhandler.hxx22
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.cxx4
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.hxx8
-rw-r--r--avmedia/source/gstreamer/gstmanager.cxx4
-rw-r--r--avmedia/source/gstreamer/gstmanager.hxx8
-rw-r--r--avmedia/source/gstreamer/gstplayer.cxx18
-rw-r--r--avmedia/source/gstreamer/gstplayer.hxx36
-rw-r--r--avmedia/source/gstreamer/gstwindow.cxx27
-rw-r--r--avmedia/source/gstreamer/gstwindow.hxx54
-rw-r--r--avmedia/source/macavf/framegrabber.hxx8
-rw-r--r--avmedia/source/macavf/framegrabber.mm4
-rw-r--r--avmedia/source/macavf/manager.hxx8
-rw-r--r--avmedia/source/macavf/manager.mm4
-rw-r--r--avmedia/source/macavf/player.hxx40
-rw-r--r--avmedia/source/macavf/player.mm20
-rw-r--r--avmedia/source/macavf/window.hxx54
-rw-r--r--avmedia/source/macavf/window.mm27
-rw-r--r--avmedia/source/opengl/oglframegrabber.cxx5
-rw-r--r--avmedia/source/opengl/oglframegrabber.hxx8
-rw-r--r--avmedia/source/opengl/oglmanager.cxx5
-rw-r--r--avmedia/source/opengl/oglmanager.hxx8
-rw-r--r--avmedia/source/opengl/oglplayer.cxx31
-rw-r--r--avmedia/source/opengl/oglplayer.hxx36
-rw-r--r--avmedia/source/opengl/oglwindow.cxx35
-rw-r--r--avmedia/source/opengl/oglwindow.hxx60
-rw-r--r--avmedia/source/quicktime/framegrabber.hxx8
-rw-r--r--avmedia/source/quicktime/framegrabber.mm4
-rw-r--r--avmedia/source/quicktime/manager.hxx8
-rw-r--r--avmedia/source/quicktime/manager.mm4
-rw-r--r--avmedia/source/quicktime/player.hxx36
-rw-r--r--avmedia/source/quicktime/player.mm18
-rw-r--r--avmedia/source/quicktime/window.hxx54
-rw-r--r--avmedia/source/quicktime/window.mm27
-rw-r--r--avmedia/source/viewer/mediaevent_impl.cxx11
-rw-r--r--avmedia/source/viewer/mediaevent_impl.hxx22
-rw-r--r--avmedia/source/vlc/vlcframegrabber.cxx5
-rw-r--r--avmedia/source/vlc/vlcframegrabber.hxx14
-rw-r--r--avmedia/source/vlc/vlcmanager.cxx4
-rw-r--r--avmedia/source/vlc/vlcmanager.hxx8
-rw-r--r--avmedia/source/vlc/vlcplayer.cxx31
-rw-r--r--avmedia/source/vlc/vlcplayer.hxx41
-rw-r--r--avmedia/source/vlc/vlcwindow.cxx35
-rw-r--r--avmedia/source/vlc/vlcwindow.hxx54
-rw-r--r--avmedia/source/win/framegrabber.cxx4
-rw-r--r--avmedia/source/win/framegrabber.hxx8
-rw-r--r--avmedia/source/win/manager.cxx4
-rw-r--r--avmedia/source/win/manager.hxx8
-rw-r--r--avmedia/source/win/player.cxx18
-rw-r--r--avmedia/source/win/player.hxx36
-rw-r--r--avmedia/source/win/window.cxx27
-rw-r--r--avmedia/source/win/window.hxx54
52 files changed, 400 insertions, 695 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 65a10ba3d3bb..45f1b61132f7 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -50,7 +50,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, std::exception )
+css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType )
{
/* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */
/* Ask for my own supported interfaces ...*/
@@ -70,12 +70,12 @@ 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, std::exception )
+css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
-css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes()
{
/* Optimize this method ! */
/* We initialize a static variable only one time. */
@@ -111,19 +111,19 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs
/*===========================================================================================================*/
/* XServiceInfo */
/*===========================================================================================================*/
-OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL SoundHandler::getImplementationName()
{
return IMPLEMENTATIONNAME_SOUNDHANDLER;
}
// XServiceInfo
-sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName )
{
return cppu::supportsService(this, sServiceName);
}
// XServiceInfo
-css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames()
{
return { "com.sun.star.frame.ContentHandler" };
}
@@ -185,7 +185,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, std::exception)
+ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
// SAFE {
const ::osl::MutexGuard aLock( m_aLock );
@@ -235,7 +235,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, std::exception )
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
}
@@ -261,7 +261,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, std::exception )
+OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
{
// 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 f055fdf82931..5ee3fc7ae831 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -77,33 +77,33 @@ class SoundHandler : // interfaces
virtual ~SoundHandler( ) override;
// XInterface, XTypeProvider, XServiceInfo
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
/* interface XServiceInfo */
- virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName ( ) override;
+ virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override;
// 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, std::exception) override;
+ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
// XDispatch
virtual void SAL_CALL dispatch ( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
// not supported !
virtual void SAL_CALL addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
- const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) override {};
+ const css::util::URL& /*aURL*/ ) override {};
virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
- const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) override {};
+ const css::util::URL& /*aURL*/ ) override {};
// XExtendedFilterDetection
- virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override;
// protected methods
protected:
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 2ad8cfa09515..db2f20364b68 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -105,7 +105,6 @@ FrameGrabber* FrameGrabber::create( const OUString &rURL )
}
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
- throw (uno::RuntimeException, std::exception)
{
uno::Reference< graphic::XGraphic > xRet;
@@ -204,19 +203,16 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
OUString SAL_CALL FrameGrabber::getImplementationName( )
- throw (uno::RuntimeException, std::exception)
{
return OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
- throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames()
- throw (uno::RuntimeException, std::exception)
{
return { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME };
}
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index 51c9d6b39619..2b2f644f8b0f 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -45,12 +45,12 @@ public:
virtual ~FrameGrabber() override;
// XFrameGrabber
- virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
explicit FrameGrabber( const OUString &aURL );
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index f064cb13a388..aa55134e028f 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -40,7 +40,6 @@ Manager::~Manager()
}
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
- throw (uno::RuntimeException, std::exception)
{
Player* pPlayer( new Player );
uno::Reference< media::XPlayer > xRet( pPlayer );
@@ -53,19 +52,16 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
}
OUString SAL_CALL Manager::getImplementationName( )
- throw (uno::RuntimeException, std::exception)
{
return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
- throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
- throw (uno::RuntimeException, std::exception)
{
return { AVMEDIA_GST_MANAGER_SERVICENAME };
}
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index d415559f41b5..24c057e3d545 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -35,12 +35,12 @@ public:
virtual ~Manager() override;
// XManager
- virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
} // namespace gstreamer
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 37b76626315b..50fa9b4cb1dc 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -684,7 +684,6 @@ bool Player::create( const OUString& rURL )
void SAL_CALL Player::start()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -698,7 +697,6 @@ void SAL_CALL Player::start()
void SAL_CALL Player::stop()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -712,7 +710,6 @@ void SAL_CALL Player::stop()
sal_Bool SAL_CALL Player::isPlaying()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -731,7 +728,6 @@ sal_Bool SAL_CALL Player::isPlaying()
double SAL_CALL Player::getDuration()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -747,7 +743,6 @@ double SAL_CALL Player::getDuration()
void SAL_CALL Player::setMediaTime( double fTime )
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -768,7 +763,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
double SAL_CALL Player::getMediaTime()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -786,7 +780,6 @@ double SAL_CALL Player::getMediaTime()
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
// TODO check how to do with GST
@@ -795,7 +788,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
sal_Bool SAL_CALL Player::isPlaybackLoop()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
// TODO check how to do with GST
@@ -804,7 +796,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop()
void SAL_CALL Player::setMute( sal_Bool bSet )
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -827,7 +818,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
sal_Bool SAL_CALL Player::isMute()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -836,7 +826,6 @@ sal_Bool SAL_CALL Player::isMute()
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -853,7 +842,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
sal_Int16 SAL_CALL Player::getVolumeDB()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -872,7 +860,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -900,7 +887,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -962,7 +948,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
- throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
FrameGrabber* pFrameGrabber = nullptr;
@@ -977,21 +962,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
OUString SAL_CALL Player::getImplementationName()
- throw (uno::RuntimeException, std::exception)
{
return OUString( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
- throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
- throw (uno::RuntimeException, std::exception)
{
return { AVMEDIA_GST_PLAYER_SERVICENAME };
}
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 3a61eba88625..61dc3c14cc58 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -53,26 +53,26 @@ public:
GstBusSyncReply processSyncMessage( GstMessage *message );
// XPlayer
- virtual void SAL_CALL start( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL start( ) override;
+ virtual void SAL_CALL stop( ) override;
+ virtual sal_Bool SAL_CALL isPlaying( ) override;
+ virtual double SAL_CALL getDuration( ) override;
+ virtual void SAL_CALL setMediaTime( double fTime ) override;
+ virtual double SAL_CALL getMediaTime( ) override;
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isPlaybackLoop( ) override;
+ virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isMute( ) override;
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+ virtual sal_Int16 SAL_CALL getVolumeDB( ) override;
+ virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) override;
+ virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+ virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// ::cppu::OComponentHelper
virtual void SAL_CALL disposing() final override;
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 3b061f3915de..948fff012d0c 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -67,12 +67,10 @@ Window::~Window()
void SAL_CALL Window::update( )
- throw (uno::RuntimeException, std::exception)
{
}
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
- throw (uno::RuntimeException, std::exception)
{
bool bRet = false;
@@ -91,13 +89,11 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
}
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
- throw (uno::RuntimeException, std::exception)
{
return meZoomLevel;
}
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
- throw (uno::RuntimeException, std::exception)
{
mnPointerType = nPointerType;
}
@@ -106,12 +102,10 @@ 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, std::exception)
{
}
awt::Rectangle SAL_CALL Window::getPosSize()
- throw (uno::RuntimeException, std::exception)
{
awt::Rectangle aRet;
@@ -123,77 +117,62 @@ awt::Rectangle SAL_CALL Window::getPosSize()
}
void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::setFocus( )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
@@ -201,17 +180,14 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
void SAL_CALL Window::dispose( )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
@@ -219,19 +195,16 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
OUString SAL_CALL Window::getImplementationName( )
- throw (uno::RuntimeException, std::exception)
{
return OUString( AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
- throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( )
- throw (uno::RuntimeException, std::exception)
{
return { AVMEDIA_GST_WINDOW_SERVICENAME };
}
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index da090a8df1f0..3b8f431d767a 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -39,39 +39,39 @@ public:
virtual ~Window() override;
// XPlayerWindow
- virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL update( ) override;
+ virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+ virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) override;
+ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override;
// XWindow
- virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+ virtual css::awt::Rectangle SAL_CALL getPosSize( ) override;
+ virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+ virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+ virtual void SAL_CALL setFocus( ) override;
+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose( ) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index 4567690e0c75..7f4681ef4364 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -39,12 +39,12 @@ public:
bool create( AVAsset* pMovie );
// XFrameGrabber
- virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index b4022caf360e..2293a05ba03a 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -74,7 +74,6 @@ bool FrameGrabber::create( AVAsset* pMovie )
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
- throw (uno::RuntimeException)
{
uno::Reference< graphic::XGraphic > xRet;
if( !mpImageGen )
@@ -105,19 +104,16 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
- throw (uno::RuntimeException)
{
return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
- throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME;
}
uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME };
}
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index 6044df008d37..7761cc7d91e9 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -37,12 +37,12 @@ public:
virtual ~Manager() override;
// XManager
- virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (css::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 5df4af80c37b..69d2a3c0196f 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -37,7 +37,6 @@ Manager::~Manager()
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
- throw (uno::RuntimeException)
{
Player* pPlayer( new Player( mxMgr ) );
uno::Reference< media::XPlayer > xRet( pPlayer );
@@ -51,21 +50,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
::rtl::OUString SAL_CALL Manager::getImplementationName( )
- throw (uno::RuntimeException)
{
return ::rtl::OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
- throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_MACAVF_MANAGER_SERVICENAME;
}
uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_MACAVF_MANAGER_SERVICENAME };
}
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index b02400bba898..176f6f502cea 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -41,29 +41,29 @@ public:
bool create( AVAsset* );
// XPlayer
- virtual void SAL_CALL start() throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL stop() throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isPlaying() throw (css::uno::RuntimeException) override;
- virtual double SAL_CALL getDuration() throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override;
- virtual double SAL_CALL getMediaTime() throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL start() override;
+ virtual void SAL_CALL stop() override;
+ virtual sal_Bool SAL_CALL isPlaying() override;
+ virtual double SAL_CALL getDuration() override;
+ virtual void SAL_CALL setMediaTime( double fTime ) override;
+ virtual double SAL_CALL getMediaTime() override;
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL setStopTime( double fTime ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setStopTime( double fTime );
/// @throws css::uno::RuntimeException
- virtual double SAL_CALL getStopTime() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isPlaybackLoop() throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isMute() throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override;
- virtual sal_Int16 SAL_CALL getVolumeDB() throw (css::uno::RuntimeException) override;
- virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) override;
+ virtual double SAL_CALL getStopTime();
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isPlaybackLoop() override;
+ virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isMute() override;
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+ virtual sal_Int16 SAL_CALL getVolumeDB() override;
+ virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) override;
+ virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+ virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual ::rtl::OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
AVPlayer* getAVPlayer() const { return mpPlayer; }
virtual bool handleObservation( NSString* pKeyPath ) override;
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index bd63acaf4b43..a683b4790032 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -154,7 +154,6 @@ bool Player::create( const ::rtl::OUString& rURL )
void SAL_CALL Player::start()
- throw (uno::RuntimeException)
{
if( !mpPlayer )
return;
@@ -165,7 +164,6 @@ void SAL_CALL Player::start()
void SAL_CALL Player::stop()
- throw (uno::RuntimeException)
{
if( !mpPlayer )
return;
@@ -176,7 +174,6 @@ void SAL_CALL Player::stop()
sal_Bool SAL_CALL Player::isPlaying()
- throw (uno::RuntimeException)
{
if( !mpPlayer )
return false;
@@ -186,7 +183,6 @@ sal_Bool SAL_CALL Player::isPlaying()
double SAL_CALL Player::getDuration()
- throw (uno::RuntimeException)
{
// slideshow checks for non-zero duration, so cheat here
double duration = 0.01;
@@ -205,7 +201,6 @@ double SAL_CALL Player::getDuration()
void SAL_CALL Player::setMediaTime( double fTime )
- throw (uno::RuntimeException)
{
if( mpPlayer )
[mpPlayer seekToTime: CMTimeMakeWithSeconds(fTime,1000) ];
@@ -213,7 +208,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
double SAL_CALL Player::getMediaTime()
- throw (uno::RuntimeException)
{
if( !mpPlayer )
return 0.0;
@@ -228,35 +222,30 @@ double SAL_CALL Player::getMediaTime()
void SAL_CALL Player::setStopTime( double fTime )
- throw (uno::RuntimeException)
{
mfStopTime = fTime;
}
double SAL_CALL Player::getStopTime()
- throw (uno::RuntimeException)
{
return mfStopTime;
}
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
- throw (uno::RuntimeException)
{
mbLooping = bSet;
}
sal_Bool SAL_CALL Player::isPlaybackLoop()
- throw (uno::RuntimeException)
{
return mbLooping;
}
void SAL_CALL Player::setMute( sal_Bool bSet )
- throw (uno::RuntimeException)
{
if( !mpPlayer )
return;
@@ -267,14 +256,12 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
sal_Bool SAL_CALL Player::isMute()
- throw (uno::RuntimeException)
{
return mbMuted;
}
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
- throw (uno::RuntimeException)
{
// -40dB <-> AVPlayer volume 0.0
// 0dB <-> AVPlayer volume 1.0
@@ -287,7 +274,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
sal_Int16 SAL_CALL Player::getVolumeDB()
- throw (uno::RuntimeException)
{
if( !mpPlayer )
return 0;
@@ -305,7 +291,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
- throw (uno::RuntimeException)
{
awt::Size aSize( 0, 0 ); // default size
@@ -323,7 +308,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
- throw (uno::RuntimeException)
{
// get the preferred window size
const awt::Size aSize( getPreferredPlayerWindowSize() );
@@ -346,7 +330,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
- throw (uno::RuntimeException)
{
uno::Reference< media::XFrameGrabber > xRet;
@@ -360,21 +343,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
::rtl::OUString SAL_CALL Player::getImplementationName( )
- throw (uno::RuntimeException)
{
return ::rtl::OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
- throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_MACAVF_PLAYER_SERVICENAME;
}
uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_MACAVF_PLAYER_SERVICENAME };
}
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index fc9387e0bc2d..54c9038ced3a 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -55,39 +55,39 @@ public:
void updatePointer();
// XPlayerWindow
- virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException) override;
- virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL update( ) override;
+ virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+ virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) override;
+ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override;
// XWindow
- virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override;
- virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+ virtual css::awt::Rectangle SAL_CALL getPosSize( ) override;
+ virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+ virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+ virtual void SAL_CALL setFocus( ) override;
+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL dispose( ) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override;
virtual bool handleObservation( NSString* pKeyPath ) override;
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index b1c64d8088ce..6807aadbfb2e 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -83,26 +83,22 @@ bool Window::handleObservation( NSString* /*pKeyPath*/ )
// XPlayerWindow
void SAL_CALL Window::update()
- throw (uno::RuntimeException)
{}
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ )
- throw (uno::RuntimeException)
{
return false;
}
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
- throw (uno::RuntimeException)
{
return meZoomLevel;
}
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
- throw (uno::RuntimeException)
{
mnPointerType = nPointerType;
}
@@ -110,7 +106,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
// XWindow
void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ )
- throw (uno::RuntimeException)
{
if( !mpView )
return;
@@ -127,7 +122,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 Wi
awt::Rectangle SAL_CALL Window::getPosSize()
- throw (uno::RuntimeException)
{
awt::Rectangle aRet;
@@ -141,102 +135,87 @@ awt::Rectangle SAL_CALL Window::getPosSize()
void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
- throw (uno::RuntimeException)
{
}
void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
- throw (uno::RuntimeException)
{
}
void SAL_CALL Window::setFocus()
- throw (uno::RuntimeException)
{
}
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
@@ -245,20 +224,17 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
// XComponent
void SAL_CALL Window::dispose( )
- throw (uno::RuntimeException)
{
}
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
@@ -266,21 +242,18 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
// XServiceInfo
::rtl::OUString SAL_CALL Window::getImplementationName( )
- throw (uno::RuntimeException)
{
return ::rtl::OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
- throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_MACAVF_WINDOW_SERVICENAME;
}
uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_MACAVF_WINDOW_SERVICENAME };
}
diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx
index 9cb7ddd31416..52fa7a4da83a 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -35,7 +35,6 @@ OGLFrameGrabber::~OGLFrameGrabber()
}
uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( double /*fMediaTime*/ )
- throw ( uno::RuntimeException, std::exception )
{
std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[m_rHandle.viewport.width * m_rHandle.viewport.height * 4]);
glTFHandle* pHandle = &m_rHandle;
@@ -49,19 +48,17 @@ uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( do
return Graphic( aBitmap ).GetXGraphic();
}
-OUString SAL_CALL OGLFrameGrabber::getImplementationName() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL OGLFrameGrabber::getImplementationName()
{
return OUString("com.sun.star.comp.avmedia.FrameGrabber_OpenGL");
}
sal_Bool SAL_CALL OGLFrameGrabber::supportsService( const OUString& rServiceName )
- throw ( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
uno::Sequence< OUString > SAL_CALL OGLFrameGrabber::getSupportedServiceNames()
- throw ( uno::RuntimeException, std::exception )
{
return { "com.sun.star.media.FrameGrabber_OpenGL" };
}
diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx
index 1c3799f616de..fd2c52865d48 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -29,12 +29,12 @@ public:
virtual ~OGLFrameGrabber() override;
// XFrameGrabber
- virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
libgltf::glTFHandle& m_rHandle;
diff --git a/avmedia/source/opengl/oglmanager.cxx b/avmedia/source/opengl/oglmanager.cxx
index 0e538373fc5a..0f7cfddc77d4 100644
--- a/avmedia/source/opengl/oglmanager.cxx
+++ b/avmedia/source/opengl/oglmanager.cxx
@@ -26,7 +26,6 @@ OGLManager::~OGLManager()
}
uno::Reference< media::XPlayer > SAL_CALL OGLManager::createPlayer( const OUString& rURL )
- throw (uno::RuntimeException, std::exception)
{
OGLPlayer* pPlayer( new OGLPlayer() );
if( pPlayer->create(rURL) )
@@ -39,19 +38,17 @@ uno::Reference< media::XPlayer > SAL_CALL OGLManager::createPlayer( const OUStri
}
}
-OUString SAL_CALL OGLManager::getImplementationName() throw ( uno::RuntimeException, std::exception )
+OUString SAL_CALL OGLManager::getImplementationName()
{
return OUString("com.sun.star.comp.avmedia.Manager_OpenGL");
}
sal_Bool SAL_CALL OGLManager::supportsService( const OUString& rServiceName )
- throw ( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
uno::Sequence< OUString > SAL_CALL OGLManager::getSupportedServiceNames()
- throw ( uno::RuntimeException, std::exception )
{
return { "com.sun.star.media.Manager_OpenGL" };
}
diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx
index d6f147304e12..945139f2313a 100644
--- a/avmedia/source/opengl/oglmanager.hxx
+++ b/avmedia/source/opengl/oglmanager.hxx
@@ -25,12 +25,12 @@ public:
virtual ~OGLManager() override;
// XManager
- virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
};
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 4c5eba196713..18b4e9437d66 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -139,7 +139,7 @@ void OGLPlayer::releaseInputFiles()
m_vInputFiles.clear();
}
-void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::start()
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
@@ -152,7 +152,7 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception )
m_bIsRendering = true;
}
-void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::stop()
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
@@ -161,7 +161,7 @@ void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception )
m_bIsRendering = false;
}
-sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OGLPlayer::isPlaying()
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
@@ -173,64 +173,64 @@ sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException, std::exc
return m_bIsRendering;
}
-double SAL_CALL OGLPlayer::getDuration() throw ( uno::RuntimeException, std::exception )
+double SAL_CALL OGLPlayer::getDuration()
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
return gltf_animation_get_duration(m_pHandle);
}
-void SAL_CALL OGLPlayer::setMediaTime( double fTime ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::setMediaTime( double fTime )
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
gltf_animation_set_time(m_pHandle, fTime);
}
-double SAL_CALL OGLPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception )
+double SAL_CALL OGLPlayer::getMediaTime()
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
return gltf_animation_get_time(m_pHandle);
}
-void SAL_CALL OGLPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::setPlaybackLoop( sal_Bool bSet )
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
gltf_animation_set_looping(m_pHandle, bSet);
}
-sal_Bool SAL_CALL OGLPlayer::isPlaybackLoop() throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OGLPlayer::isPlaybackLoop()
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
return gltf_animation_get_looping(m_pHandle);
}
-void SAL_CALL OGLPlayer::setVolumeDB( sal_Int16 /*nVolumDB*/ ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::setVolumeDB( sal_Int16 /*nVolumDB*/ )
{
// OpenGL models have no sound.
}
-sal_Int16 SAL_CALL OGLPlayer::getVolumeDB() throw ( uno::RuntimeException, std::exception )
+sal_Int16 SAL_CALL OGLPlayer::getVolumeDB()
{
// OpenGL models have no sound.
return 0;
}
-void SAL_CALL OGLPlayer::setMute( sal_Bool /*bSet*/ ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL OGLPlayer::setMute( sal_Bool /*bSet*/ )
{
// OpenGL models have no sound.
}
-sal_Bool SAL_CALL OGLPlayer::isMute() throw ( uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL OGLPlayer::isMute()
{
// OpenGL models have no sound.
return false;
}
-awt::Size SAL_CALL OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::RuntimeException, std::exception )
+awt::Size SAL_CALL OGLPlayer::getPreferredPlayerWindowSize()
{
return awt::Size( 480, 360 );
}
@@ -241,7 +241,6 @@ static bool lcl_CheckOpenGLRequirements()
}
uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
- throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -300,7 +299,6 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
}
uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
- throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
assert(m_pHandle);
@@ -341,19 +339,16 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
}
OUString SAL_CALL OGLPlayer::getImplementationName()
- throw ( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.avmedia.Player_OpenGL");
}
sal_Bool SAL_CALL OGLPlayer::supportsService( const OUString& rServiceName )
- throw ( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames()
- throw ( uno::RuntimeException, std::exception )
{
return { "com.sun.star.media.Player_OpenGL" };
}
diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx
index 05716ad33b5f..a74aae4707f9 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -40,25 +40,25 @@ public:
void releaseInputFiles();
// XPlayer
- virtual void SAL_CALL start() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL stop() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isPlaying() throw (css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getDuration() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getMediaTime() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isPlaybackLoop() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getVolumeDB() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isMute() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& rArguments ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL start() override;
+ virtual void SAL_CALL stop() override;
+ virtual sal_Bool SAL_CALL isPlaying() override;
+ virtual double SAL_CALL getDuration() override;
+ virtual void SAL_CALL setMediaTime( double fTime ) override;
+ virtual double SAL_CALL getMediaTime() override;
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isPlaybackLoop() override;
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+ virtual sal_Int16 SAL_CALL getVolumeDB() override;
+ virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isMute() override;
+ virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize() override;
+ virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& rArguments ) override;
+ virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
DECL_LINK( TimerHandler, Timer*, void );
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 88209d55ee5c..fe0adab71a20 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -30,7 +30,7 @@ OGLWindow::~OGLWindow()
dispose();
}
-void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OGLWindow::update()
{
m_xContext->makeCurrent();
int nRet = gltf_prepare_renderer(&m_rHandle);
@@ -44,36 +44,36 @@ void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::except
m_xContext->swapBuffers();
}
-sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel /*eZoomLevel*/ ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel /*eZoomLevel*/ )
{
return false;
}
-css::media::ZoomLevel SAL_CALL OGLWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception)
+css::media::ZoomLevel SAL_CALL OGLWindow::getZoomLevel()
{
return media::ZoomLevel_ORIGINAL;
}
-void SAL_CALL OGLWindow::setPointerType( sal_Int32 ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL OGLWindow::setPointerType( sal_Int32 )
{
}
-OUString SAL_CALL OGLWindow::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OGLWindow::getImplementationName()
{
return OUString("com.sun.star.comp.avmedia.Window_OpenGL");
}
-sal_Bool SAL_CALL OGLWindow::supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGLWindow::supportsService( const OUString& rServiceName )
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence< OUString > SAL_CALL OGLWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL OGLWindow::getSupportedServiceNames()
{
return { "com.sun.star.media.Window_OpenGL" };
}
-void SAL_CALL OGLWindow::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL OGLWindow::dispose()
{
assert(m_rEventHandler.GetParent());
m_rEventHandler.GetParent()->RemoveEventListener( LINK(this, OGLWindow, FocusGrabber));
@@ -81,17 +81,14 @@ void SAL_CALL OGLWindow::dispose() throw (uno::RuntimeException, std::exception)
}
void SAL_CALL OGLWindow::addEventListener( const uno::Reference< lang::XEventListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::removeEventListener( const uno::Reference< lang::XEventListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 /*nFlags*/ )
- throw (uno::RuntimeException, std::exception)
{
if( m_rHandle.viewport.x != nX || m_rHandle.viewport.x != nY ||
m_rHandle.viewport.width != nWidth || m_rHandle.viewport.height != nHeight )
@@ -105,14 +102,12 @@ void SAL_CALL OGLWindow::setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidt
}
awt::Rectangle SAL_CALL OGLWindow::getPosSize()
- throw (uno::RuntimeException, std::exception)
{
return awt::Rectangle(m_rHandle.viewport.x, m_rHandle.viewport.y,
m_rHandle.viewport.width, m_rHandle.viewport.height);
}
void SAL_CALL OGLWindow::setVisible( sal_Bool bSet )
- throw (uno::RuntimeException, std::exception)
{
assert(m_rEventHandler.GetParent());
if( bSet && !m_bVisible )
@@ -130,72 +125,58 @@ void SAL_CALL OGLWindow::setVisible( sal_Bool bSet )
}
void SAL_CALL OGLWindow::setEnable( sal_Bool )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::setFocus()
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx
index d89f2735fccb..5bb405979e37 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -30,36 +30,36 @@ public:
OGLWindow( libgltf::glTFHandle& rHandle, const rtl::Reference<OpenGLContext> & rContext, vcl::Window& rEventHandlerParent );
virtual ~OGLWindow() override;
- virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPointerType( sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception) override;
-
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
-
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) final override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-
- virtual void SAL_CALL setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL update() override;
+ virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+ virtual css::media::ZoomLevel SAL_CALL getZoomLevel() override;
+ virtual void SAL_CALL setPointerType( sal_Int32 SystemPointerType ) override;
+
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+ virtual void SAL_CALL dispose() final override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
+
+ virtual void SAL_CALL setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) override;
+ virtual css::awt::Rectangle SAL_CALL getPosSize() override;
+ virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+ virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+ virtual void SAL_CALL setFocus() override;
+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
private:
DECL_LINK( FocusGrabber, VclWindowEvent&, void );
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 7d2a8df902c7..2441e7538e6b 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -38,12 +38,12 @@ public:
bool create( const OUString& rURL );
// XFrameGrabber
- virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index 6817af1f0798..2ade85f292b9 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -83,7 +83,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
- throw (uno::RuntimeException)
{
uno::Reference< graphic::XGraphic > xRet;
@@ -103,21 +102,18 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
- throw (uno::RuntimeException)
{
return ::rtl::OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
- throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME );
}
uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME };
}
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 215e14c47017..113fd7728bbd 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -37,12 +37,12 @@ public:
virtual ~Manager();
// XManager
- virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index bcb27b6d4073..735b282d07a1 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -39,7 +39,6 @@ Manager::~Manager()
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
- throw (uno::RuntimeException)
{
Player* pPlayer( new Player( mxMgr ) );
uno::Reference< media::XPlayer > xRet( pPlayer );
@@ -55,21 +54,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
::rtl::OUString SAL_CALL Manager::getImplementationName( )
- throw (uno::RuntimeException)
{
return ::rtl::OUString( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
- throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_MANAGER_SERVICENAME );
}
uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_QUICKTIME_MANAGER_SERVICENAME };
}
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 636efb034fee..f145c79fb120 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -37,25 +37,25 @@ public:
bool create( const OUString& rURL );
// XPlayer
- virtual void SAL_CALL start( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException) override;
- virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override;
- virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override;
- virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException) override;
- virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL start( ) override;
+ virtual void SAL_CALL stop( ) override;
+ virtual sal_Bool SAL_CALL isPlaying( ) override;
+ virtual double SAL_CALL getDuration( ) override;
+ virtual void SAL_CALL setMediaTime( double fTime ) override;
+ virtual double SAL_CALL getMediaTime( ) override;
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isPlaybackLoop( ) override;
+ virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isMute( ) override;
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+ virtual sal_Int16 SAL_CALL getVolumeDB( ) override;
+ virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) override;
+ virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+ virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
QTMovie* getMovie();
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index 32ab8c6df393..d1c44306834f 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -101,7 +101,6 @@ bool Player::create( const ::rtl::OUString& rURL )
void SAL_CALL Player::start( )
- throw (uno::RuntimeException)
{
SAL_INFO ( "avmedia.quicktime", "Player::start" );
@@ -113,7 +112,6 @@ void SAL_CALL Player::start( )
void SAL_CALL Player::stop( )
- throw (uno::RuntimeException)
{
SAL_INFO ( "avmedia.quicktime", "Player::stop" );
if( mpMovie )
@@ -124,7 +122,6 @@ void SAL_CALL Player::stop( )
sal_Bool SAL_CALL Player::isPlaying()
- throw (uno::RuntimeException)
{
bool bRet = false;
@@ -141,7 +138,6 @@ sal_Bool SAL_CALL Player::isPlaying()
double SAL_CALL Player::getDuration( )
- throw (uno::RuntimeException)
{
// slideshow checks for non-zero duration, so cheat here
double duration = 0.01;
@@ -157,7 +153,6 @@ double SAL_CALL Player::getDuration( )
void SAL_CALL Player::setMediaTime( double fTime )
- throw (uno::RuntimeException)
{
SAL_INFO ( "avmedia.quicktime", "Player::setMediaTime" );
@@ -169,7 +164,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
double SAL_CALL Player::getMediaTime( )
- throw (uno::RuntimeException)
{
double position = 0.0;
@@ -188,7 +182,6 @@ double SAL_CALL Player::getMediaTime( )
}
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
- throw (uno::RuntimeException)
{
SAL_INFO ( "avmedia.quicktime",
"Player::setPlaybackLoop ? " << ( bSet?"True":"False" ) );
@@ -205,7 +198,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
sal_Bool SAL_CALL Player::isPlaybackLoop( )
- throw (uno::RuntimeException)
{
bool bRet = [[mpMovie attributeForKey:QTMovieLoopsAttribute] boolValue];
@@ -217,7 +209,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( )
void SAL_CALL Player::setMute( sal_Bool bSet )
- throw (uno::RuntimeException)
{
SAL_INFO ( "avmedia.quicktime",
"set mute: " << bSet <<
@@ -235,7 +226,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
sal_Bool SAL_CALL Player::isMute( )
- throw (uno::RuntimeException)
{
SAL_INFO ( "avmedia.quicktime", "Player::isMuted" );
@@ -244,7 +234,6 @@ sal_Bool SAL_CALL Player::isMute( )
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
- throw (uno::RuntimeException)
{
// OOo db volume -40 = QTVolume 0
// OOo db volume 0 = QTvolume 1
@@ -270,7 +259,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
sal_Int16 SAL_CALL Player::getVolumeDB( )
- throw (uno::RuntimeException)
{
sal_Int16 nVolumeDB = 0.0;
@@ -294,7 +282,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
- throw (uno::RuntimeException)
{
NSSize nsSize = [[mpMovie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
awt::Size aSize( nsSize.width, nsSize.height );
@@ -303,7 +290,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
- throw (uno::RuntimeException)
{
uno::Reference< ::media::XPlayerWindow > xRet;
awt::Size aSize( getPreferredPlayerWindowSize() );
@@ -327,7 +313,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
- throw (css::uno::RuntimeException)
{
uno::Reference< media::XFrameGrabber > xRet;
SAL_INFO ( "avmedia.quicktime", "Player::createFrameGrabber" );
@@ -349,21 +334,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
::rtl::OUString SAL_CALL Player::getImplementationName( )
- throw (uno::RuntimeException)
{
return ::rtl::OUString( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
- throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_PLAYER_SERVICENAME );
}
uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_QUICKTIME_PLAYER_SERVICENAME };
}
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index cbcb9ee2faf9..8e2ec9f1cd16 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -45,39 +45,39 @@ public:
void updatePointer();
// XPlayerWindow
- virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ) throw (css::uno::RuntimeException) override;
- virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL update( ) override;
+ virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ) override;
+ virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) override;
+ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override;
// XWindow
- virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override;
- virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setVisible( sal_Bool ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setEnable( sal_Bool ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+ virtual css::awt::Rectangle SAL_CALL getPosSize( ) override;
+ virtual void SAL_CALL setVisible( sal_Bool ) override;
+ virtual void SAL_CALL setEnable( sal_Bool ) override;
+ virtual void SAL_CALL setFocus( ) override;
+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL dispose( ) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index 7d0db9af8efe..db3c2a6ff1ba 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -90,25 +90,21 @@ Window::~Window()
// XPlayerWindow
void SAL_CALL Window::update( )
- throw (uno::RuntimeException)
{
;
}
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel )
- throw (uno::RuntimeException)
{
return false;
}
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
- throw (uno::RuntimeException)
{
return meZoomLevel;
}
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
- throw (uno::RuntimeException)
{
mnPointerType = nPointerType;
}
@@ -116,7 +112,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
// XWindow
void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
- throw (uno::RuntimeException)
{
if( mpParentView && mpMovieView )
{
@@ -129,7 +124,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_I
}
awt::Rectangle SAL_CALL Window::getPosSize()
- throw (uno::RuntimeException)
{
awt::Rectangle aRet;
@@ -142,92 +136,77 @@ awt::Rectangle SAL_CALL Window::getPosSize()
}
void SAL_CALL Window::setVisible( sal_Bool )
- throw (uno::RuntimeException)
{
SAL_INFO ( "avmedia.quicktime", "Window::setVisible" );
}
void SAL_CALL Window::setEnable( sal_Bool )
- throw (uno::RuntimeException)
{
;
}
void SAL_CALL Window::setFocus( )
- throw (uno::RuntimeException)
{
SAL_INFO ( "avmedia.quicktime", "Window::setFocus" );
}
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
@@ -235,18 +214,15 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
// XComponent
void SAL_CALL Window::dispose( )
- throw (uno::RuntimeException)
{
}
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
@@ -254,19 +230,16 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
// XServiceInfo
::rtl::OUString SAL_CALL Window::getImplementationName( )
- throw (uno::RuntimeException)
{
return ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
- throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_WINDOW_SERVICENAME );
}
uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_QUICKTIME_WINDOW_SERVICENAME };
}
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 87ec80daa2b4..fac08d070870 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -46,13 +46,11 @@ void MediaEventListenersImpl::cleanUp()
void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& )
- throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
- throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -71,7 +69,6 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e )
void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e )
- throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -89,7 +86,6 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e
void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& e )
- throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -109,7 +105,6 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent&
void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent& e )
- throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -129,7 +124,6 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent
void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& )
- throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -141,7 +135,6 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent&
void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& )
- throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -153,7 +146,6 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent&
void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& e )
- throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -167,7 +159,6 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent&
void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e )
- throw (css::uno::RuntimeException, std::exception)
{
const ::osl::MutexGuard aGuard( maMutex );
const SolarMutexGuard aAppGuard;
@@ -181,13 +172,11 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e
void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& )
- throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& )
- throw (css::uno::RuntimeException, std::exception)
{
}
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index e73e2968882c..f98279833333 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -50,23 +50,23 @@ namespace avmedia
protected:
// XKeyListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+ virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) override;
+ virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) override;
// XMouseListener
- virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override;
+ virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override;
+ virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override;
+ virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override;
// XMouseMotionListener
- virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) override;
+ virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) override;
// XFocusListener
- virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+ virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
private:
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index a21af8e47d9b..8642f08a63a1 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -67,7 +67,6 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
}
::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime )
- throw ( css::uno::RuntimeException, std::exception )
{
osl::Condition condition;
@@ -112,19 +111,17 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
return Graphic( bitmap ).GetXGraphic();
}
-::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( css::uno::RuntimeException, std::exception )
+::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName()
{
return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME;
}
sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName )
- throw ( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, serviceName);
}
::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception )
{
return { AVMEDIA_VLC_GRABBER_SERVICENAME };
}
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 2f5419dabc67..b78815006546 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -40,15 +40,11 @@ class VLCFrameGrabber : public FrameGrabber_BASE
public:
VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url );
- css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime )
- throw ( css::uno::RuntimeException, std::exception ) override;
-
- ::rtl::OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception ) override;
- sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
- throw ( css::uno::RuntimeException, std::exception ) override;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
+
+ ::rtl::OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
+ css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
};
}
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index b5819ee40004..2b1c73fa70bf 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -83,7 +83,6 @@ Manager::~Manager()
}
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUString& rURL )
- throw (uno::RuntimeException, std::exception)
{
if ( !m_is_vlc_found )
throw uno::RuntimeException("VLC not found", nullptr);
@@ -107,19 +106,16 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt
}
rtl::OUString SAL_CALL Manager::getImplementationName()
- throw (uno::RuntimeException, std::exception)
{
return VLC_IMPLEMENTATION_NAME;
}
sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName )
- throw (uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, serviceName);
}
uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames()
- throw (uno::RuntimeException, std::exception)
{
return { VLC_SERVICENAME };
}
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index cbc6f5ed1cac..f820fc1f72ee 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -37,11 +37,11 @@ public:
explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
virtual ~Manager() override;
- css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) override;
- rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) override;
- css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ rtl::OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) override;
+ css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override;
private:
css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 5a9e94dedcd2..b93157d90da3 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -65,7 +65,7 @@ unsigned VLCPlayer::getHeight() const
return mPlayer.getHeight();
}
-void SAL_CALL VLCPlayer::start() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::start()
{
::osl::MutexGuard aGuard(m_aMutex);
if (!mPlayer.play())
@@ -74,19 +74,19 @@ void SAL_CALL VLCPlayer::start() throw ( css::uno::RuntimeException, std::except
}
}
-void SAL_CALL VLCPlayer::stop() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::stop()
{
::osl::MutexGuard aGuard(m_aMutex);
mPlayer.pause();
}
-sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isPlaying()
{
::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.isPlaying();
}
-double SAL_CALL VLCPlayer::getDuration() throw ( css::uno::RuntimeException, std::exception )
+double SAL_CALL VLCPlayer::getDuration()
{
::osl::MutexGuard aGuard(m_aMutex);
return static_cast<double>( mMedia.getDuration() ) / MS_IN_SEC;
@@ -98,7 +98,7 @@ void SAL_CALL VLCPlayer::setScale( float factor )
mPlayer.setScale( factor );
}
-void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setMediaTime( double fTime )
{
::osl::MutexGuard aGuard(m_aMutex);
if ( fTime < 0.00000001 && !mPlayer.isPlaying() )
@@ -109,7 +109,7 @@ void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( css::uno::RuntimeE
mPlayer.setTime( fTime * MS_IN_SEC );
}
-double SAL_CALL VLCPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception )
+double SAL_CALL VLCPlayer::getMediaTime()
{
::osl::MutexGuard aGuard(m_aMutex);
return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC;
@@ -123,7 +123,7 @@ void VLCPlayer::replay()
start();
}
-void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet )
{
::osl::MutexGuard aGuard(m_aMutex);
mPlaybackLoop = bSet;
@@ -134,37 +134,37 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::Runt
mEventManager.onEndReached();
}
-sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop()
{
::osl::MutexGuard aGuard(m_aMutex);
return mPlaybackLoop;
}
-void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB )
{
::osl::MutexGuard aGuard(m_aMutex);
mPlayer.setVolume( static_cast<sal_Int16>( ( nDB + 40 ) * 10.0 / 4 ) );
}
-::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( css::uno::RuntimeException, std::exception )
+::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB()
{
::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 ( css::uno::RuntimeException, std::exception )
+void SAL_CALL VLCPlayer::setMute( sal_Bool bSet )
{
::osl::MutexGuard aGuard(m_aMutex);
mPlayer.setMute( bSet );
}
-sal_Bool SAL_CALL VLCPlayer::isMute() throw ( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL VLCPlayer::isMute()
{
::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.getMute();
}
-css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception )
+css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize()
{
return css::awt::Size( 480, 360 );
}
@@ -215,7 +215,6 @@ void VLCPlayer::setVideoSize( unsigned width, unsigned height )
}
uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
- throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -238,7 +237,6 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind
}
uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber()
- throw ( css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -252,19 +250,16 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb
}
::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
- throw ( css::uno::RuntimeException, std::exception )
{
return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME;
}
sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName )
- throw ( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, serviceName);
}
::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception )
{
return { AVMEDIA_VLC_PLAYER_SERVICENAME };
}
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 3cbecdd19fd5..e2c7f0c32b2f 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -61,30 +61,25 @@ public:
void SAL_CALL setScale( float factor );
void SAL_CALL setWindowID( const intptr_t windowID );
- void SAL_CALL start() throw ( css::uno::RuntimeException, std::exception ) override;
- void SAL_CALL stop() throw ( css::uno::RuntimeException, std::exception ) override;
- sal_Bool SAL_CALL isPlaying() throw ( css::uno::RuntimeException, std::exception ) override;
- double SAL_CALL getDuration() throw ( css::uno::RuntimeException, std::exception ) override;
- void SAL_CALL setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception ) override;
- double SAL_CALL getMediaTime() throw ( css::uno::RuntimeException, std::exception ) override;
- void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) override;
- sal_Bool SAL_CALL isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception ) override;
- void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception ) override;
- ::sal_Int16 SAL_CALL getVolumeDB() throw ( css::uno::RuntimeException, std::exception ) override;
- void SAL_CALL setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) override;
- sal_Bool SAL_CALL isMute() throw ( css::uno::RuntimeException, std::exception ) override;
- css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception ) override;
- css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw ( css::uno::RuntimeException, std::exception ) override;
- css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ void SAL_CALL start() override;
+ void SAL_CALL stop() override;
+ sal_Bool SAL_CALL isPlaying() override;
+ double SAL_CALL getDuration() override;
+ void SAL_CALL setMediaTime( double fTime ) override;
+ double SAL_CALL getMediaTime() override;
+ void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+ sal_Bool SAL_CALL isPlaybackLoop() override;
+ void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) override;
+ ::sal_Int16 SAL_CALL getVolumeDB() override;
+ void SAL_CALL setMute( sal_Bool bSet ) override;
+ sal_Bool SAL_CALL isMute() override;
+ css::awt::Size SAL_CALL getPreferredPlayerWindowSize() override;
+ css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+ css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override;
- ::rtl::OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception ) override;
- sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName )
- throw ( css::uno::RuntimeException, std::exception ) override;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ ::rtl::OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
+ css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
private:
void replay();
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 2a4ad61bb27a..e3c0ab26147c 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -46,11 +46,11 @@ VLCWindow::~VLCWindow()
mPlayer.setWindowID( mPrevWinID );
}
-void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VLCWindow::update()
{
}
-sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel )
{
bool bRet = false;
@@ -82,46 +82,43 @@ sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) th
return bRet;
}
-css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception)
+css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel()
{
return meZoomLevel;
}
-void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 )
{
}
-::rtl::OUString SAL_CALL VLCWindow::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+::rtl::OUString SAL_CALL VLCWindow::getImplementationName()
{
return AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME;
}
-sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName )
{
return cppu::supportsService(this, serviceName);
}
-uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames()
{
return { AVMEDIA_VLC_WINDOW_SERVICENAME };
}
-void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException, std::exception)
+void SAL_CALL VLCWindow::dispose()
{
}
void SAL_CALL VLCWindow::addEventListener( const uno::Reference< lang::XEventListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEventListener >& )
- 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, std::exception)
{
mSize.X = X;
mSize.Y = Y;
@@ -130,83 +127,67 @@ void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width,
}
awt::Rectangle SAL_CALL VLCWindow::getPosSize()
- throw (uno::RuntimeException, std::exception)
{
return mSize;
}
void SAL_CALL VLCWindow::setVisible( sal_Bool )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::setEnable( sal_Bool )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::setFocus()
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL VLCWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& )
- throw (uno::RuntimeException, std::exception)
{
}
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index 2fc3991874e9..eaab56d718d2 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -37,36 +37,36 @@ public:
VLCWindow( VLCPlayer& player, const intptr_t prevWinID );
virtual ~VLCWindow() override;
- void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override;
- css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL update() override;
+ sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+ css::media::ZoomLevel SAL_CALL getZoomLevel() override;
+ void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) override;
- ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) override;
- css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ ::rtl::OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
+ css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
- void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL dispose() override;
+ void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
- void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override;
- css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+ css::awt::Rectangle SAL_CALL getPosSize() override;
+ void SAL_CALL setVisible( sal_Bool Visible ) override;
+ void SAL_CALL setEnable( sal_Bool Enable ) override;
+ void SAL_CALL setFocus() override;
+ void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+ void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
};
}
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 88408caa8a13..3d1f5906e2fc 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -106,7 +106,6 @@ bool FrameGrabber::create( const OUString& rURL )
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
- throw (uno::RuntimeException)
{
uno::Reference< graphic::XGraphic > xRet;
IMediaDet* pDet = implCreateMediaDet( maURL );
@@ -203,21 +202,18 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
OUString SAL_CALL FrameGrabber::getImplementationName( )
- throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
- throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME };
}
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 8b3fd49f03b0..88ac4fc04674 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -39,12 +39,12 @@ public:
bool create( const OUString& rURL );
// XFrameGrabber
- virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index c024f7ff19a7..4282b2599ff8 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -42,7 +42,6 @@ Manager::~Manager()
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
- throw (uno::RuntimeException)
{
Player* pPlayer( new Player( mxMgr ) );
uno::Reference< media::XPlayer > xRet( pPlayer );
@@ -56,21 +55,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
OUString SAL_CALL Manager::getImplementationName( )
- throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
- throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_WIN_MANAGER_SERVICENAME };
}
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index fcd0c69a2c23..80454708319c 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -36,12 +36,12 @@ public:
~Manager() override;
// XManager
- virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
private:
css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index a5f9f4e62888..a7c3e6bd766d 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -246,7 +246,6 @@ long Player::processEvent()
void SAL_CALL Player::start( )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
if( mpMC )
@@ -290,7 +289,6 @@ void SAL_CALL Player::start( )
void SAL_CALL Player::stop( )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
if( mpMC )
@@ -299,7 +297,6 @@ void SAL_CALL Player::stop( )
sal_Bool SAL_CALL Player::isPlaying()
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -314,7 +311,6 @@ sal_Bool SAL_CALL Player::isPlaying()
double SAL_CALL Player::getDuration( )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -328,7 +324,6 @@ double SAL_CALL Player::getDuration( )
void SAL_CALL Player::setMediaTime( double fTime )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -345,7 +340,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
double SAL_CALL Player::getMediaTime( )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -359,7 +353,6 @@ double SAL_CALL Player::getMediaTime( )
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -368,7 +361,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
sal_Bool SAL_CALL Player::isPlaybackLoop( )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -377,7 +369,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( )
void SAL_CALL Player::setMute( sal_Bool bSet )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -390,7 +381,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
sal_Bool SAL_CALL Player::isMute( )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -399,7 +389,6 @@ sal_Bool SAL_CALL Player::isMute( )
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -411,7 +400,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
sal_Int16 SAL_CALL Player::getVolumeDB( )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -420,7 +408,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -440,7 +427,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
- throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -462,7 +448,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
- throw (uno::RuntimeException)
{
uno::Reference< media::XFrameGrabber > xRet;
@@ -481,21 +466,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
OUString SAL_CALL Player::getImplementationName( )
- throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
- throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_WIN_PLAYER_SERVICENAME };
}
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 425ae00dada3..02fb5ec8e9c8 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -66,26 +66,26 @@ public:
const IVideoWindow* getVideoWindow() const;
// XPlayer
- virtual void SAL_CALL start( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException) override;
- virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override;
- virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override;
- virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException) override;
- virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL start( ) override;
+ virtual void SAL_CALL stop( ) override;
+ virtual sal_Bool SAL_CALL isPlaying( ) override;
+ virtual double SAL_CALL getDuration( ) override;
+ virtual void SAL_CALL setMediaTime( double fTime ) override;
+ virtual double SAL_CALL getMediaTime( ) override;
+ virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isPlaybackLoop( ) override;
+ virtual void SAL_CALL setMute( sal_Bool bSet ) override;
+ virtual sal_Bool SAL_CALL isMute( ) override;
+ virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override;
+ virtual sal_Int16 SAL_CALL getVolumeDB( ) override;
+ virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) override;
+ virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
+ virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// ::cppu::OComponentHelper
virtual void SAL_CALL disposing() override;
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index ba30b07403c5..9886ada2b5a1 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -344,13 +344,11 @@ void Window::updatePointer()
}
void SAL_CALL Window::update( )
- throw (uno::RuntimeException)
{
::RedrawWindow( mnFrameWnd, nullptr, nullptr, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE );
}
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
- throw (uno::RuntimeException)
{
boolean bRet = false;
@@ -370,19 +368,16 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
}
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
- throw (uno::RuntimeException)
{
return meZoomLevel;
}
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
- throw (uno::RuntimeException)
{
mnPointerType = nPointerType;
}
void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 )
- throw (uno::RuntimeException)
{
if( mnFrameWnd )
{
@@ -392,7 +387,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal
}
awt::Rectangle SAL_CALL Window::getPosSize()
- throw (uno::RuntimeException)
{
awt::Rectangle aRet;
@@ -413,7 +407,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
}
void SAL_CALL Window::setVisible( sal_Bool bVisible )
- throw (uno::RuntimeException)
{
if( mnFrameWnd )
{
@@ -427,104 +420,87 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
}
void SAL_CALL Window::setEnable( sal_Bool bEnable )
- throw (uno::RuntimeException)
{
if( mnFrameWnd )
::EnableWindow( mnFrameWnd, bEnable );
}
void SAL_CALL Window::setFocus( )
- throw (uno::RuntimeException)
{
if( mnFrameWnd )
::SetFocus( mnFrameWnd );
}
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::dispose( )
- throw (uno::RuntimeException)
{
}
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.addInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException)
{
maListeners.removeInterface( cppu::UnoType<decltype(xListener)>::get(), xListener );
}
@@ -582,19 +558,16 @@ void Window::fireSetFocusEvent( const css::awt::FocusEvent& rEvt )
}
OUString SAL_CALL Window::getImplementationName( )
- throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME );
}
sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
- throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( )
- throw (uno::RuntimeException)
{
return { AVMEDIA_WIN_WINDOW_SERVICENAME };
}
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index c034bd0c9f17..141c7abd6b6a 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -51,39 +51,39 @@ public:
void updatePointer();
// XPlayerWindow
- virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException) override;
- virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL update( ) override;
+ virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override;
+ virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) override;
+ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override;
// XWindow
- virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override;
- virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+ virtual css::awt::Rectangle SAL_CALL getPosSize( ) override;
+ virtual void SAL_CALL setVisible( sal_Bool Visible ) override;
+ virtual void SAL_CALL setEnable( sal_Bool Enable ) override;
+ virtual void SAL_CALL setFocus( ) override;
+ virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
+ virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
+ virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
+ virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
+ virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
+ virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
+ virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL dispose( ) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
public: