summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
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 /sd/source/ui/slideshow
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 'sd/source/ui/slideshow')
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx32
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx117
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx118
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.cxx62
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.hxx62
5 files changed, 194 insertions, 197 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 2cbdf1e6dd52..23bea3a068ee 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -135,7 +135,7 @@ SlideShow::SlideShow( SdDrawDocument* pDoc )
{
}
-void SlideShow::ThrowIfDisposed() const throw (RuntimeException)
+void SlideShow::ThrowIfDisposed() const
{
if( mpDoc == nullptr )
throw DisposedException();
@@ -226,17 +226,17 @@ void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::W
}
// XServiceInfo
-OUString SAL_CALL SlideShow::getImplementationName( ) throw(RuntimeException, std::exception)
+OUString SAL_CALL SlideShow::getImplementationName( )
{
return OUString( "com.sun.star.comp.sd.SlideShow" );
}
-sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName )
{
return cppu::supportsService( this, ServiceName );
}
-Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( )
{
OUString aService( "com.sun.star.presentation.Presentation" );
Sequence< OUString > aSeq( &aService, 1 );
@@ -244,14 +244,14 @@ Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(Runt
}
// XPropertySet
-Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(RuntimeException, std::exception)
+Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo()
{
SolarMutexGuard aGuard;
static Reference< XPropertySetInfo > xInfo = maPropSet.getPropertySetInfo();
return xInfo;
}
-void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue )
{
SolarMutexGuard aGuard;
ThrowIfDisposed();
@@ -513,7 +513,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const
mpDoc->SetChanged();
}
-Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName )
{
SolarMutexGuard aGuard;
ThrowIfDisposed();
@@ -579,25 +579,25 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U
}
}
-void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& )
{
}
-void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& )
{
}
-void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& )
{
}
-void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
+void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& )
{
}
// XPresentation
-void SAL_CALL SlideShow::start() throw(RuntimeException, std::exception)
+void SAL_CALL SlideShow::start()
{
const Sequence< PropertyValue > aArguments;
startWithArguments( aArguments );
@@ -631,7 +631,6 @@ void SlideShow::SetExitAfterPresenting(bool bExit)
}
void SAL_CALL SlideShow::end()
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -774,7 +773,7 @@ void SAL_CALL SlideShow::end()
}
}
-void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exception)
+void SAL_CALL SlideShow::rehearseTimings()
{
Sequence< PropertyValue > aArguments(1);
aArguments[0].Name = "RehearseTimings";
@@ -785,7 +784,6 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exceptio
// XPresentation2
void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rArguments)
- throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
ThrowIfDisposed();
@@ -846,13 +844,13 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr
}
-sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideShow::isRunning( )
{
SolarMutexGuard aGuard;
return mxController.is() && mxController->isRunning();
}
-Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (RuntimeException, std::exception)
+Reference< XSlideShowController > SAL_CALL SlideShow::getController( )
{
ThrowIfDisposed();
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index f34d6972e312..2da56df510a4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1163,13 +1163,13 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ )
}
}
-void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener )
{
if( mxListenerProxy.is() )
mxListenerProxy->addSlideShowListener( xListener );
}
-void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener )
{
if( mxListenerProxy.is() )
mxListenerProxy->removeSlideShowListener( xListener );
@@ -1273,7 +1273,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
}
}
-void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Exception, std::exception )
+void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes )
{
try
{
@@ -1393,7 +1393,7 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl, void*, void)
mxPresentation->end();
}
-void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::pause()
{
SolarMutexGuard aSolarGuard;
@@ -1419,7 +1419,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception)
}
}
-void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::resume()
{
SolarMutexGuard aSolarGuard;
@@ -1456,13 +1456,13 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception)
#endif
}
-sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::isPaused()
{
SolarMutexGuard aSolarGuard;
return mbIsPaused;
}
-void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor )
{
SolarMutexGuard aSolarGuard;
@@ -1619,7 +1619,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark
return ( nPgNum - 1) >> 1;
}
-void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception)
+void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink )
{
OUString aBookmark( aHyperLink );
@@ -1670,7 +1670,7 @@ sal_Int32 SlideshowImpl::getCurrentSlideNumber()
return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1;
}
-sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL SlideshowImpl::isEndless()
{
SolarMutexGuard aSolarGuard;
return maPresSettings.mbEndless;
@@ -2500,7 +2500,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible )
}
}
-void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::activate()
{
SolarMutexGuard aSolarGuard;
@@ -2539,7 +2539,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception)
}
}
-void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::deactivate()
{
SolarMutexGuard aSolarGuard;
@@ -2570,7 +2570,7 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl, Timer *, void)
}
}
-sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::isActive()
{
SolarMutexGuard aSolarGuard;
return mbActive;
@@ -2600,7 +2600,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
}
}
-Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException, std::exception)
+Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide()
{
SolarMutexGuard aSolarGuard;
@@ -2615,7 +2615,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE
return xSlide;
}
-sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex()
{
SolarMutexGuard aSolarGuard;
@@ -2629,19 +2629,19 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, s
}
}
-sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex()
{
return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1;
}
// css::presentation::XSlideShowController:
-::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount()
{
return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0;
}
-Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception)
+Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index)
{
if( (mpSlideController.get() == nullptr ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) )
throw IndexOutOfBoundsException();
@@ -2649,13 +2649,13 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index
return mpSlideController->getSlideByNumber( mpSlideController->getSlideNumber( Index ) );
}
-sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop()
{
SolarMutexGuard aSolarGuard;
return maPresSettings.mbAlwaysOnTop;
}
-void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways )
{
SolarMutexGuard aSolarGuard;
if( maPresSettings.mbAlwaysOnTop != bool(bAlways) )
@@ -2665,19 +2665,19 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx
}
}
-sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::isFullScreen()
{
SolarMutexGuard aSolarGuard;
return maPresSettings.mbFullScreen;
}
-sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::getMouseVisible()
{
SolarMutexGuard aSolarGuard;
return maPresSettings.mbMouseVisible;
}
-void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible )
{
SolarMutexGuard aSolarGuard;
if( maPresSettings.mbMouseVisible != bool(bVisible) )
@@ -2688,13 +2688,13 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime
}
}
-sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::getUsePen()
{
SolarMutexGuard aSolarGuard;
return mbUsePen;
}
-void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen )
{
SolarMutexGuard aSolarGuard;
mbUsePen = bMouseAsPen;
@@ -2735,33 +2735,33 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
}
}
-double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException, std::exception)
+double SAL_CALL SlideshowImpl::getPenWidth()
{
SolarMutexGuard aSolarGuard;
return mdUserPaintStrokeWidth;
}
-void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth )
{
SolarMutexGuard aSolarGuard;
mdUserPaintStrokeWidth = dStrokeWidth;
setUsePen( true ); // enable pen mode, update color and width
}
-sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SlideshowImpl::getPenColor()
{
SolarMutexGuard aSolarGuard;
return mnUserPaintColor;
}
-void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor )
{
SolarMutexGuard aSolarGuard;
mnUserPaintColor = nColor;
setUsePen( true ); // enable pen mode, update color
}
-void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException)
+void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk)
{
if( bEraseAllInk )
{
@@ -2782,13 +2782,13 @@ void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeExc
}
// XSlideShowController Methods
-sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::isRunning( )
{
SolarMutexGuard aSolarGuard;
return mxShow.is();
}
-void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoNextEffect( )
{
SolarMutexGuard aSolarGuard;
@@ -2814,7 +2814,7 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::ex
}
}
-void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoPreviousEffect( )
{
SolarMutexGuard aSolarGuard;
@@ -2836,7 +2836,7 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std
}
}
-void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoFirstSlide( )
{
SolarMutexGuard aSolarGuard;
@@ -2857,7 +2857,7 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::ex
}
}
-void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoNextSlide( )
{
SolarMutexGuard aSolarGuard;
@@ -2928,7 +2928,7 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exc
}
}
-void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoPreviousSlide( )
{
gotoPreviousSlide(false);
}
@@ -2982,7 +2982,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
}
}
-void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoLastSlide()
{
SolarMutexGuard aSolarGuard;
@@ -3006,7 +3006,7 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::excep
}
}
-void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark )
{
SolarMutexGuard aSolarGuard;
@@ -3019,7 +3019,6 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru
}
void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide )
- throw(IllegalArgumentException, RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
@@ -3039,7 +3038,7 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide )
}
}
-void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex )
{
SolarMutexGuard aSolarGuard;
@@ -3049,7 +3048,7 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx
displaySlideIndex( nIndex );
}
-void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideshowImpl::stopSound( )
{
SolarMutexGuard aSolarGuard;
@@ -3074,27 +3073,27 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::excepti
// XIndexAccess
-::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int32 SAL_CALL SlideshowImpl::getCount( )
{
return getSlideCount();
}
-css::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index )
{
return Any( getSlideByIndex( Index ) );
}
-css::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (css::uno::RuntimeException, std::exception)
+css::uno::Type SAL_CALL SlideshowImpl::getElementType( )
{
return cppu::UnoType<XDrawPage>::get();
}
-sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SlideshowImpl::hasElements( )
{
return getSlideCount() != 0;
}
-Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException, std::exception)
+Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow()
{
return mxShow;
}
@@ -3115,7 +3114,7 @@ PresentationSettingsEx::PresentationSettingsEx( PresentationSettings& r )
{
}
-void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArguments ) throw (IllegalArgumentException, std::exception)
+void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArguments )
{
sal_Int32 nArguments = rArguments.getLength();
const PropertyValue* pValue = rArguments.getConstArray();
@@ -3127,7 +3126,7 @@ void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArg
}
}
-void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue ) throw (IllegalArgumentException, std::exception)
+void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue )
{
if ( rProperty == "RehearseTimings" )
{
@@ -3276,7 +3275,7 @@ void SlideShowListenerProxy::removeSlideShowListener( const css::uno::Reference<
maListeners.removeInterface(xListener);
}
-void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3289,7 +3288,7 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNod
}
}
-void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3302,7 +3301,7 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode
}
}
-void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3317,7 +3316,7 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >&
// css::presentation::XSlideShowListener:
-void SAL_CALL SlideShowListenerProxy::paused( ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::paused( )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3328,7 +3327,7 @@ void SAL_CALL SlideShowListenerProxy::paused( ) throw (css::uno::RuntimeExcepti
});
}
-void SAL_CALL SlideShowListenerProxy::resumed( ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::resumed( )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3339,7 +3338,7 @@ void SAL_CALL SlideShowListenerProxy::resumed( ) throw (css::uno::RuntimeExcept
});
}
-void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3350,7 +3349,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx
});
}
-void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3361,7 +3360,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (css::uno::R
});
}
-void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3372,7 +3371,7 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (css::uno::
});
}
-void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException, std::exception)
+void SlideShowListenerProxy::slideEnded(sal_Bool bReverse)
{
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3393,7 +3392,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti
}
}
-void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception)
+void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink )
{
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -3416,7 +3415,7 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro
// XEventListener
-void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& aDisposeEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& aDisposeEvent )
{
maListeners.disposeAndClear( aDisposeEvent );
mxController.clear();
@@ -3425,7 +3424,7 @@ void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& a
// XShapeEventListener
-void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& aOriginalEvent )
{
SolarMutexGuard aSolarGuard;
if( mxController.is() )
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index eebe4c0a0a40..810e0709b288 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -101,10 +101,10 @@ struct PresentationSettingsEx : public PresentationSettings
explicit PresentationSettingsEx( PresentationSettings& );
/// @throws css::lang::IllegalArgumentException
- void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException, std::exception);
+ void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments );
/// @throws css::lang::IllegalArgumentException
- void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, std::exception);
+ void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue );
};
struct WrappedShapeEventImpl
@@ -135,24 +135,24 @@ public:
void removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape );
// css::animations::XAnimationListener
- virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override;
+ virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override;
+ virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) override;
// css::presentation::XSlideShowListener:
- virtual void SAL_CALL paused() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL resumed() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL paused() override;
+ virtual void SAL_CALL resumed() override;
+ virtual void SAL_CALL slideTransitionStarted() override;
+ virtual void SAL_CALL slideTransitionEnded() override;
+ virtual void SAL_CALL slideAnimationsEnded() override;
+ virtual void SAL_CALL slideEnded(sal_Bool bReverse) override;
+ virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) override;
// css::lang::XEventListener:
- virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject & Source) override;
// css::presentation::XShapeEventListener:
- virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) override;
::comphelper::OInterfaceContainerHelper2 maListeners;
@@ -171,57 +171,57 @@ public:
explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow);
// css::presentation::XSlideShowController:
- virtual sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setAlwaysOnTop( sal_Bool _alwaysontop ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL getMouseVisible() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMouseVisible( sal_Bool _mousevisible ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setUsePen( sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL getAlwaysOnTop() override;
+ virtual void SAL_CALL setAlwaysOnTop( sal_Bool _alwaysontop ) override;
+ virtual sal_Bool SAL_CALL getMouseVisible() override;
+ virtual void SAL_CALL setMouseVisible( sal_Bool _mousevisible ) override;
+ virtual sal_Bool SAL_CALL getUsePen() override;
+ virtual void SAL_CALL setUsePen( sal_Bool _usepen ) override;
+ virtual ::sal_Int32 SAL_CALL getPenColor() override;
+ virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) override;
+ virtual double SAL_CALL getPenWidth() override;
+ virtual void SAL_CALL setPenWidth( double dStrokeWidth ) override;
/// @throws css::uno::RuntimeException
- void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoNextEffect( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoPreviousEffect( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoFirstSlide( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoLastSlide( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL stopSound( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL pause( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL resume( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isPaused( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL activate( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deactivate( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getNextSlideIndex( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isEndless( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isFullScreen( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL setEraseAllInk( bool bEraseAllInk );
+ virtual sal_Bool SAL_CALL isRunning( ) override;
+ virtual ::sal_Int32 SAL_CALL getSlideCount( ) override;
+ virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) override;
+ virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) override;
+ virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) override;
+ virtual void SAL_CALL gotoNextEffect( ) override;
+ virtual void SAL_CALL gotoPreviousEffect( ) override;
+ virtual void SAL_CALL gotoFirstSlide( ) override;
+ virtual void SAL_CALL gotoNextSlide( ) override;
+ virtual void SAL_CALL gotoPreviousSlide( ) override;
+ virtual void SAL_CALL gotoLastSlide( ) override;
+ virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) override;
+ virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) override;
+ virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) override;
+ virtual void SAL_CALL stopSound( ) override;
+ virtual void SAL_CALL pause( ) override;
+ virtual void SAL_CALL resume( ) override;
+ virtual sal_Bool SAL_CALL isPaused( ) override;
+ virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) override;
+ virtual void SAL_CALL activate( ) override;
+ virtual void SAL_CALL deactivate( ) override;
+ virtual sal_Bool SAL_CALL isActive( ) override;
+ virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide( ) override;
+ virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex( ) override;
+ virtual ::sal_Int32 SAL_CALL getNextSlideIndex( ) override;
+ virtual sal_Bool SAL_CALL isEndless( ) override;
+ virtual sal_Bool SAL_CALL isFullScreen( ) override;
+ virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) override;
// XIndexAccess
- virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getCount( ) override;
+ virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) override;
+ virtual sal_Bool SAL_CALL hasElements( ) override;
// will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow
void slideEnded(const bool bReverse);
/// @throws css::uno::RuntimeException
- void hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception);
+ void hyperLinkClicked(const OUString & hyperLink);
void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent);
bool swipe(const CommandSwipeData &rSwipeData);
bool longpress(const CommandLongPressData& rLongPressData);
@@ -304,7 +304,7 @@ private:
void removeShapeEvents();
void registerShapeEvents( sal_Int32 nSlideNumber );
/// @throws css::uno::Exception
- void registerShapeEvents( css::uno::Reference< css::drawing::XShapes >& xShapes ) throw (css::uno::Exception, std::exception);
+ void registerShapeEvents( css::uno::Reference< css::drawing::XShapes >& xShapes );
static css::uno::Reference< css::presentation::XSlideShow > createSlideShow();
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 7437810555bd..a22e15baa598 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -67,7 +67,7 @@ void SlideShowViewListeners::removeListener( const Reference< util::XModifyListe
maListeners.erase( aIter );
}
-void SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( css::uno::Exception )
+void SlideShowViewListeners::notify( const lang::EventObject& _rEvent )
{
::osl::MutexGuard aGuard( mrMutex );
@@ -109,7 +109,7 @@ SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex )
}
bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintListener >& rListener,
- const awt::PaintEvent& rEvent ) throw( uno::Exception )
+ const awt::PaintEvent& rEvent )
{
rListener->windowPaint( rEvent );
return true; // continue calling listeners
@@ -122,7 +122,7 @@ SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex )
}
bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseListener >& rListener,
- const WrappedMouseEvent& rEvent ) throw( uno::Exception )
+ const WrappedMouseEvent& rEvent )
{
switch( rEvent.meType )
{
@@ -153,7 +153,7 @@ SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mut
}
bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::XMouseMotionListener >& rListener,
- const WrappedMouseMotionEvent& rEvent ) throw( uno::Exception )
+ const WrappedMouseMotionEvent& rEvent )
{
switch( rEvent.meType )
{
@@ -200,7 +200,7 @@ SlideShowView::SlideShowView( ShowWindow& rOutputWindow,
}
// Dispose all internal references
-void SAL_CALL SlideShowView::dispose() throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::dispose()
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -227,7 +227,7 @@ void SAL_CALL SlideShowView::dispose() throw (RuntimeException, std::exception)
}
// Disposing our broadcaster
-void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(RuntimeException, std::exception)
+void SAL_CALL SlideShowView::disposing( const lang::EventObject& )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -252,7 +252,7 @@ void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(Runtime
}
}
-void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeException)
+void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e )
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -276,14 +276,14 @@ void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeExc
}
// XSlideShowView methods
-Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas( ) throw (RuntimeException, std::exception)
+Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas( )
{
::osl::MutexGuard aGuard( m_aMutex );
return mpCanvas.get() ? mpCanvas->getUNOSpriteCanvas() : Reference< rendering::XSpriteCanvas >();
}
-void SAL_CALL SlideShowView::clear() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::clear()
{
// paint background in black
::osl::MutexGuard aGuard( m_aMutex );
@@ -307,12 +307,12 @@ void SAL_CALL SlideShowView::clear() throw (css::uno::RuntimeException, std::exc
}
}
-geometry::IntegerSize2D SAL_CALL SlideShowView::getTranslationOffset( ) throw (RuntimeException, std::exception)
+geometry::IntegerSize2D SAL_CALL SlideShowView::getTranslationOffset( )
{
return mTranslationOffset;
}
-geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (RuntimeException, std::exception)
+geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( )
{
::osl::MutexGuard aGuard( m_aMutex );
SolarMutexGuard aSolarGuard;
@@ -373,7 +373,7 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (Ru
return ::basegfx::unotools::affineMatrixFromHomMatrix( aRes, aMatrix );
}
-void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< util::XModifyListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -381,7 +381,7 @@ void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference<
mpViewListeners->addListener( xListener );
}
-void SAL_CALL SlideShowView::removeTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::removeTransformationChangedListener( const Reference< util::XModifyListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -389,7 +389,7 @@ void SAL_CALL SlideShowView::removeTransformationChangedListener( const Referenc
mpViewListeners->removeListener( xListener );
}
-void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -397,7 +397,7 @@ void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListe
mpPaintListeners->addTypedListener( xListener );
}
-void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -405,7 +405,7 @@ void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintLi
mpPaintListeners->removeTypedListener( xListener );
}
-void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -413,7 +413,7 @@ void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListe
mpMouseListeners->addTypedListener( xListener );
}
-void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -421,7 +421,7 @@ void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseLi
mpMouseListeners->removeTypedListener( xListener );
}
-void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -437,7 +437,7 @@ void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMous
mpMouseMotionListeners->addTypedListener( xListener );
}
-void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -448,7 +448,7 @@ void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XM
// events, when the last listener is gone.
}
-void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -460,7 +460,7 @@ void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (Ru
mxWindowPeer->setPointer( mxPointer );
}
-awt::Rectangle SAL_CALL SlideShowView::getCanvasArea( ) throw (RuntimeException, std::exception)
+awt::Rectangle SAL_CALL SlideShowView::getCanvasArea( )
{
awt::Rectangle aRectangle;
@@ -493,7 +493,7 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp
}
// XWindowListener methods
-void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e )
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -509,23 +509,23 @@ void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (R
}
}
-void SAL_CALL SlideShowView::windowMoved( const awt::WindowEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::windowMoved( const awt::WindowEvent& )
{
// ignored
}
-void SAL_CALL SlideShowView::windowShown( const lang::EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::windowShown( const lang::EventObject& )
{
// ignored
}
-void SAL_CALL SlideShowView::windowHidden( const lang::EventObject& ) throw (RuntimeException, std::exception)
+void SAL_CALL SlideShowView::windowHidden( const lang::EventObject& )
{
// ignored
}
// XMouseListener implementation
-void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e )
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
if( mpSlideShow && mpSlideShow->isInputFreezed() )
@@ -549,7 +549,7 @@ void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno
}
}
-void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e )
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
if( mbMousePressedEaten )
@@ -572,7 +572,7 @@ void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (un
}
}
-void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e )
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -588,7 +588,7 @@ void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) throw (uno
updateimpl( aGuard, mpSlideShow ); // warning: clears guard!
}
-void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e )
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -605,7 +605,7 @@ void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) throw (uno:
}
// XMouseMotionListener implementation
-void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e )
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -621,7 +621,7 @@ void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) throw (uno
updateimpl( aGuard, mpSlideShow ); // warning: clears guard!
}
-void SAL_CALL SlideShowView::mouseMoved( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL SlideShowView::mouseMoved( const awt::MouseEvent& e )
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 0d3eceba2abd..4f96a8772394 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -106,7 +106,7 @@ public:
void addListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener );
void removeListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener );
/// @throws css::uno::Exception
- void notify( const css::lang::EventObject& _rEvent ) throw( css::uno::Exception );
+ void notify( const css::lang::EventObject& _rEvent );
void disposing( const css::lang::EventObject& _rEventSource );
protected:
@@ -124,7 +124,7 @@ public:
SlideShowViewPaintListeners( ::osl::Mutex& rMutex );
protected:
- virtual bool implTypedNotify( const css::uno::Reference< css::awt::XPaintListener >& rListener, const css::awt::PaintEvent& rEvent ) throw( css::uno::Exception ) override;
+ virtual bool implTypedNotify( const css::uno::Reference< css::awt::XPaintListener >& rListener, const css::awt::PaintEvent& rEvent ) override;
};
// SlideShowViewMouseListeners
@@ -137,7 +137,7 @@ public:
protected:
virtual bool implTypedNotify( const css::uno::Reference< css::awt::XMouseListener >& rListener,
- const WrappedMouseEvent& rEvent ) throw( css::uno::Exception ) override;
+ const WrappedMouseEvent& rEvent ) override;
};
@@ -152,7 +152,7 @@ public:
protected:
virtual bool implTypedNotify( const css::uno::Reference< css::awt::XMouseMotionListener >& rListener,
- const WrappedMouseMotionEvent& rEvent ) throw( css::uno::Exception ) override;
+ const WrappedMouseMotionEvent& rEvent ) override;
};
// SlideShowView
@@ -177,45 +177,45 @@ public:
void ignoreNextMouseReleased() { mbMousePressedEaten = true; }
/// Dispose all internal references
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
/// Disposing our broadcaster
- virtual void SAL_CALL disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& ) override;
/// @throws css::uno::RuntimeException
- void SAL_CALL paint( const css::awt::PaintEvent& e ) throw (css::uno::RuntimeException);
+ void SAL_CALL paint( const css::awt::PaintEvent& e );
// XSlideShowView methods
- virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL clear( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& 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 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 setMouseCursor( sal_Int16 nPointerShape ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL getCanvasArea( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) override;
+ virtual void SAL_CALL clear( ) override;
+ virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation( ) override;
+ virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) override;
+ virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override;
+ virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& 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;
+ 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 setMouseCursor( sal_Int16 nPointerShape ) override;
+ virtual css::awt::Rectangle SAL_CALL getCanvasArea( ) override;
// XWindowListener methods
- virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override;
+ virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override;
+ virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override;
+ virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) override;
// XMouseListener implementation
- 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 implementation
- 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;
using cppu::WeakComponentImplHelperBase::disposing;