diff options
Diffstat (limited to 'sd/source/ui/unoidl')
23 files changed, 354 insertions, 642 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 446cad75ba2f..db1cd7d559b3 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -107,7 +107,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( // XTypeProvider Sequence<Type> SAL_CALL DrawController::getTypes() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // OPropertySetHelper does not provide getTypes, so we have to @@ -128,7 +127,6 @@ IMPLEMENT_GET_IMPLEMENTATION_ID(DrawController); // XComponent void SAL_CALL DrawController::dispose() - throw( RuntimeException, std::exception ) { if( !mbDisposing ) { @@ -170,7 +168,6 @@ void SAL_CALL DrawController::dispose() void SAL_CALL DrawController::addEventListener( const Reference<lang::XEventListener >& xListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); SfxBaseController::addEventListener( xListener ); @@ -178,14 +175,13 @@ void SAL_CALL DrawController::addEventListener( void SAL_CALL DrawController::removeEventListener ( const Reference<lang::XEventListener >& aListener) - throw (RuntimeException, std::exception) { if(!rBHelper.bDisposed && !rBHelper.bInDispose && !mbDisposing) SfxBaseController::removeEventListener( aListener ); } // XController -sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend ) { if( Suspend ) { @@ -203,7 +199,7 @@ sal_Bool SAL_CALL DrawController::suspend( sal_Bool Suspend ) throw (css::uno::R } // XServiceInfo -OUString SAL_CALL DrawController::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL DrawController::getImplementationName( ) { // Do not throw an exception at the moment. This leads to a crash // under Solaris on reload. See issue i70929 for details. @@ -214,13 +210,11 @@ OUString SAL_CALL DrawController::getImplementationName( ) throw(RuntimeExcepti static const char ssServiceName[] = "com.sun.star.drawing.DrawingDocumentDrawView"; sal_Bool SAL_CALL DrawController::supportsService (const OUString& rsServiceName) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, rsServiceName); } Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames() - throw(RuntimeException, std::exception) { ThrowIfDisposed(); Sequence<OUString> aSupportedServices { ssServiceName }; @@ -229,7 +223,6 @@ Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames() //------ XSelectionSupplier -------------------------------------------- sal_Bool SAL_CALL DrawController::select (const Any& aSelection) - throw(lang::IllegalArgumentException, RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -241,7 +234,6 @@ sal_Bool SAL_CALL DrawController::select (const Any& aSelection) } Any SAL_CALL DrawController::getSelection() - throw(RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -254,7 +246,6 @@ Any SAL_CALL DrawController::getSelection() void SAL_CALL DrawController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener) - throw(RuntimeException, std::exception) { if( mbDisposing ) throw lang::DisposedException(); @@ -264,7 +255,6 @@ void SAL_CALL DrawController::addSelectionChangeListener( void SAL_CALL DrawController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw(RuntimeException, std::exception) { if (rBHelper.bDisposed) throw lang::DisposedException(); @@ -276,7 +266,6 @@ void SAL_CALL DrawController::removeSelectionChangeListener( void SAL_CALL DrawController::disposing (const lang::EventObject& ) - throw (uno::RuntimeException, std::exception) { } @@ -284,7 +273,6 @@ void SAL_CALL void SAL_CALL DrawController::selectionChanged (const lang::EventObject& rEvent) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); // Have to forward the event to our selection change listeners. @@ -314,7 +302,6 @@ void SAL_CALL // XDrawView void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPage >& xPage ) - throw(RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -324,7 +311,6 @@ void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPag } Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage() - throw(RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -557,7 +543,6 @@ void DrawController::ReleaseViewShellBase() Reference<XConfigurationController> SAL_CALL DrawController::getConfigurationController() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -566,7 +551,6 @@ Reference<XConfigurationController> SAL_CALL Reference<XModuleController> SAL_CALL DrawController::getModuleController() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -586,7 +570,6 @@ const Sequence<sal_Int8>& DrawController::getUnoTunnelId() } sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId) - throw (RuntimeException, std::exception) { sal_Int64 nResult = 0; @@ -684,7 +667,6 @@ IPropertyArrayHelper & DrawController::getInfoHelper() } Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() - throw ( css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -692,7 +674,7 @@ Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() return xInfo; } -uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException, std::exception) +uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) { SolarMutexGuard aGuard; @@ -707,7 +689,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFor return xController; } -sal_Bool SAL_CALL DrawController::isFormDesignMode( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DrawController::isFormDesignMode( ) { SolarMutexGuard aGuard; @@ -720,7 +702,7 @@ sal_Bool SAL_CALL DrawController::isFormDesignMode( ) throw (uno::RuntimeExcept return bIsDesignMode; } -void SAL_CALL DrawController::setFormDesignMode( sal_Bool DesignMode ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DrawController::setFormDesignMode( sal_Bool DesignMode ) { SolarMutexGuard aGuard; @@ -729,7 +711,7 @@ void SAL_CALL DrawController::setFormDesignMode( sal_Bool DesignMode ) throw (un pFormShell->SetDesignMode( DesignMode ); } -uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::Reference< awt::XControlModel >& xModel ) throw (container::NoSuchElementException, uno::RuntimeException, std::exception) +uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::Reference< awt::XControlModel >& xModel ) { SolarMutexGuard aGuard; @@ -749,7 +731,6 @@ sal_Bool DrawController::convertFastPropertyValue ( Any & rOldValue, sal_Int32 nHandle, const Any& rValue) - throw ( css::lang::IllegalArgumentException) { bool bResult = false; @@ -780,7 +761,6 @@ sal_Bool DrawController::convertFastPropertyValue ( void DrawController::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue) - throw ( css::uno::Exception, std::exception) { SolarMutexGuard aGuard; if (nHandle == PROPERTY_SUB_CONTROLLER) @@ -850,7 +830,6 @@ void DrawController::DisposeFrameworkControllers() } void DrawController::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || mbDisposing) { diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 4fc83e1d00a5..9e831a2f51f4 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -126,7 +126,6 @@ Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() throw () } void SdUnoDrawView::setActiveLayer (const Reference<drawing::XLayer>& rxLayer) - throw (uno::RuntimeException, std::exception) { // Get the SdrLayer object corresponding to the given reference. if ( ! rxLayer.is()) @@ -148,9 +147,6 @@ void SdUnoDrawView::setActiveLayer (const Reference<drawing::XLayer>& rxLayer) // XSelectionSupplier sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) - throw (lang::IllegalArgumentException, - RuntimeException, - std::exception) { bool bOk = true; @@ -246,7 +242,6 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) } Any SAL_CALL SdUnoDrawView::getSelection() - throw (RuntimeException, std::exception) { Any aAny; @@ -295,14 +290,12 @@ Any SAL_CALL SdUnoDrawView::getSelection() void SAL_CALL SdUnoDrawView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } void SAL_CALL SdUnoDrawView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -310,11 +303,6 @@ void SAL_CALL SdUnoDrawView::removeSelectionChangeListener ( void SdUnoDrawView::setFastPropertyValue ( sal_Int32 nHandle, const Any& rValue) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { switch( nHandle ) { @@ -376,9 +364,6 @@ void SdUnoDrawView::setFastPropertyValue ( Any SAL_CALL SdUnoDrawView::getFastPropertyValue ( sal_Int32 nHandle) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { Any aValue; switch( nHandle ) @@ -424,7 +409,6 @@ Any SAL_CALL SdUnoDrawView::getFastPropertyValue ( void SAL_CALL SdUnoDrawView::setCurrentPage ( const Reference< drawing::XDrawPage >& xPage ) - throw (RuntimeException, std::exception) { SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xPage ); SdrPage *pSdrPage = pDrawPage ? pDrawPage->GetSdrPage() : nullptr; @@ -442,7 +426,6 @@ void SAL_CALL SdUnoDrawView::setCurrentPage ( } Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() - throw(RuntimeException, std::exception) { Reference< drawing::XDrawPage > xPage; @@ -558,17 +541,17 @@ Any SdUnoDrawView::getDrawViewMode() const } // XServiceInfo -OUString SAL_CALL SdUnoDrawView::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL SdUnoDrawView::getImplementationName( ) { return OUString( "com.sun.star.comp.sd.SdUnoDrawView") ; } -sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames( ) { OUString aSN("com.sun.star.drawing.DrawingDocumentDrawView"); uno::Sequence< OUString > aSeq( &aSN, 1 ); diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index 21e0353c8669..1449026e967c 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -53,14 +53,12 @@ void SAL_CALL SdUnoOutlineView::disposing() //----- XSelectionSupplier ---------------------------------------------------- sal_Bool SAL_CALL SdUnoOutlineView::select( const Any& ) - throw(lang::IllegalArgumentException, RuntimeException, std::exception) { // todo: add selections for text ranges return false; } Any SAL_CALL SdUnoOutlineView::getSelection() - throw(RuntimeException, std::exception) { Any aAny; return aAny; @@ -68,14 +66,12 @@ Any SAL_CALL SdUnoOutlineView::getSelection() void SAL_CALL SdUnoOutlineView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } void SAL_CALL SdUnoOutlineView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -83,7 +79,6 @@ void SAL_CALL SdUnoOutlineView::removeSelectionChangeListener ( //----- XDrawView ------------------------------------------------------------- void SAL_CALL SdUnoOutlineView::setCurrentPage ( const Reference< drawing::XDrawPage >& xPage) - throw(RuntimeException, std::exception) { SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xPage ); SdrPage *pSdrPage = pDrawPage ? pDrawPage->GetSdrPage() : nullptr; @@ -94,7 +89,6 @@ void SAL_CALL SdUnoOutlineView::setCurrentPage ( } Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage() - throw(RuntimeException, std::exception) { Reference<drawing::XDrawPage> xPage; @@ -108,11 +102,6 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage() void SdUnoOutlineView::setFastPropertyValue ( sal_Int32 nHandle, const Any& rValue) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { switch( nHandle ) { @@ -131,9 +120,6 @@ void SdUnoOutlineView::setFastPropertyValue ( Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( sal_Int32 nHandle) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { Any aValue; @@ -157,17 +143,17 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( } // XServiceInfo -OUString SAL_CALL SdUnoOutlineView::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL SdUnoOutlineView::getImplementationName( ) { return OUString("com.sun.star.comp.sd.SdUnoOutlineView"); } -sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames( ) { OUString aSN( "com.sun.star.presentation.OutlineView" ); uno::Sequence< OUString > aSeq( &aSN, 1 ); diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index 15a3cc7e6d20..e5b172752526 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -51,7 +51,6 @@ SdUnoSlideView::~SdUnoSlideView() throw() //----- XSelectionSupplier ---------------------------------------------------- sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) - throw(lang::IllegalArgumentException, RuntimeException, std::exception) { bool bOk = true; @@ -85,7 +84,6 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) } Any SAL_CALL SdUnoSlideView::getSelection() - throw(RuntimeException, std::exception) { Any aResult; @@ -109,14 +107,12 @@ Any SAL_CALL SdUnoSlideView::getSelection() void SAL_CALL SdUnoSlideView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } void SAL_CALL SdUnoSlideView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -125,7 +121,6 @@ void SAL_CALL SdUnoSlideView::removeSelectionChangeListener ( void SAL_CALL SdUnoSlideView::setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxDrawPage) - throw(css::uno::RuntimeException, std::exception) { Reference<beans::XPropertySet> xProperties (rxDrawPage, UNO_QUERY); if (xProperties.is()) @@ -141,7 +136,6 @@ void SAL_CALL SdUnoSlideView::setCurrentPage ( css::uno::Reference<css::drawing::XDrawPage > SAL_CALL SdUnoSlideView::getCurrentPage() - throw(css::uno::RuntimeException, std::exception) { return mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()->GetXDrawPage(); } @@ -151,11 +145,6 @@ css::uno::Reference<css::drawing::XDrawPage > SAL_CALL void SdUnoSlideView::setFastPropertyValue ( sal_Int32 nHandle, const Any& rValue) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { (void)rValue; @@ -164,9 +153,6 @@ void SdUnoSlideView::setFastPropertyValue ( Any SAL_CALL SdUnoSlideView::getFastPropertyValue ( sal_Int32 nHandle) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if( nHandle != DrawController::PROPERTY_VIEWOFFSET ) throw beans::UnknownPropertyException( OUString::number(nHandle), static_cast<cppu::OWeakObject*>(this)); @@ -175,17 +161,17 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue ( } // XServiceInfo -OUString SAL_CALL SdUnoSlideView::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL SdUnoSlideView::getImplementationName( ) { return OUString( "com.sun.star.comp.sd.SdUnoSlideView" ); } -sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames( ) { OUString aSN( "com.sun.star.presentation.SlidesView" ); uno::Sequence< OUString > aSeq( &aSN, 1 ); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 9b654caf04cb..8fea77d429f1 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -74,30 +74,30 @@ namespace sd explicit DocumentSettings( SdXImpressDocument* pModel ); // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL queryInterface( const Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // DocumentSettingsSerializer cf. xmloff virtual uno::Sequence<beans::PropertyValue> @@ -109,8 +109,8 @@ namespace sd const uno::Sequence<beans::PropertyValue>& aConfigProps ) override; protected: - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception ) override; - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, RuntimeException, std::exception ) override; + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override; private: bool LoadList( XPropertyListType t, const OUString &rPath, @@ -392,8 +392,6 @@ uno::Sequence<beans::PropertyValue> void DocumentSettings::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pValues) -throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -976,7 +974,6 @@ void DocumentSettings::ExtractURL( XPropertyListType t, Any* pValue ) void DocumentSettings::_getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue) -throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1191,7 +1188,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std:: } // XInterface -Any SAL_CALL DocumentSettings::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) +Any SAL_CALL DocumentSettings::queryInterface( const Type& aType ) { return WeakImplHelper< XPropertySet, XMultiPropertySet, XServiceInfo >::queryInterface( aType ); } @@ -1207,82 +1204,79 @@ void SAL_CALL DocumentSettings::release( ) throw () } // XPropertySet -Reference< XPropertySetInfo > SAL_CALL DocumentSettings::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL DocumentSettings::getPropertySetInfo( ) { return PropertySetHelper::getPropertySetInfo(); } -void SAL_CALL DocumentSettings::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL DocumentSettings::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) { PropertySetHelper::setPropertyValue( aPropertyName, aValue ); } -Any SAL_CALL DocumentSettings::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL DocumentSettings::getPropertyValue( const OUString& PropertyName ) { return PropertySetHelper::getPropertyValue( PropertyName ); } -void SAL_CALL DocumentSettings::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL DocumentSettings::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) { PropertySetHelper::addPropertyChangeListener( aPropertyName, xListener ); } -void SAL_CALL DocumentSettings::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL DocumentSettings::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) { PropertySetHelper::removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL DocumentSettings::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL DocumentSettings::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) { PropertySetHelper::addVetoableChangeListener( PropertyName, aListener ); } -void SAL_CALL DocumentSettings::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL DocumentSettings::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) { PropertySetHelper::removeVetoableChangeListener( PropertyName, aListener ); } // XMultiPropertySet -void SAL_CALL DocumentSettings::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL DocumentSettings::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) { PropertySetHelper::setPropertyValues( aPropertyNames, aValues ); } -Sequence< Any > SAL_CALL DocumentSettings::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException, std::exception) +Sequence< Any > SAL_CALL DocumentSettings::getPropertyValues( const Sequence< OUString >& aPropertyNames ) { return PropertySetHelper::getPropertyValues( aPropertyNames ); } -void SAL_CALL DocumentSettings::addPropertiesChangeListener( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception) +void SAL_CALL DocumentSettings::addPropertiesChangeListener( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) { PropertySetHelper::addPropertiesChangeListener( aPropertyNames, xListener ); } -void SAL_CALL DocumentSettings::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception) +void SAL_CALL DocumentSettings::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& xListener ) { PropertySetHelper::removePropertiesChangeListener( xListener ); } -void SAL_CALL DocumentSettings::firePropertiesChangeEvent( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception) +void SAL_CALL DocumentSettings::firePropertiesChangeEvent( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) { PropertySetHelper::firePropertiesChangeEvent( aPropertyNames, xListener ); } // XServiceInfo OUString SAL_CALL DocumentSettings::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString( "com.sun.star.comp.Draw.DocumentSettings" ); } sal_Bool SAL_CALL DocumentSettings::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL DocumentSettings::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.document.Settings" ; diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index fe02c933becf..e41558577ac6 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -77,64 +77,64 @@ public: void init( sal_Int16 nPresetClass ); // XInitialization - void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; + void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XChild - Reference< XInterface > SAL_CALL getParent( ) throw (RuntimeException, std::exception) override; - void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) override; + Reference< XInterface > SAL_CALL getParent( ) override; + void SAL_CALL setParent( const Reference< XInterface >& Parent ) override; // XCloneable - virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException, std::exception) override; + virtual Reference< XCloneable > SAL_CALL createClone() override; // XServiceInfo - OUString SAL_CALL getImplementationName() throw(std::exception) override; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; + OUString SAL_CALL getImplementationName() override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; // XAnimationNode - ::sal_Int16 SAL_CALL getType() throw (RuntimeException, std::exception) override; - Any SAL_CALL getBegin() throw (RuntimeException, std::exception) override; - void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException, std::exception) override; - Any SAL_CALL getDuration() throw (RuntimeException, std::exception) override; - void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException, std::exception) override; - Any SAL_CALL getEnd() throw (RuntimeException, std::exception) override; - void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException, std::exception) override; - Any SAL_CALL getEndSync() throw (RuntimeException, std::exception) override; - void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) override; - Any SAL_CALL getRepeatCount() throw (RuntimeException, std::exception) override; - void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) override; - Any SAL_CALL getRepeatDuration() throw (RuntimeException, std::exception) override; - void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) override; - ::sal_Int16 SAL_CALL getFill() throw (RuntimeException, std::exception) override; - void SAL_CALL setFill( ::sal_Int16 _fill ) throw (RuntimeException, std::exception) override; - ::sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException, std::exception) override; - void SAL_CALL setFillDefault( ::sal_Int16 _filldefault ) throw (RuntimeException, std::exception) override; - ::sal_Int16 SAL_CALL getRestart() throw (RuntimeException, std::exception) override; - void SAL_CALL setRestart( ::sal_Int16 _restart ) throw (RuntimeException, std::exception) override; - ::sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException, std::exception) override; - void SAL_CALL setRestartDefault( ::sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) override; - double SAL_CALL getAcceleration() throw (RuntimeException, std::exception) override; - void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) override; - double SAL_CALL getDecelerate() throw (RuntimeException, std::exception) override; - void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) override; - sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException, std::exception) override; - void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) override; - Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException, std::exception) override; - void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) override; + ::sal_Int16 SAL_CALL getType() override; + Any SAL_CALL getBegin() override; + void SAL_CALL setBegin( const Any& _begin ) override; + Any SAL_CALL getDuration() override; + void SAL_CALL setDuration( const Any& _duration ) override; + Any SAL_CALL getEnd() override; + void SAL_CALL setEnd( const Any& _end ) override; + Any SAL_CALL getEndSync() override; + void SAL_CALL setEndSync( const Any& _endsync ) override; + Any SAL_CALL getRepeatCount() override; + void SAL_CALL setRepeatCount( const Any& _repeatcount ) override; + Any SAL_CALL getRepeatDuration() override; + void SAL_CALL setRepeatDuration( const Any& _repeatduration ) override; + ::sal_Int16 SAL_CALL getFill() override; + void SAL_CALL setFill( ::sal_Int16 _fill ) override; + ::sal_Int16 SAL_CALL getFillDefault() override; + void SAL_CALL setFillDefault( ::sal_Int16 _filldefault ) override; + ::sal_Int16 SAL_CALL getRestart() override; + void SAL_CALL setRestart( ::sal_Int16 _restart ) override; + ::sal_Int16 SAL_CALL getRestartDefault() override; + void SAL_CALL setRestartDefault( ::sal_Int16 _restartdefault ) override; + double SAL_CALL getAcceleration() override; + void SAL_CALL setAcceleration( double _acceleration ) override; + double SAL_CALL getDecelerate() override; + void SAL_CALL setDecelerate( double _decelerate ) override; + sal_Bool SAL_CALL getAutoReverse() override; + void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) override; + Sequence< NamedValue > SAL_CALL getUserData() override; + void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) override; // XElementAccess - virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess - virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception) override; + virtual Reference< XEnumeration > SAL_CALL createEnumeration() override; // XTimeContainer - Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; - Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; - Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; - Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; - Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; + Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) override; + Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) override; + Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) override; + Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) override; + Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) override; private: // our first, last and only protection from mutli-threads! @@ -202,7 +202,7 @@ void RandomAnimationNode::init( sal_Int16 nPresetClass ) } // XInitialization -void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) { if( aArguments.getLength() != 1 ) throw IllegalArgumentException(); @@ -222,242 +222,241 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments } // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL RandomAnimationNode::getType() { Guard< Mutex > aGuard( maMutex ); return css::animations::AnimationNodeType::PAR; } // XAnimationNode -Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException, std::exception) +Any SAL_CALL RandomAnimationNode::getBegin() { Guard< Mutex > aGuard( maMutex ); return maBegin; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) { Guard< Mutex > aGuard( maMutex ); maBegin = _begin; } // XAnimationNode -Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException, std::exception) +Any SAL_CALL RandomAnimationNode::getDuration() { Guard< Mutex > aGuard( maMutex ); return maDuration; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) { Guard< Mutex > aGuard( maMutex ); maDuration = _duration; } // XAnimationNode -Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException, std::exception) +Any SAL_CALL RandomAnimationNode::getEnd() { Guard< Mutex > aGuard( maMutex ); return maEnd; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) { Guard< Mutex > aGuard( maMutex ); maEnd = _end; } // XAnimationNode -Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException, std::exception) +Any SAL_CALL RandomAnimationNode::getEndSync() { Guard< Mutex > aGuard( maMutex ); return maEndSync; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) { Guard< Mutex > aGuard( maMutex ); maEndSync = _endsync; } // XAnimationNode -Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException, std::exception) +Any SAL_CALL RandomAnimationNode::getRepeatCount() { Guard< Mutex > aGuard( maMutex ); return maRepeatCount; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) { Guard< Mutex > aGuard( maMutex ); maRepeatCount = _repeatcount; } // XAnimationNode -Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException, std::exception) +Any SAL_CALL RandomAnimationNode::getRepeatDuration() { Guard< Mutex > aGuard( maMutex ); return maRepeatDuration; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration ) { Guard< Mutex > aGuard( maMutex ); maRepeatDuration = _repeatduration; } // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL RandomAnimationNode::getFill() { Guard< Mutex > aGuard( maMutex ); return mnFill; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) { Guard< Mutex > aGuard( maMutex ); mnFill = _fill; } // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() { Guard< Mutex > aGuard( maMutex ); return mnFillDefault; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) { Guard< Mutex > aGuard( maMutex ); mnFillDefault = _filldefault; } // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL RandomAnimationNode::getRestart() { Guard< Mutex > aGuard( maMutex ); return mnRestart; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) { Guard< Mutex > aGuard( maMutex ); mnRestart = _restart; } // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() { Guard< Mutex > aGuard( maMutex ); return mnRestartDefault; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault ) { Guard< Mutex > aGuard( maMutex ); mnRestartDefault = _restartdefault; } // XAnimationNode -double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException, std::exception) +double SAL_CALL RandomAnimationNode::getAcceleration() { Guard< Mutex > aGuard( maMutex ); return mfAcceleration; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) { Guard< Mutex > aGuard( maMutex ); mfAcceleration = _acceleration; } // XAnimationNode -double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException, std::exception) +double SAL_CALL RandomAnimationNode::getDecelerate() { Guard< Mutex > aGuard( maMutex ); return mfDecelerate; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) { Guard< Mutex > aGuard( maMutex ); mfDecelerate = _decelerate; } // XAnimationNode -sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() { Guard< Mutex > aGuard( maMutex ); return mbAutoReverse; } // XAnimationNode -void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) { Guard< Mutex > aGuard( maMutex ); mbAutoReverse = _autoreverse; } -Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (RuntimeException, std::exception) +Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() { Guard< Mutex > aGuard( maMutex ); return maUserData; } -void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) { Guard< Mutex > aGuard( maMutex ); maUserData = _userdata; } // XChild -Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (RuntimeException, std::exception) +Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() { Guard< Mutex > aGuard( maMutex ); return mxParent; } // XChild -void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent ) { Guard< Mutex > aGuard( maMutex ); mxParent = Parent; } // XCloneable -Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() { Reference< XCloneable > xNewNode( new RandomAnimationNode( *this ) ); return xNewNode; } // XElementAccess -Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std::exception) +Type SAL_CALL RandomAnimationNode::getElementType() { return cppu::UnoType<XAnimationNode>::get(); } // XElementAccess -sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL RandomAnimationNode::hasElements() { return true; } // XEnumerationAccess Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -501,35 +500,30 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) - throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { return appendChild( newChild ); } // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) - throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { return appendChild( newChild ); } // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) - throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { return appendChild( newChild ); } // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Reference< XAnimationNode >& oldChild ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { return oldChild; } // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Reference< XAnimationNode >& newChild ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Reference< XAnimate > xAnimate( newChild, UNO_QUERY ); if( xAnimate.is() ) @@ -546,19 +540,19 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Ref } // XServiceInfo -OUString RandomAnimationNode::getImplementationName() throw(std::exception) +OUString RandomAnimationNode::getImplementationName() { return OUString( "sd::RandomAnimationNode" ) ; } // XServiceInfo -sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) throw(std::exception) +sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() throw(std::exception) +Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() { Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.animations.ParallelTimeContainer"; diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 5ad76a4bbeb5..342bea38cdb0 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -49,7 +49,7 @@ SdFilterDetect::~SdFilterDetect() { } -OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDescriptor ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDescriptor ) { MediaDescriptor aMediaDesc( lDescriptor ); OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() ); @@ -133,19 +133,19 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes } // XServiceInfo -OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SdFilterDetect::getImplementationName() { return OUString( "com.sun.star.comp.draw.FormatDetector" ); } // XServiceInfo -sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } // XServiceInfo -Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() { Sequence<OUString> seqServiceNames { "com.sun.star.frame.ExtendedTypeDetection" }; return seqServiceNames ; diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index e8c1cd9035ff..2077b2974e20 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -57,13 +57,13 @@ public: // 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; // XExtendedFilterDetect - 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; }; #endif diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 61cddf6c2929..4dc48ceccbcb 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -63,19 +63,16 @@ UNO3_GETIMPLEMENTATION_IMPL( SdXCustomPresentation ); // XServiceInfo OUString SAL_CALL SdXCustomPresentation::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString( "SdXCustomPresentation" ) ; } sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { OUString aSN( "com.sun.star.presentation.CustomPresentation" ); uno::Sequence< OUString > aSeq( &aSN, 1 ); @@ -84,7 +81,6 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNam // XIndexContainer void SAL_CALL SdXCustomPresentation::insertByIndex( sal_Int32 Index, const uno::Any& Element ) - throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -119,7 +115,6 @@ void SAL_CALL SdXCustomPresentation::insertByIndex( sal_Int32 Index, const uno:: } void SAL_CALL SdXCustomPresentation::removeByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -152,7 +147,6 @@ void SAL_CALL SdXCustomPresentation::removeByIndex( sal_Int32 Index ) // XIndexReplace void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno::Any& Element ) - throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByIndex( Index ); insertByIndex( Index, Element ); @@ -160,13 +154,11 @@ void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno: // XElementAccess uno::Type SAL_CALL SdXCustomPresentation::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SdXCustomPresentation::hasElements() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -178,7 +170,6 @@ sal_Bool SAL_CALL SdXCustomPresentation::hasElements() // XIndexAccess sal_Int32 SAL_CALL SdXCustomPresentation::getCount() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( bDisposing ) @@ -188,7 +179,6 @@ sal_Int32 SAL_CALL SdXCustomPresentation::getCount() } uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -212,7 +202,6 @@ uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index ) // XNamed OUString SAL_CALL SdXCustomPresentation::getName() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -226,7 +215,6 @@ OUString SAL_CALL SdXCustomPresentation::getName() } void SAL_CALL SdXCustomPresentation::setName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -238,7 +226,7 @@ void SAL_CALL SdXCustomPresentation::setName( const OUString& aName ) } // XComponent -void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL SdXCustomPresentation::dispose() { SolarMutexGuard aGuard; @@ -257,7 +245,6 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std: } void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException, std::exception) { if( bDisposing ) throw lang::DisposedException(); @@ -265,7 +252,7 @@ void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lan aDisposeListeners.addInterface(xListener); } -void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) { if( !bDisposing ) aDisposeListeners.removeInterface(aListener); @@ -287,19 +274,16 @@ SdXCustomPresentationAccess::~SdXCustomPresentationAccess() throw() // XServiceInfo OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString( "SdXCustomPresentationAccess" ); } sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { const OUString aNS( "com.sun.star.presentation.CustomPresentationAccess" ); uno::Sequence< OUString > aSeq( &aNS, 1 ); @@ -308,21 +292,18 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServ // XSingleServiceFactory uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstance() - throw(uno::Exception, uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xRef( static_cast<cppu::OWeakObject*>(new SdXCustomPresentation()) ); return xRef; } uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstanceWithArguments( const uno::Sequence< uno::Any >& ) - throw(uno::Exception, uno::RuntimeException, std::exception) { return createInstance(); } // XNameContainer void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -376,7 +357,6 @@ void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName, } void SAL_CALL SdXCustomPresentationAccess::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -393,7 +373,6 @@ void SAL_CALL SdXCustomPresentationAccess::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL SdXCustomPresentationAccess::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -401,7 +380,6 @@ void SAL_CALL SdXCustomPresentationAccess::replaceByName( const OUString& aName, // XNameAccess uno::Any SAL_CALL SdXCustomPresentationAccess::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -422,7 +400,6 @@ uno::Any SAL_CALL SdXCustomPresentationAccess::getByName( const OUString& aName } uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -444,7 +421,6 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames( } sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return getSdCustomShow(aName) != nullptr; @@ -452,13 +428,11 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName // XElementAccess uno::Type SAL_CALL SdXCustomPresentationAccess::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<container::XIndexContainer>::get(); } sal_Bool SAL_CALL SdXCustomPresentationAccess::hasElements() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 64f6c1f7591e..2069d4acc34e 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -68,33 +68,33 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXCustomPresentation) // 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; // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any& Element ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any& Element ) override; // XElementAccess - 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 css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() 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 sal_Int32 SAL_CALL getCount() override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) 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; }; class List; @@ -115,29 +115,29 @@ public: virtual ~SdXCustomPresentationAccess() throw() 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; // XSingleServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - 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 css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; }; inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const throw() diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index 02aa54000b95..c918d378bcd5 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -33,12 +33,12 @@ using namespace ::com::sun::star; // com.sun.star.comp.Draw.DrawingDocument -OUString SAL_CALL SdDrawingDocument_getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL SdDrawingDocument_getImplementationName() { return OUString( "com.sun.star.comp.Draw.DrawingDocument" ); } -uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() { uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocument"; @@ -62,12 +62,12 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( // com.sun.star.comp.Draw.PresentationDocument -OUString SAL_CALL SdPresentationDocument_getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL SdPresentationDocument_getImplementationName() { return OUString( "com.sun.star.comp.Draw.PresentationDocument" ); } -uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() { uno::Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.drawing.DrawingDocumentFactory"; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 3b287a545136..e15fcafe58a0 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -148,19 +148,16 @@ UNO3_GETIMPLEMENTATION_IMPL( SdLayer ); // XServiceInfo OUString SAL_CALL SdLayer::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SdUnoLayer"); } sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { OUString aServiceName(UNO_PREFIX "drawing.Layer"); uno::Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -169,14 +166,12 @@ uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames() // beans::XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SdLayer::getPropertySetInfo( ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return pPropSet->getPropertySetInfo(); } void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -242,7 +237,6 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un } uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -283,10 +277,10 @@ uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName ) return aValue; } -void SAL_CALL SdLayer::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SdLayer::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} +void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} bool SdLayer::get( LayerAttribute what ) throw() { @@ -387,7 +381,6 @@ void SdLayer::set( LayerAttribute what, bool flag ) throw() // css::container::XChild uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -398,25 +391,23 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent() } void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) { throw lang::NoSupportException (); } // XComponent -void SAL_CALL SdLayer::dispose( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdLayer::dispose( ) { mxLayerManager.clear(); pLayer = nullptr; } -void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL("not implemented!"); } -void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL("not implemented!"); } @@ -437,7 +428,7 @@ SdLayerManager::~SdLayerManager() throw() UNO3_GETIMPLEMENTATION_IMPL( SdLayerManager ); // XComponent -void SAL_CALL SdLayerManager::dispose( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdLayerManager::dispose( ) { mpModel = nullptr; if( mpLayers ) @@ -449,31 +440,28 @@ void SAL_CALL SdLayerManager::dispose( ) throw (uno::RuntimeException, std::exc } } -void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL("not implemented!"); } -void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL("not implemented!"); } // XServiceInfo OUString SAL_CALL SdLayerManager::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SdUnoLayerManager"); } sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq { UNO_PREFIX "drawing.LayerManager" }; return aSeq; @@ -481,7 +469,6 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames() // XLayerManager uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -515,7 +502,6 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal } void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& xLayer ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -536,7 +522,6 @@ void SAL_CALL SdLayerManager::remove( const uno::Reference< drawing::XLayer >& x } void SAL_CALL SdLayerManager::attachShapeToLayer( const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XLayer >& xLayer ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -557,7 +542,7 @@ void SAL_CALL SdLayerManager::attachShapeToLayer( const uno::Reference< drawing: mpModel->SetModified(); } -uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( const uno::Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception) +uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( const uno::Reference< drawing::XShape >& xShape ) { SolarMutexGuard aGuard; @@ -582,7 +567,6 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( con // XIndexAccess sal_Int32 SAL_CALL SdLayerManager::getCount() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -599,7 +583,6 @@ sal_Int32 SAL_CALL SdLayerManager::getCount() } uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -622,7 +605,6 @@ uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer ) // XNameAccess uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -638,7 +620,6 @@ uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -662,7 +643,7 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames() return aSeq; } -sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) { SolarMutexGuard aGuard; @@ -676,12 +657,11 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno:: // XElementAccess uno::Type SAL_CALL SdLayerManager::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XLayer>::get(); } -sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SdLayerManager::hasElements() { return getCount() > 0; } diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 1228376e75b3..22724d3a7693 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -62,34 +62,34 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayer ) // 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; // css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // css::container::XChild /** Returns the layer manager that manages this layer. */ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) 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; /** Not implemented. Always throws an exception. @throws NoSupportException. */ - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; private: rtl::Reference<SdLayerManager> mxLayerManager; @@ -121,28 +121,28 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayerManager ) // 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; // XLayerManager - virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XLayer >& xLayer ) throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL attachShapeToLayer( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XLayer >& xLayer ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL getLayerForShape( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XLayer >& xLayer ) override; + virtual void SAL_CALL attachShapeToLayer( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XLayer >& xLayer ) override; + virtual css::uno::Reference< css::drawing::XLayer > SAL_CALL getLayerForShape( const css::uno::Reference< css::drawing::XShape >& xShape ) 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 sal_Int32 SAL_CALL getCount() override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - 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 css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; /** Return the <type>XLayer</type> object that is associated with the given <type>SdrLayer</type> object. If the requested object does @@ -159,9 +159,9 @@ public: css::uno::Reference< css::drawing::XLayer> GetLayer (SdrLayer* pLayer); // 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; private: SdXImpressDocument* mpModel; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index e4ac5f6d31b6..7fd6355ce508 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -252,7 +252,7 @@ SdXImpressDocument::~SdXImpressDocument() throw() } // XInterface -uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType ) { uno::Any aAny; @@ -339,7 +339,7 @@ SdXImpressDocument* SdXImpressDocument::getImplementation( const uno::Reference< return nullptr; } -sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) { if( rIdentifier.getLength() == 16 ) { @@ -354,7 +354,7 @@ sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const css::uno::Sequence< s } // XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) { ::SolarMutexGuard aGuard; @@ -394,7 +394,7 @@ uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno:: return maTypeSequence; } -uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -453,7 +453,6 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) * * ******************************************************************************/ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) - throw (css::uno::RuntimeException, std::exception) { sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PageKind::Standard ); SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); @@ -569,7 +568,6 @@ void SdXImpressDocument::SetModified() throw() // XModel void SAL_CALL SdXImpressDocument ::lockControllers( ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -580,7 +578,6 @@ void SAL_CALL SdXImpressDocument ::lockControllers( ) } void SAL_CALL SdXImpressDocument::unlockControllers( ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -594,7 +591,6 @@ void SAL_CALL SdXImpressDocument::unlockControllers( ) } sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked( ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -604,7 +600,7 @@ sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked( ) return mpDoc && mpDoc->isLocked(); } -uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewData() throw( uno::RuntimeException, std::exception ) +uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewData() { ::SolarMutexGuard aGuard; @@ -640,7 +636,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD return xRet; } -void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData ) { ::SolarMutexGuard aGuard; @@ -677,7 +673,6 @@ void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container: // XDrawPageDuplicator uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( const uno::Reference< drawing::XDrawPage >& xPage ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -705,7 +700,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( con // XDrawPagesSupplier uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -725,7 +719,6 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages( // XMasterPagesSupplier uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPages() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -746,7 +739,6 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPage // XLayerManagerSupplier uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerManager( ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -763,7 +755,6 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerMa // XCustomPresentationSupplier uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCustomPresentations() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -780,7 +771,6 @@ uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCust // XPresentationSupplier uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPresentation() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -792,7 +782,6 @@ uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPr // XHandoutMasterSupplier uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMasterPage() - throw (uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1088,7 +1077,6 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( } uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( const OUString& aServiceSpecifier ) - throw(uno::Exception, uno::RuntimeException, std::exception) { return create(aServiceSpecifier, ""); } @@ -1097,7 +1085,6 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::createInstanceWithArguments( OUString const & ServiceSpecifier, css::uno::Sequence<css::uno::Any> const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { OUString arg; if ((ServiceSpecifier == "com.sun.star.drawing.GraphicObjectShape" @@ -1112,7 +1099,6 @@ SdXImpressDocument::createInstanceWithArguments( } uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1179,7 +1165,6 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames( // lang::XServiceInfo OUString SAL_CALL SdXImpressDocument::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString( "SdXImpressDocument" ); /* // Matching the .component information: @@ -1190,12 +1175,11 @@ OUString SAL_CALL SdXImpressDocument::getImplementationName() } sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames() { ::SolarMutexGuard aGuard; @@ -1216,14 +1200,12 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames( // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SdXImpressDocument::getPropertySetInfo( ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; return mpPropSet->getPropertySetInfo(); } void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1301,7 +1283,6 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam } uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1424,14 +1405,13 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property return aAny; } -void SAL_CALL SdXImpressDocument::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdXImpressDocument::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdXImpressDocument::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SdXImpressDocument::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdXImpressDocument::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdXImpressDocument::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} +void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} // XLinkTargetSupplier uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1446,7 +1426,6 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks() // XStyleFamiliesSupplier uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFamilies( ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1459,7 +1438,6 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFa // XAnyCompareFactory uno::Reference< css::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCompareByName( const OUString& ) - throw (uno::RuntimeException, std::exception) { return SvxCreateNumRuleCompare(); } @@ -1467,7 +1445,6 @@ uno::Reference< css::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCo // XRenderable sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelection, const uno::Sequence< beans::PropertyValue >& ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; sal_Int32 nRet = 0; @@ -1498,7 +1475,6 @@ sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelect uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( sal_Int32 , const uno::Any& , const uno::Sequence< beans::PropertyValue >& rxOptions ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1882,7 +1858,6 @@ namespace void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& rSelection, const uno::Sequence< beans::PropertyValue >& rxOptions ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2637,7 +2612,7 @@ void SdXImpressDocument::initializeDocument() } } -void SAL_CALL SdXImpressDocument::dispose() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SdXImpressDocument::dispose() { if( !mbDisposed ) { @@ -2752,7 +2727,6 @@ SdDrawPagesAccess::~SdDrawPagesAccess() throw() // XIndexAccess sal_Int32 SAL_CALL SdDrawPagesAccess::getCount() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2763,7 +2737,6 @@ sal_Int32 SAL_CALL SdDrawPagesAccess::getCount() } uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2786,7 +2759,7 @@ uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index ) } // XNameAccess -uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) { ::SolarMutexGuard aGuard; @@ -2816,7 +2789,7 @@ uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(co throw container::NoSuchElementException(); } -uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() { ::SolarMutexGuard aGuard; @@ -2837,7 +2810,7 @@ uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(un return aNames; } -sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) { ::SolarMutexGuard aGuard; @@ -2861,13 +2834,11 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(un // XElementAccess uno::Type SAL_CALL SdDrawPagesAccess::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SdDrawPagesAccess::hasElements() - throw(uno::RuntimeException, std::exception) { return getCount() > 0; } @@ -2879,7 +2850,6 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasElements() * @returns corresponding SdDrawPage */ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2905,7 +2875,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByInde * removing this page. */ void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2959,17 +2928,17 @@ void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPag // XServiceInfo -OUString SAL_CALL SdDrawPagesAccess::getImplementationName( ) throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SdDrawPagesAccess::getImplementationName( ) { return OUString( "SdDrawPagesAccess" ); } -sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames( ) { OUString aService( "com.sun.star.drawing.DrawPages" ); uno::Sequence< OUString > aSeq( &aService, 1 ); @@ -2977,17 +2946,17 @@ uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames( } // XComponent -void SAL_CALL SdDrawPagesAccess::dispose( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdDrawPagesAccess::dispose( ) { mpModel = nullptr; } -void SAL_CALL SdDrawPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdDrawPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL( "not implemented!" ); } -void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL( "not implemented!" ); } @@ -3004,24 +2973,23 @@ SdMasterPagesAccess::~SdMasterPagesAccess() throw() } // XComponent -void SAL_CALL SdMasterPagesAccess::dispose( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdMasterPagesAccess::dispose( ) { mpModel = nullptr; } -void SAL_CALL SdMasterPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdMasterPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL( "not implemented!" ); } -void SAL_CALL SdMasterPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdMasterPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL( "not implemented!" ); } // XIndexAccess sal_Int32 SAL_CALL SdMasterPagesAccess::getCount() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3036,7 +3004,6 @@ sal_Int32 SAL_CALL SdMasterPagesAccess::getCount() * specified position in the model. */ uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3060,20 +3027,17 @@ uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SdMasterPagesAccess::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SdMasterPagesAccess::hasElements() - throw(uno::RuntimeException, std::exception) { return getCount() > 0; } // XDrawPages uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIndex( sal_Int32 nInsertPos ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3169,7 +3133,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn * the model. */ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3224,17 +3187,17 @@ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawP // XServiceInfo -OUString SAL_CALL SdMasterPagesAccess::getImplementationName( ) throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SdMasterPagesAccess::getImplementationName( ) { return OUString( "SdMasterPagesAccess" ); } -sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames( ) { OUString aService( "com.sun.star.drawing.MasterPages" ); uno::Sequence< OUString > aSeq( &aService, 1 ); @@ -3253,24 +3216,23 @@ SdDocLinkTargets::~SdDocLinkTargets() throw() } // XComponent -void SAL_CALL SdDocLinkTargets::dispose( ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdDocLinkTargets::dispose( ) { mpModel = nullptr; } -void SAL_CALL SdDocLinkTargets::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdDocLinkTargets::addEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL( "not implemented!" ); } -void SAL_CALL SdDocLinkTargets::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SdDocLinkTargets::removeEventListener( const uno::Reference< lang::XEventListener >& ) { OSL_FAIL( "not implemented!" ); } // XNameAccess uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3292,7 +3254,6 @@ uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3345,7 +3306,6 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() } sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3357,13 +3317,11 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName ) // container::XElementAccess uno::Type SAL_CALL SdDocLinkTargets::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool SAL_CALL SdDocLinkTargets::hasElements() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3373,7 +3331,7 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasElements() return mpModel->GetDoc() != nullptr; } -SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw(std::exception) +SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const { SdDrawDocument* pDoc = mpModel->GetDoc(); if( pDoc == nullptr ) @@ -3408,19 +3366,16 @@ SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw(std::exc // XServiceInfo OUString SAL_CALL SdDocLinkTargets::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString( "SdDocLinkTargets" ); } sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { const OUString aSN( "com.sun.star.document.LinkTargets" ); uno::Sequence< OUString > aSeq( &aSN, 1 ); diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index 05b52b0c48b3..efc80fb58ef0 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; // XNotifyingDispatch void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener ) - throw (uno::RuntimeException, std::exception) { // there is no guarantee, that we are holded alive during this method! // May the outside dispatch container will be updated by a CONTEXT_CHANGED @@ -67,20 +66,20 @@ void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, cons } } // XDispatch -void SAL_CALL SdUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SdUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs ) { dispatchWithNotification(aURL, aArgs, uno::Reference< frame::XDispatchResultListener >()); } -void SAL_CALL SdUnoModule::addStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SdUnoModule::addStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) { } -void SAL_CALL SdUnoModule::removeStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SdUnoModule::removeStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) { } -uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) { sal_Int32 nCount = seqDescripts.getLength(); uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount ); @@ -97,7 +96,6 @@ uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryD // XDispatchProvider uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const util::URL& aURL, const OUString&, sal_Int32 ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SdDLL::Init(); @@ -111,17 +109,17 @@ uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const ut } // XServiceInfo -OUString SAL_CALL SdUnoModule::getImplementationName( ) throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SdUnoModule::getImplementationName( ) { return OUString( "com.sun.star.comp.Draw.DrawingModule" ); } -sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } -uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) { uno::Sequence<OUString> aSeq { "com.sun.star.drawing.ModuleDispatcher" }; return aSeq; diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx index 113e0a6b3bb6..4f6716e60cb6 100644 --- a/sd/source/ui/unoidl/unomodule.hxx +++ b/sd/source/ui/unoidl/unomodule.hxx @@ -54,24 +54,22 @@ public: SdUnoModule() {} // XnotifyingDispatch - virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override; + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) override; + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) override; // XDispatchProvider - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) override ; virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , const OUString & sTargetFrameName, - sal_Int32 eSearchFlags ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 eSearchFlags ) 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; }; #endif diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index ff0d04265cd4..1af83e0f39f3 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -287,7 +287,6 @@ void SdXShape::dispose() } uno::Any SAL_CALL SdXShape::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return mpShape->queryInterface( rType ); } @@ -317,7 +316,6 @@ bool SdXShape::queryAggregation( const css::uno::Type & rType, css::uno::Any& aA } uno::Sequence< uno::Type > SAL_CALL SdXShape::getTypes() - throw (uno::RuntimeException) { if( mpModel && !mpModel->IsImpressDocument() ) { @@ -348,7 +346,7 @@ uno::Sequence< uno::Type > SAL_CALL SdXShape::getTypes() } // XPropertyState -beans::PropertyState SAL_CALL SdXShape::getPropertyState( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException) +beans::PropertyState SAL_CALL SdXShape::getPropertyState( const OUString& PropertyName ) { SolarMutexGuard aGuard; @@ -366,7 +364,7 @@ beans::PropertyState SAL_CALL SdXShape::getPropertyState( const OUString& Proper } } -void SAL_CALL SdXShape::setPropertyToDefault( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL SdXShape::setPropertyToDefault( const OUString& PropertyName ) { SolarMutexGuard aGuard; @@ -380,7 +378,7 @@ void SAL_CALL SdXShape::setPropertyToDefault( const OUString& PropertyName ) thr } } -uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) { SolarMutexGuard aGuard; @@ -407,7 +405,6 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) //XPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo() - throw(css::uno::RuntimeException) { sal_uIntPtr nObjId = reinterpret_cast<sal_uIntPtr>(mpShape->getPropertyMapEntries()); css::uno::Reference<css::beans::XPropertySetInfo> pInfo; @@ -433,12 +430,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getProper } void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -687,10 +678,6 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c } css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -844,7 +831,6 @@ css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName /** */ SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const - throw (std::exception) { SdAnimationInfo* pInfo = nullptr; @@ -855,7 +841,7 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const return pInfo; } -uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(css::uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() { uno::Sequence< OUString > aSeq( mpShape->_getSupportedServiceNames() ); @@ -882,7 +868,6 @@ uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(cs /** checks if this is a presentation object */ bool SdXShape::IsPresObj() const - throw (std::exception) { SdrObject* pObj = mpShape->GetSdrObject(); if(pObj) @@ -1037,7 +1022,7 @@ void SdXShape::SetMasterDepend( bool bDepend ) throw() } } -void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException ) +void SdXShape::SetStyleSheet( const uno::Any& rAny ) { SdrObject* pObj = mpShape->GetSdrObject(); if( pObj == nullptr ) @@ -1066,7 +1051,7 @@ void SdXShape::SetStyleSheet( const uno::Any& rAny ) throw( lang::IllegalArgumen } } -uno::Any SdXShape::GetStyleSheet() const throw( beans::UnknownPropertyException ) +uno::Any SdXShape::GetStyleSheet() const { SdrObject* pObj = mpShape->GetSdrObject(); if( pObj == nullptr ) @@ -1106,25 +1091,25 @@ public: explicit SdUnoEventsAccess(SdXShape* pShape) throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - 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 css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) 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; }; // XEventsSupplier -uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) throw(css::uno::RuntimeException, std::exception) +uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) { return new SdUnoEventsAccess( this ); } @@ -1179,7 +1164,6 @@ static void clearEventsInAnimationInfo( SdAnimationInfo* pInfo ) // XNameReplace void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpShape == nullptr || aName != maStrOnClick ) throw container::NoSuchElementException(); @@ -1450,7 +1434,6 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno // XNameAccess uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpShape == nullptr || aName != maStrOnClick ) throw container::NoSuchElementException(); @@ -1661,45 +1644,39 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SdUnoEventsAccess::getElementNames( ) - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aStr( &maStrOnClick, 1 ); return aStr; } sal_Bool SAL_CALL SdUnoEventsAccess::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { return aName == maStrOnClick; } // XElementAccess uno::Type SAL_CALL SdUnoEventsAccess::getElementType( ) - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(); } -sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( ) { return true; } // XServiceInfo OUString SAL_CALL SdUnoEventsAccess::getImplementationName( ) - throw(uno::RuntimeException, std::exception) { return OUString( "SdUnoEventsAccess" ); } sal_Bool SAL_CALL SdUnoEventsAccess::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL SdUnoEventsAccess::getSupportedServiceNames( ) - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aStr( &maStrServiceName, 1 ); return aStr; diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 75b1389ed9cd..e7a2f956cf99 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -48,18 +48,15 @@ private: /// @throws css::lang::IllegalArgumentException /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - void SetStyleSheet( const css::uno::Any& rAny ) - throw( css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException ); + void SetStyleSheet( const css::uno::Any& rAny ); /// @throws css::beans::UnknownPropertyException - css::uno::Any GetStyleSheet() const throw( css::beans::UnknownPropertyException ); + css::uno::Any GetStyleSheet() const; // Intern /// @throws std::exception - SdAnimationInfo* GetAnimationInfo( bool bCreate = false ) const - throw (std::exception); + SdAnimationInfo* GetAnimationInfo( bool bCreate = false ) const; /// @throws std::exception - bool IsPresObj() const - throw (std::exception); + bool IsPresObj() const; bool IsEmptyPresObj() const; void SetEmptyPresObj(bool bEmpty); @@ -78,38 +75,28 @@ public: virtual void modelChanged( SdrModel* pNewModel ) override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XEventsSupplier - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; }; struct SvEventDescription; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 80b820a975ca..58400aa5c4e3 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -329,7 +329,7 @@ const css::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTunnelId() throw return theSdGenericDrawPageUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -361,7 +361,7 @@ SdGenericDrawPage::~SdGenericDrawPage() throw() { } -void SdGenericDrawPage::throwIfDisposed() const throw (css::uno::RuntimeException ) +void SdGenericDrawPage::throwIfDisposed() const { if( (SvxFmDrawPage::mpModel == nullptr) || (mpModel == nullptr) || (SvxFmDrawPage::mpPage == nullptr) ) throw lang::DisposedException(); @@ -399,7 +399,6 @@ void SdGenericDrawPage::UpdateModel() // this is called whenever a SdrObject must be created for a empty api shape wrapper SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShape >& xShape ) - throw (css::uno::RuntimeException, std::exception) { if( nullptr == SvxFmDrawPage::mpPage || !xShape.is() ) return nullptr; @@ -542,7 +541,6 @@ SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShap // XInterface Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { Any aAny; @@ -597,7 +595,6 @@ Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType ) // XPropertySet Reference< beans::XPropertySetInfo > SAL_CALL SdGenericDrawPage::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -605,12 +602,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL SdGenericDrawPage::getPropertySetI } void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw (beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { ::SolarMutexGuard aGuard; @@ -1018,7 +1009,6 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1332,13 +1322,13 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) return aAny; } -void SAL_CALL SdGenericDrawPage::addPropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdGenericDrawPage::removePropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdGenericDrawPage::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SdGenericDrawPage::addPropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdGenericDrawPage::removePropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdGenericDrawPage::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) {} +void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) {} // XMultiPropertySet -void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) { if( aPropertyNames.getLength() != aValues.getLength() ) throw lang::IllegalArgumentException(); @@ -1360,7 +1350,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& } } -Sequence< Any > SAL_CALL SdGenericDrawPage::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception) +Sequence< Any > SAL_CALL SdGenericDrawPage::getPropertyValues( const Sequence< OUString >& aPropertyNames ) { const OUString* pNames = aPropertyNames.getConstArray(); sal_uInt32 nCount = aPropertyNames.getLength(); @@ -1383,20 +1373,19 @@ Sequence< Any > SAL_CALL SdGenericDrawPage::getPropertyValues( const Sequence< O return aValues; } -void SAL_CALL SdGenericDrawPage::addPropertiesChangeListener( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) +void SAL_CALL SdGenericDrawPage::addPropertiesChangeListener( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SdGenericDrawPage::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) +void SAL_CALL SdGenericDrawPage::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) +void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >& ) { } Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) const - throw (RuntimeException, std::exception) { DBG_ASSERT( GetPage(), "SdGenericDrawPage::CreateShape(), can't create shape for disposed page!" ); DBG_ASSERT( pObj, "SdGenericDrawPage::CreateShape(), invalid call with pObj == 0!" ); @@ -1529,7 +1518,6 @@ Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) co // XServiceInfo Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { Sequence< OUString > aSeq( SvxFmDrawPage::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.GenericDrawPage", @@ -1540,17 +1528,16 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() // XLinkTargetSupplier Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks( ) - throw(uno::RuntimeException, std::exception) { return new SdPageLinkTargets( this ); } -void SdGenericDrawPage::setBackground( const Any& ) throw(lang::IllegalArgumentException, std::exception) +void SdGenericDrawPage::setBackground( const Any& ) { OSL_FAIL( "Don't call me, I'm useless!" ); } -void SdGenericDrawPage::getBackground( Any& ) throw(std::exception) +void SdGenericDrawPage::getBackground( Any& ) { OSL_FAIL( "Don't call me, I'm useless!" ); } @@ -1595,7 +1582,6 @@ void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) } Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Reference< drawing::XShapes >& xShapes ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -1631,7 +1617,6 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc } void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGroup ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -1649,7 +1634,6 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro } Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< drawing::XShapes >& xShapes ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -1682,7 +1666,6 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< } void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -1896,7 +1879,7 @@ void SdGenericDrawPage::disposing() throw() } // XAnimationNodeSupplier -Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() throw (uno::RuntimeException, std::exception) +Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() { ::SolarMutexGuard aGuard; @@ -1920,13 +1903,11 @@ SdPageLinkTargets::~SdPageLinkTargets() throw() // XElementAccess uno::Type SAL_CALL SdPageLinkTargets::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool SAL_CALL SdPageLinkTargets::hasElements() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1953,7 +1934,6 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasElements() // XNameAccess Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1972,7 +1952,6 @@ Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName ) } Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2014,7 +1993,6 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames() } sal_Bool SAL_CALL SdPageLinkTargets::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2044,19 +2022,16 @@ SdrObject* SdPageLinkTargets::FindObject( const OUString& rName ) const throw() // XServiceInfo OUString SAL_CALL SdPageLinkTargets::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString( "SdPageLinkTargets" ); } sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { Sequence< OUString > aSeq { "com.sun.star.document.LinkTargets" }; return aSeq; @@ -2074,7 +2049,6 @@ SdDrawPage::~SdDrawPage() throw() // XInterface Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { if( rType == cppu::UnoType<drawing::XMasterPageTarget>::get() ) { @@ -2106,7 +2080,7 @@ void SAL_CALL SdDrawPage::release() throw() UNO3_GETIMPLEMENTATION2_IMPL( SdDrawPage, SdGenericDrawPage ); // XTypeProvider -Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeException, std::exception) +Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() { ::SolarMutexGuard aGuard; @@ -2154,7 +2128,7 @@ Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeExceptio return maTypeSequence; } -Sequence< sal_Int8 > SAL_CALL SdDrawPage::getImplementationId() throw(uno::RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL SdDrawPage::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -2253,12 +2227,12 @@ OUString SdDrawPage::getUiNameFromPageApiName( const OUString& rApiName ) } // XServiceInfo -OUString SAL_CALL SdDrawPage::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SdDrawPage::getImplementationName() { return OUString( "SdDrawPage" ); } -Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() { ::SolarMutexGuard aGuard; @@ -2274,14 +2248,12 @@ Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno:: } sal_Bool SAL_CALL SdDrawPage::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } // XNamed void SAL_CALL SdDrawPage::setName( const OUString& rName ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2360,7 +2332,6 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) } OUString SAL_CALL SdDrawPage::getName() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2371,7 +2342,6 @@ OUString SAL_CALL SdDrawPage::getName() // XMasterPageTarget Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2394,7 +2364,6 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( ) } void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& xMasterPage ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2433,7 +2402,6 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& // XPresentationPage Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2453,39 +2421,33 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage() // XIndexAccess sal_Int32 SAL_CALL SdDrawPage::getCount() - throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::getCount(); } Any SAL_CALL SdDrawPage::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { return SdGenericDrawPage::getByIndex( Index ); } // XElementAccess uno::Type SAL_CALL SdDrawPage::getElementType() - throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::getElementType(); } sal_Bool SAL_CALL SdDrawPage::hasElements() - throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::hasElements(); } // XShapes -void SAL_CALL SdDrawPage::add( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SdDrawPage::add( const Reference< drawing::XShape >& xShape ) { SdGenericDrawPage::add( xShape ); } void SAL_CALL SdDrawPage::remove( const Reference< drawing::XShape >& xShape ) - throw (uno::RuntimeException, - std::exception) { ::SolarMutexGuard aGuard; @@ -2506,7 +2468,6 @@ void SAL_CALL SdDrawPage::remove( const Reference< drawing::XShape >& xShape ) } void SdDrawPage::setBackground( const Any& rValue ) - throw( lang::IllegalArgumentException ) { Reference< beans::XPropertySet > xSet; @@ -2571,7 +2532,7 @@ void SdDrawPage::setBackground( const Any& rValue ) } // XAnnotationAccess: -Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation() throw (RuntimeException, std::exception) +Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation() { if( !GetPage() ) throw DisposedException(); @@ -2581,12 +2542,12 @@ Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation() return xRet; } -void SAL_CALL SdGenericDrawPage::removeAnnotation(const Reference< XAnnotation > & annotation) throw (RuntimeException, IllegalArgumentException, std::exception) +void SAL_CALL SdGenericDrawPage::removeAnnotation(const Reference< XAnnotation > & annotation) { GetPage()->removeAnnotation(annotation); } -Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotationEnumeration() throw (RuntimeException, std::exception) +Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotationEnumeration() { return ::sd::createAnnotationEnumeration( GetPage()->getAnnotations() ); } @@ -2637,12 +2598,12 @@ public: explicit SdNavigationOrderAccess(SdrPage* pPage); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XElementAccess - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; private: std::vector< Reference< XShape > > maShapes; @@ -2665,12 +2626,12 @@ SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage ) } // XIndexAccess -sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) { return static_cast< sal_Int32 >( maShapes.size() ); } -Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -2679,12 +2640,12 @@ Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (Index } // XElementAccess -Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException, std::exception) +Type SAL_CALL SdNavigationOrderAccess::getElementType( ) { return cppu::UnoType<XShape>::get(); } -sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) { return !maShapes.empty(); } @@ -2713,7 +2674,6 @@ SdMasterPage::~SdMasterPage() throw() // XInterface Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2750,7 +2710,7 @@ void SAL_CALL SdMasterPage::release() throw() UNO3_GETIMPLEMENTATION2_IMPL( SdMasterPage, SdGenericDrawPage ); // XTypeProvider -Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeException, std::exception) +Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() { ::SolarMutexGuard aGuard; @@ -2797,18 +2757,18 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept return maTypeSequence; } -Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() throw(uno::RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -OUString SAL_CALL SdMasterPage::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SdMasterPage::getImplementationName() { return OUString( "SdMasterPage" ); } -Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() { ::SolarMutexGuard aGuard; @@ -2824,13 +2784,12 @@ Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno } sal_Bool SAL_CALL SdMasterPage::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } // XElementAccess -sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SdMasterPage::hasElements() { ::SolarMutexGuard aGuard; @@ -2843,14 +2802,12 @@ sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException, std:: } uno::Type SAL_CALL SdMasterPage::getElementType() - throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::getElementType(); } // XIndexAccess sal_Int32 SAL_CALL SdMasterPage::getCount() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2860,7 +2817,6 @@ sal_Int32 SAL_CALL SdMasterPage::getCount() } Any SAL_CALL SdMasterPage::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2871,7 +2827,6 @@ Any SAL_CALL SdMasterPage::getByIndex( sal_Int32 Index ) // intern void SdMasterPage::setBackground( const Any& rValue ) - throw( lang::IllegalArgumentException, std::exception ) { // we need at least an beans::XPropertySet Reference< beans::XPropertySet > xInputSet( rValue, UNO_QUERY ); @@ -2976,7 +2931,7 @@ void SdMasterPage::setBackground( const Any& rValue ) } } -void SdMasterPage::getBackground( Any& rValue ) throw (std::exception) +void SdMasterPage::getBackground( Any& rValue ) { if( GetModel() ) try { @@ -3034,7 +2989,6 @@ void SdMasterPage::getBackground( Any& rValue ) throw (std::exception) // XNamed void SAL_CALL SdMasterPage::setName( const OUString& rName ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3077,7 +3031,6 @@ void SAL_CALL SdMasterPage::setName( const OUString& rName ) } OUString SAL_CALL SdMasterPage::getName( ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3094,7 +3047,6 @@ OUString SAL_CALL SdMasterPage::getName( ) // XPresentationPage Reference< drawing::XDrawPage > SAL_CALL SdMasterPage::getNotesPage() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3113,14 +3065,12 @@ Reference< drawing::XDrawPage > SAL_CALL SdMasterPage::getNotesPage() } // XShapes -void SAL_CALL SdMasterPage::add( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SdMasterPage::add( const Reference< drawing::XShape >& xShape ) { SdGenericDrawPage::add( xShape ); } void SAL_CALL SdMasterPage::remove( const Reference< drawing::XShape >& xShape ) - throw (uno::RuntimeException, - std::exception) { ::SolarMutexGuard aGuard; diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 6995461f1da1..17043a99e4c6 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -178,19 +178,16 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) // XServiceInfo OUString SAL_CALL SdUnoPageBackground::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SdUnoPageBackground"); } sal_Bool SAL_CALL SdUnoPageBackground::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNameSequence( 2 ); OUString* pStrings = aNameSequence.getArray(); @@ -203,13 +200,11 @@ uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SdUnoPageBackground::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return mpPropSet->getPropertySetInfo(); } void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -266,7 +261,6 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa } uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -318,14 +312,13 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert return aAny; } -void SAL_CALL SdUnoPageBackground::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoPageBackground::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoPageBackground::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoPageBackground::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoPageBackground::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdUnoPageBackground::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdUnoPageBackground::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} +void SAL_CALL SdUnoPageBackground::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} // XPropertyState beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -372,7 +365,6 @@ beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUStr } uno::Sequence< beans::PropertyState > SAL_CALL SdUnoPageBackground::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -389,7 +381,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL SdUnoPageBackground::getPropertyS } void SAL_CALL SdUnoPageBackground::setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -413,7 +404,6 @@ void SAL_CALL SdUnoPageBackground::setPropertyToDefault( const OUString& Propert } uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index 6e08f7bdadd8..d163f0f0dfee 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -60,24 +60,24 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoPageBackground ) // 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; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; }; #endif diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 6f60d693f590..bc3ec20dc5fb 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -48,8 +48,7 @@ public: explicit SdUnoDrawPool(SdDrawDocument* pModel) throw(); protected: - virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) - throw( beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception ) override; + virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) override; private: SdDrawDocument* mpDrawModel; @@ -61,7 +60,6 @@ SdUnoDrawPool::SdUnoDrawPool( SdDrawDocument* pModel ) throw() } void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const uno::Any& rValue ) - throw(beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception) { switch( pEntry->mnHandle ) { diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index f48ce25a7180..ad94374375dd 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -96,13 +96,11 @@ SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() throw() // util::XReplaceable uno::Reference< util::XReplaceDescriptor > SAL_CALL SdUnoSearchReplaceShape::createReplaceDescriptor() - throw( uno::RuntimeException, std::exception ) { return new SdUnoSearchReplaceDescriptor(true); } sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< util::XSearchDescriptor >& xDesc ) - throw( uno::RuntimeException, std::exception ) { SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc ); if( pDescr == nullptr ) @@ -194,13 +192,11 @@ sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< ut // XSearchable uno::Reference< css::util::XSearchDescriptor > SAL_CALL SdUnoSearchReplaceShape::createSearchDescriptor( ) - throw(css::uno::RuntimeException, std::exception) { return new SdUnoSearchReplaceDescriptor(false); } uno::Reference< css::container::XIndexAccess > SAL_CALL SdUnoSearchReplaceShape::findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) - throw(css::uno::RuntimeException, std::exception) { SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc ); if( pDescr == nullptr ) @@ -307,7 +303,6 @@ uno::Reference< css::container::XIndexAccess > SAL_CALL SdUnoSearchReplaceShape: } uno::Reference< css::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) - throw(css::uno::RuntimeException, std::exception) { uno::Reference< text::XTextRange > xRange( GetCurrentShape(), uno::UNO_QUERY ); if( xRange.is() ) @@ -342,7 +337,6 @@ uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetCurrentShape() co } uno::Reference< css::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) - throw(css::uno::RuntimeException, std::exception) { SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc ); @@ -702,7 +696,7 @@ uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetShape( const uno: UNO3_GETIMPLEMENTATION_IMPL( SdUnoSearchReplaceDescriptor ); -SdUnoSearchReplaceDescriptor::SdUnoSearchReplaceDescriptor( bool bReplace ) throw (css::uno::RuntimeException) +SdUnoSearchReplaceDescriptor::SdUnoSearchReplaceDescriptor( bool bReplace ) { mpPropSet.reset( new SvxItemPropertySet(ImplGetSearchPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool()) ); @@ -719,40 +713,34 @@ SdUnoSearchReplaceDescriptor::~SdUnoSearchReplaceDescriptor() throw() // XSearchDescriptor OUString SAL_CALL SdUnoSearchReplaceDescriptor::getSearchString() - throw(css::uno::RuntimeException, std::exception) { return maSearchStr; } void SAL_CALL SdUnoSearchReplaceDescriptor::setSearchString( const OUString& aString ) - throw(css::uno::RuntimeException, std::exception) { maSearchStr = aString; } // XReplaceDescriptor OUString SAL_CALL SdUnoSearchReplaceDescriptor::getReplaceString() - throw(css::uno::RuntimeException, std::exception) { return maReplaceStr; } void SAL_CALL SdUnoSearchReplaceDescriptor::setReplaceString( const OUString& aReplaceString ) - throw(css::uno::RuntimeException, std::exception) { maReplaceStr = aReplaceString; } // XPropertySet uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdUnoSearchReplaceDescriptor::getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpPropSet->getPropertySetInfo(); } void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -780,7 +768,6 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aP } uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString& PropertyName ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -806,10 +793,10 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString return aAny; } -void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >& ) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >& ) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >& ) {} /* ================================================================= */ @@ -824,26 +811,22 @@ SdUnoFindAllAccess::~SdUnoFindAllAccess() throw() // XElementAccess uno::Type SAL_CALL SdUnoFindAllAccess::getElementType() - throw(css::uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextRange>::get(); } sal_Bool SAL_CALL SdUnoFindAllAccess::hasElements() - throw(css::uno::RuntimeException, std::exception) { return maSequence.getLength() > 0; } // XIndexAccess sal_Int32 SAL_CALL SdUnoFindAllAccess::getCount() - throw(css::uno::RuntimeException, std::exception) { return maSequence.getLength(); } uno::Any SAL_CALL SdUnoFindAllAccess::getByIndex( sal_Int32 Index ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { uno::Any aAny; |