diff options
Diffstat (limited to 'sd/source/ui')
144 files changed, 1265 insertions, 2546 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 6f91cb7e7b6f..48b701192433 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -223,7 +223,6 @@ void AccessibleDocumentViewBase::ViewForwarderChanged() Reference<XAccessible> SAL_CALL AccessibleDocumentViewBase::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -232,7 +231,6 @@ Reference<XAccessible> SAL_CALL sal_Int32 SAL_CALL AccessibleDocumentViewBase::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -244,7 +242,6 @@ sal_Int32 SAL_CALL Reference<XAccessible> SAL_CALL AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { ThrowIfDisposed (); @@ -265,7 +262,6 @@ Reference<XAccessible> SAL_CALL uno::Reference<XAccessible > SAL_CALL AccessibleDocumentViewBase::getAccessibleAtPoint ( const awt::Point& aPoint) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -302,7 +298,6 @@ uno::Reference<XAccessible > SAL_CALL awt::Rectangle SAL_CALL AccessibleDocumentViewBase::getBounds() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -338,7 +333,6 @@ awt::Rectangle SAL_CALL awt::Point SAL_CALL AccessibleDocumentViewBase::getLocation() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -347,7 +341,6 @@ awt::Point SAL_CALL awt::Point SAL_CALL AccessibleDocumentViewBase::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); ::Point aLogicalPoint (maShapeTreeInfo.GetViewForwarder()->GetVisibleArea().TopLeft()); @@ -357,7 +350,6 @@ awt::Point SAL_CALL awt::Size SAL_CALL AccessibleDocumentViewBase::getSize() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -379,7 +371,6 @@ awt::Size SAL_CALL uno::Any SAL_CALL AccessibleDocumentViewBase::queryInterface (const uno::Type & rType) - throw (uno::RuntimeException, std::exception) { uno::Any aReturn = AccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -415,14 +406,12 @@ void SAL_CALL OUString SAL_CALL AccessibleDocumentViewBase::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleDocumentViewBase"); } css::uno::Sequence< OUString> SAL_CALL AccessibleDocumentViewBase::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return AccessibleContextBase::getSupportedServiceNames (); @@ -432,7 +421,6 @@ css::uno::Sequence< OUString> SAL_CALL css::uno::Sequence< css::uno::Type> SAL_CALL AccessibleDocumentViewBase::getTypes() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -526,7 +514,6 @@ void AccessibleDocumentViewBase::impl_dispose() void SAL_CALL AccessibleDocumentViewBase::disposing (const lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -546,7 +533,6 @@ void SAL_CALL //===== XPropertyChangeListener ============================================= void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyChangeEvent& ) - throw (css::uno::RuntimeException, std::exception) { // Empty } @@ -555,7 +541,6 @@ void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyC void SAL_CALL AccessibleDocumentViewBase::windowResized (const css::awt::WindowEvent& ) - throw (css::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -565,7 +550,6 @@ void SAL_CALL void SAL_CALL AccessibleDocumentViewBase::windowMoved (const css::awt::WindowEvent& ) - throw (css::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -575,7 +559,6 @@ void SAL_CALL void SAL_CALL AccessibleDocumentViewBase::windowShown (const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -585,7 +568,6 @@ void SAL_CALL void SAL_CALL AccessibleDocumentViewBase::windowHidden (const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -596,7 +578,6 @@ void SAL_CALL //===== XFocusListener ================================================== void AccessibleDocumentViewBase::focusGained (const css::awt::FocusEvent& e) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (e.Source == mxWindow) @@ -604,7 +585,6 @@ void AccessibleDocumentViewBase::focusGained (const css::awt::FocusEvent& e) } void AccessibleDocumentViewBase::focusLost (const css::awt::FocusEvent& e) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (e.Source == mxWindow) @@ -624,7 +604,6 @@ void SAL_CALL AccessibleDocumentViewBase::disposing() /// Create a name for this view. OUString AccessibleDocumentViewBase::CreateAccessibleName() - throw (css::uno::RuntimeException, std::exception) { return OUString ("AccessibleDocumentViewBase"); } @@ -634,7 +613,6 @@ OUString */ OUString AccessibleDocumentViewBase::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { OUString sDescription; @@ -702,7 +680,6 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject ( // return ourself as context in default case uno::Reference< XAccessibleContext > AccessibleDocumentViewBase::implGetAccessibleContext() - throw (uno::RuntimeException) { return this; } @@ -710,7 +687,6 @@ uno::Reference< XAccessibleContext > // return sal_False in default case bool AccessibleDocumentViewBase::implIsSelected( sal_Int32 ) - throw (uno::RuntimeException) { return false; } @@ -718,14 +694,10 @@ bool // return nothing in default case void AccessibleDocumentViewBase::implSelect( sal_Int32, bool ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { } uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -850,7 +822,6 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() css::uno::Sequence< css::uno::Any > SAL_CALL AccessibleDocumentViewBase::getAccFlowTo(const css::uno::Any&, sal_Int32 ) - throw ( css::uno::RuntimeException, std::exception ) { css::uno::Sequence< uno::Any> aRet; @@ -858,13 +829,11 @@ css::uno::Sequence< css::uno::Any > } sal_Int32 SAL_CALL AccessibleDocumentViewBase::getForeground( ) - throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL AccessibleDocumentViewBase::getBackground( ) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 1f18b700547e..0e43dede5120 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -185,7 +185,6 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh sal_Int32 SAL_CALL AccessibleDrawDocumentView::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -200,7 +199,6 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible> SAL_CALL AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { ThrowIfDisposed (); @@ -234,7 +232,6 @@ uno::Reference<XAccessible> SAL_CALL OUString SAL_CALL AccessibleDrawDocumentView::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -272,7 +269,6 @@ OUString SAL_CALL void SAL_CALL AccessibleDrawDocumentView::disposing (const lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -290,7 +286,6 @@ void SAL_CALL void SAL_CALL AccessibleDrawDocumentView::propertyChange (const beans::PropertyChangeEvent& rEventObject) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -382,14 +377,12 @@ void SAL_CALL OUString SAL_CALL AccessibleDrawDocumentView::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleDrawDocumentView"); } css::uno::Sequence< OUString> SAL_CALL AccessibleDrawDocumentView::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // Get list of supported service names from base class... @@ -408,7 +401,6 @@ css::uno::Sequence< OUString> SAL_CALL uno::Any SAL_CALL AccessibleDrawDocumentView::queryInterface (const uno::Type & rType) - throw (uno::RuntimeException, std::exception) { uno::Any aReturn = AccessibleDocumentViewBase::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -433,7 +425,6 @@ void SAL_CALL //===== XAccessibleGroupPosition ========================================= uno::Sequence< sal_Int32 > SAL_CALL AccessibleDrawDocumentView::getGroupPosition( const uno::Any& rAny ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -507,7 +498,6 @@ uno::Sequence< sal_Int32 > SAL_CALL } OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -541,7 +531,6 @@ OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny ) /// Create a name for this view. OUString AccessibleDrawDocumentView::CreateAccessibleName() - throw (css::uno::RuntimeException, std::exception) { OUString sName; @@ -594,7 +583,6 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName() */ OUString AccessibleDrawDocumentView::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { OUString sDescription; @@ -646,7 +634,6 @@ OUString */ bool AccessibleDrawDocumentView::implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (uno::RuntimeException) { const SolarMutexGuard aSolarGuard; uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY ); @@ -688,7 +675,6 @@ bool */ void AccessibleDrawDocumentView::implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { const SolarMutexGuard aSolarGuard; uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY ); @@ -828,7 +814,6 @@ void SAL_CALL AccessibleDrawDocumentView::disposing() css::uno::Sequence< css::uno::Any > SAL_CALL AccessibleDrawDocumentView::getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) - throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index a3280ece0c2b..0d627e3b99fd 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -113,7 +113,6 @@ void AccessibleOutlineView::ViewForwarderChanged() sal_Int32 SAL_CALL AccessibleOutlineView::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -123,7 +122,6 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible> SAL_CALL AccessibleOutlineView::getAccessibleChild (sal_Int32 nIndex) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Forward request to children manager. @@ -132,7 +130,6 @@ uno::Reference<XAccessible> SAL_CALL OUString SAL_CALL AccessibleOutlineView::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -160,7 +157,7 @@ OUString SAL_CALL //===== XAccessibleEventBroadcaster ======================================== -void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { // delegate listener handling to children manager. if ( ! IsDisposed()) @@ -168,7 +165,7 @@ void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Refe AccessibleContextBase::addEventListener(xListener); } -void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { // forward if ( ! IsDisposed()) @@ -180,7 +177,6 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R OUString SAL_CALL AccessibleOutlineView::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleOutlineView"); } @@ -217,7 +213,6 @@ void SAL_CALL AccessibleOutlineView::disposing() void SAL_CALL AccessibleOutlineView::propertyChange (const beans::PropertyChangeEvent& rEventObject) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -245,7 +240,6 @@ void SAL_CALL /// Create a name for this view. OUString AccessibleOutlineView::CreateAccessibleName() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -257,7 +251,6 @@ OUString */ OUString AccessibleOutlineView::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 1ab3529fc997..643bc125925b 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -57,7 +57,6 @@ AccessiblePageShape::~AccessiblePageShape() sal_Int32 SAL_CALL AccessiblePageShape::getAccessibleChildCount() - throw (std::exception) { return 0; } @@ -67,7 +66,6 @@ sal_Int32 SAL_CALL */ uno::Reference<XAccessible> SAL_CALL AccessiblePageShape::getAccessibleChild( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException ("page shape has no children", static_cast<uno::XWeak*>(this)); @@ -76,7 +74,6 @@ uno::Reference<XAccessible> SAL_CALL //===== XAccessibleComponent ================================================ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -138,7 +135,6 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds() } sal_Int32 SAL_CALL AccessiblePageShape::getForeground() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -164,7 +160,6 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground() draw page or its master page. */ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x01020ffL); @@ -213,7 +208,6 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground() OUString SAL_CALL AccessiblePageShape::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return OUString("AccessiblePageShape"); @@ -221,7 +215,6 @@ OUString SAL_CALL css::uno::Sequence< OUString> SAL_CALL AccessiblePageShape::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return AccessibleShape::getSupportedServiceNames(); @@ -231,7 +224,6 @@ css::uno::Sequence< OUString> SAL_CALL void SAL_CALL AccessiblePageShape::disposing (const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); AccessibleShape::disposing (aEvent); @@ -240,7 +232,6 @@ void SAL_CALL //===== XComponent ========================================================== void AccessiblePageShape::dispose() - throw (css::uno::RuntimeException, std::exception) { // Unregister listeners. Reference<lang::XComponent> xComponent (mxShape, uno::UNO_QUERY); @@ -258,14 +249,12 @@ void AccessiblePageShape::dispose() OUString AccessiblePageShape::CreateAccessibleBaseName() - throw (css::uno::RuntimeException) { return OUString ("PageShape"); } OUString AccessiblePageShape::CreateAccessibleName() - throw (css::uno::RuntimeException) { Reference<beans::XPropertySet> xPageProperties (mxPage, UNO_QUERY); @@ -287,7 +276,6 @@ OUString OUString AccessiblePageShape::CreateAccessibleDescription() - throw (css::uno::RuntimeException) { return OUString ("Page Shape"); } diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index fcda6c8ad698..67d9bc73533c 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -46,7 +46,6 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape() OUString SAL_CALL AccessiblePresentationGraphicShape::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationGraphicShape"); } @@ -54,7 +53,6 @@ OUString SAL_CALL /// Set this object's name if is different to the current name. OUString AccessiblePresentationGraphicShape::CreateAccessibleBaseName() - throw (css::uno::RuntimeException) { OUString sName; @@ -76,7 +74,6 @@ OUString OUString AccessiblePresentationGraphicShape::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { // return createAccessibleName (); DescriptionGenerator aDG (mxShape); @@ -100,7 +97,6 @@ OUString } sal_Int16 SAL_CALL AccessiblePresentationGraphicShape::getAccessibleRole () - throw (css::uno::RuntimeException, std::exception) { return AccessibleRole::GRAPHIC ; } diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 2a341a20af48..0cfc2e52f120 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -46,7 +46,6 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape() OUString SAL_CALL AccessiblePresentationOLEShape::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationOLEShape"); } @@ -54,7 +53,6 @@ OUString SAL_CALL /// Set this object's name if it is different to the current name. OUString AccessiblePresentationOLEShape::CreateAccessibleBaseName() - throw (css::uno::RuntimeException) { OUString sName; @@ -82,7 +80,6 @@ OUString OUString AccessiblePresentationOLEShape::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { // return createAccessibleName(); DescriptionGenerator aDG (mxShape); @@ -119,7 +116,6 @@ OUString // Return this object's role. sal_Int16 SAL_CALL AccessiblePresentationOLEShape::getAccessibleRole () - throw (css::uno::RuntimeException, std::exception) { return AccessibleRole::EMBEDDED_OBJECT ; } diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index e2906a6d6bd6..410b3cd2e664 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -48,14 +48,12 @@ AccessiblePresentationShape::~AccessiblePresentationShape() OUString SAL_CALL AccessiblePresentationShape::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationShape"); } /// Set this object's name if is different to the current name. OUString AccessiblePresentationShape::CreateAccessibleBaseName() - throw (css::uno::RuntimeException, std::exception) { OUString sName; @@ -104,7 +102,6 @@ OUString AccessiblePresentationShape::CreateAccessibleBaseName() OUString AccessiblePresentationShape::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { // return createAccessibleName (); DescriptionGenerator aDG (mxShape); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 04d43dd2f11c..22eeb2160eea 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -99,7 +99,6 @@ void SAL_CALL AccessibleSlideSorterObject::disposing() Reference<XAccessibleContext> SAL_CALL AccessibleSlideSorterObject::getAccessibleContext() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return this; @@ -108,28 +107,24 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ==================================================== sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return 0; } Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int32 ) - throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); throw lang::IndexOutOfBoundsException(); } Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxParent; } sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -155,7 +150,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() } sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); //set Role = Shape @@ -165,14 +159,12 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole() } OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return SD_RESSTR(STR_PAGE); } OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -186,7 +178,6 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName() Reference<XAccessibleRelationSet> SAL_CALL AccessibleSlideSorterObject::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return Reference<XAccessibleRelationSet>(); @@ -194,7 +185,6 @@ Reference<XAccessibleRelationSet> SAL_CALL Reference<XAccessibleStateSet> SAL_CALL AccessibleSlideSorterObject::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -223,8 +213,6 @@ Reference<XAccessibleStateSet> SAL_CALL } lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale() - throw (IllegalAccessibleComponentStateException, - RuntimeException, std::exception) { ThrowIfDisposed(); // Delegate request to parent. @@ -244,7 +232,6 @@ lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale() void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener( const Reference<XAccessibleEventListener>& rxListener) - throw (RuntimeException, std::exception) { if (rxListener.is()) { @@ -266,7 +253,6 @@ void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener( void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener( const Reference<XAccessibleEventListener>& rxListener) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); if (rxListener.is() && mnClientId) @@ -289,7 +275,6 @@ void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener( //===== XAccessibleComponent ================================================== sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& aPoint) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Size aSize (getSize()); @@ -301,13 +286,11 @@ sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& a Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleAtPoint(const awt::Point& ) - throw (uno::RuntimeException, std::exception) { return nullptr; } awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds() - throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -341,7 +324,6 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds() } awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () - throw (RuntimeException, std::exception) { ThrowIfDisposed (); const awt::Rectangle aBBox (getBounds()); @@ -349,7 +331,6 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () } awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen() - throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -372,7 +353,6 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen() } awt::Size SAL_CALL AccessibleSlideSorterObject::getSize() - throw (RuntimeException, std::exception) { ThrowIfDisposed (); const awt::Rectangle aBBox (getBounds()); @@ -380,13 +360,11 @@ awt::Size SAL_CALL AccessibleSlideSorterObject::getSize() } void SAL_CALL AccessibleSlideSorterObject::grabFocus() - throw (RuntimeException, std::exception) { // nothing to do } sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); svtools::ColorConfig aColorConfig; @@ -395,7 +373,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground() } sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -405,20 +382,17 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground() // XServiceInfo OUString SAL_CALL AccessibleSlideSorterObject::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterObject"); } sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterObject::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -429,7 +403,6 @@ uno::Sequence< OUString> SAL_CALL } void AccessibleSlideSorterObject::ThrowIfDisposed() - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index de4949ef0403..d4225e6f5e4b 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -183,7 +183,6 @@ void AccessibleSlideSorterView::Destroyed() Reference<XAccessibleContext > SAL_CALL AccessibleSlideSorterView::getAccessibleContext() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); return this; @@ -192,7 +191,6 @@ Reference<XAccessibleContext > SAL_CALL //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (maMutex); @@ -201,7 +199,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleChild (sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (maMutex); @@ -213,7 +210,6 @@ Reference<XAccessible > SAL_CALL } Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -230,7 +226,6 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent( } sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { OSL_ASSERT(getAccessibleParent().is()); ThrowIfDisposed(); @@ -254,7 +249,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() } sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); static sal_Int16 nRole = AccessibleRole::DOCUMENT; @@ -262,7 +256,6 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole() } OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -271,7 +264,6 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription() } OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -281,14 +273,12 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName() Reference<XAccessibleRelationSet> SAL_CALL AccessibleSlideSorterView::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { return Reference<XAccessibleRelationSet>(); } Reference<XAccessibleStateSet > SAL_CALL AccessibleSlideSorterView::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -312,8 +302,6 @@ Reference<XAccessibleStateSet > SAL_CALL } lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale() - throw (IllegalAccessibleComponentStateException, - RuntimeException, std::exception) { ThrowIfDisposed (); Reference<XAccessibleContext> xParentContext; @@ -330,7 +318,6 @@ lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale() void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) - throw (RuntimeException, std::exception) { if (rxListener.is()) { @@ -352,7 +339,6 @@ void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (rxListener.is()) @@ -379,7 +365,6 @@ void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener( //===== XAccessibleComponent ================================================== sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aPoint) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Rectangle aBBox (getBounds()); @@ -391,7 +376,6 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aP Reference<XAccessible> SAL_CALL AccessibleSlideSorterView::getAccessibleAtPoint (const awt::Point& aPoint) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); Reference<XAccessible> xAccessible; @@ -408,7 +392,6 @@ Reference<XAccessible> SAL_CALL } awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -429,7 +412,6 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds() } awt::Point SAL_CALL AccessibleSlideSorterView::getLocation() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); awt::Point aLocation; @@ -448,7 +430,6 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocation() and our own relative location. */ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -471,7 +452,6 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() } awt::Size SAL_CALL AccessibleSlideSorterView::getSize() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); awt::Size aSize; @@ -487,7 +467,6 @@ awt::Size SAL_CALL AccessibleSlideSorterView::getSize() } void SAL_CALL AccessibleSlideSorterView::grabFocus() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -497,7 +476,6 @@ void SAL_CALL AccessibleSlideSorterView::grabFocus() } sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); svtools::ColorConfig aColorConfig; @@ -506,7 +484,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground() } sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -516,8 +493,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground() //===== XAccessibleSelection ================================================== void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChildIndex) - throw (lang::IndexOutOfBoundsException, - RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -530,8 +505,6 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild } sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int32 nChildIndex) - throw (lang::IndexOutOfBoundsException, - RuntimeException, std::exception) { ThrowIfDisposed(); bool bIsSelected = false; @@ -548,7 +521,6 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3 } void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -557,7 +529,6 @@ void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection() } void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -566,7 +537,6 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren() } sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); const SolarMutexGuard aSolarGuard; @@ -575,7 +545,6 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int32 nSelectedChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed (); const SolarMutexGuard aSolarGuard; @@ -603,8 +572,6 @@ Reference<XAccessible > SAL_CALL } void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChildIndex) - throw (lang::IndexOutOfBoundsException, - RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -619,20 +586,17 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi // XServiceInfo OUString SAL_CALL AccessibleSlideSorterView::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterView"); } sal_Bool SAL_CALL AccessibleSlideSorterView::supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterView::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -644,7 +608,6 @@ uno::Sequence< OUString> SAL_CALL } void AccessibleSlideSorterView::ThrowIfDisposed() - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index a05b01182ce4..b793469b6c8d 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -1161,7 +1161,7 @@ SdrObjClosedKind MotionPathTag::GetMarkedObjectsClosedState() const } // XChangesListener -void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ ) throw (RuntimeException, std::exception) +void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ ) { if( mpPathObj && !mbInUpdatePath && (mpEffect->getPath() != msLastPath) ) { @@ -1174,13 +1174,13 @@ void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ ) th } } -void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) +void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) { if( mpPathObj ) Dispose(); } -Any SAL_CALL MotionPathTag::queryInterface( const css::uno::Type& aType ) throw (RuntimeException, std::exception) +Any SAL_CALL MotionPathTag::queryInterface( const css::uno::Type& aType ) { if( aType == cppu::UnoType<XChangesListener>::get() ) return Any( Reference< XChangesListener >( this ) ); diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index bfd035d034c3..ebb6a55c8a71 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -85,9 +85,9 @@ public: bool OnMove( const KeyEvent& rKEvt ); // XChangesListener - virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index f2fcd2ce7112..2c75dff8bf4a 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -231,7 +231,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () } // XEventListener -void SAL_CALL AnnotationManagerImpl::notifyEvent( const css::document::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AnnotationManagerImpl::notifyEvent( const css::document::EventObject& aEvent ) { if( aEvent.EventName == "OnAnnotationInserted" || aEvent.EventName == "OnAnnotationRemoved" || aEvent.EventName == "OnAnnotationChanged" ) { @@ -239,7 +239,7 @@ void SAL_CALL AnnotationManagerImpl::notifyEvent( const css::document::EventObje } } -void SAL_CALL AnnotationManagerImpl::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AnnotationManagerImpl::disposing( const css::lang::EventObject& /*Source*/ ) { } diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 04ceb976e5c0..b860118cfdd5 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -58,8 +58,8 @@ public: virtual void SAL_CALL disposing () override; // XEventListener - virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 796974590294..4e512d410aa2 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -740,7 +740,7 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar } } -sal_Int64 SAL_CALL SdTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL SdTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index a0e848a39b65..c6e695ed9ada 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -37,12 +37,11 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() 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 css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void setToolboxItemImage( sal_uInt16 nImage ); @@ -228,7 +227,6 @@ DisplayModeController::DisplayModeController( const css::uno::Reference< css::un } void SAL_CALL DisplayModeController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); ToolBox* pToolBox = nullptr; @@ -264,12 +262,12 @@ void DisplayModeController::setToolboxItemImage( sal_uInt16 nImage ) // XServiceInfo -OUString SAL_CALL DisplayModeController::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL DisplayModeController::getImplementationName() { return OUString( "com.sun.star.comp.sd.DisplayModeController" ); } -Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames( ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames( ) { css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController" }; return aRet; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index acdad1d98c82..ea56c4a8b6ac 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -309,26 +309,26 @@ void LayoutToolbarMenu::SelectHdl(void* pControl) } /// @throws css::uno::RuntimeException -OUString SlideLayoutController_getImplementationName() throw (css::uno::RuntimeException) +OUString SlideLayoutController_getImplementationName() { return OUString( "com.sun.star.comp.sd.SlideLayoutController" ); } /// @throws RuntimeException -Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SlideLayoutController_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } /// @throws css::uno::RuntimeException -OUString InsertSlideController_getImplementationName() throw (css::uno::RuntimeException) +OUString InsertSlideController_getImplementationName() { return OUString( "com.sun.star.comp.sd.InsertSlideController" ); } /// @throws RuntimeException -Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > InsertSlideController_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; @@ -343,7 +343,6 @@ SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentCo } void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); @@ -365,7 +364,7 @@ VclPtr<vcl::Window> SlideLayoutController::createPopupWindow( vcl::Window* pPare // XServiceInfo -OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SlideLayoutController::getImplementationName() { if( mbInsertPage ) return InsertSlideController_getImplementationName(); @@ -373,7 +372,7 @@ OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeE return SlideLayoutController_getImplementationName(); } -Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( ) { if( mbInsertPage ) return InsertSlideController_getSupportedServiceNames(); diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index f9a6d21e5a47..b81e30af6dcb 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -35,12 +35,11 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() 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 css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; using svt::PopupWindowController::createPopupWindow; private: diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index bef35545c845..fcb8cca4c0ba 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -51,7 +51,6 @@ ClientBoxEntry::~ClientBoxEntry() {} void ClientRemovedListener::disposing( lang::EventObject const & rEvt ) - throw ( uno::RuntimeException, std::exception ) { (void) rEvt; } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index d6ffe9dc7f49..597c9e4fca45 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -80,8 +80,7 @@ public: virtual ~ClientRemovedListener() override; // XEventListener - virtual void SAL_CALL disposing(css::lang::EventObject const & evt) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(css::lang::EventObject const & evt) override; }; class ClientBox : public Control diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index c0be5330c245..c1c6bab04031 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -139,7 +139,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction ) SdTransferable::DragFinished(nDropAction); } -sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 710687da1290..4909a8ee1a5d 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -90,7 +90,6 @@ void SAL_CALL Configuration::disposing() //----- XConfiguration -------------------------------------------------------- void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResourceId) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -108,7 +107,6 @@ void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResour } void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxResourceId) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -130,7 +128,6 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( const Reference<XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, AnchorBindingMode eMode) - throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -172,7 +169,6 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( } sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxResourceId) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -184,7 +180,6 @@ sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxRe //----- XCloneable ------------------------------------------------------------ Reference<util::XCloneable> SAL_CALL Configuration::createClone() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -200,7 +195,6 @@ Reference<util::XCloneable> SAL_CALL Configuration::createClone() //----- XNamed ---------------------------------------------------------------- OUString SAL_CALL Configuration::getName() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); OUString aString; @@ -224,26 +218,22 @@ OUString SAL_CALL Configuration::getName() } void SAL_CALL Configuration::setName (const OUString& rsName) - throw (RuntimeException, std::exception) { (void)rsName; // rsName is ignored. } OUString Configuration::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString( "com.sun.star.comp.Draw.framework.configuration.Configuration"); } sal_Bool Configuration::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> Configuration::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ "com.sun.star.drawing.framework.Configuration"}; @@ -276,7 +266,6 @@ void Configuration::PostEvent ( } void Configuration::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index daec78bc54cd..a9d451a8d4dd 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -170,7 +170,6 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener, const OUString& rsEventType, const Any& rUserData) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -181,7 +180,6 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener ( void SAL_CALL ConfigurationController::removeConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -191,7 +189,6 @@ void SAL_CALL ConfigurationController::removeConfigurationChangeListener ( void SAL_CALL ConfigurationController::notifyEvent ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); mpImplementation->mpBroadcaster->NotifyListeners(rEvent); @@ -200,7 +197,6 @@ void SAL_CALL ConfigurationController::notifyEvent ( //----- XConfigurationController ---------------------------------------------- void SAL_CALL ConfigurationController::lock() - throw (RuntimeException, std::exception) { OSL_ASSERT(mpImplementation.get()!=nullptr); OSL_ASSERT(mpImplementation->mpConfigurationUpdater.get()!=nullptr); @@ -215,7 +211,6 @@ void SAL_CALL ConfigurationController::lock() } void SAL_CALL ConfigurationController::unlock() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -233,7 +228,6 @@ void SAL_CALL ConfigurationController::unlock() void SAL_CALL ConfigurationController::requestResourceActivation ( const Reference<XResourceId>& rxResourceId, ResourceActivationMode eMode) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -291,7 +285,6 @@ void SAL_CALL ConfigurationController::requestResourceActivation ( void SAL_CALL ConfigurationController::requestResourceDeactivation ( const Reference<XResourceId>& rxResourceId) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -329,7 +322,6 @@ void SAL_CALL ConfigurationController::requestResourceDeactivation ( Reference<XResource> SAL_CALL ConfigurationController::getResource ( const Reference<XResourceId>& rxResourceId) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -340,7 +332,6 @@ Reference<XResource> SAL_CALL ConfigurationController::getResource ( } void SAL_CALL ConfigurationController::update() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -359,7 +350,6 @@ void SAL_CALL ConfigurationController::update() } sal_Bool SAL_CALL ConfigurationController::hasPendingRequests() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -369,7 +359,6 @@ sal_Bool SAL_CALL ConfigurationController::hasPendingRequests() void SAL_CALL ConfigurationController::postChangeRequest ( const Reference<XConfigurationChangeRequest>& rxRequest) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -378,7 +367,6 @@ void SAL_CALL ConfigurationController::postChangeRequest ( } Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -391,7 +379,6 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfigur } Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -409,7 +396,6 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfigurat */ void SAL_CALL ConfigurationController::restoreConfiguration ( const Reference<XConfiguration>& rxNewConfiguration) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -470,7 +456,6 @@ void SAL_CALL ConfigurationController::restoreConfiguration ( void SAL_CALL ConfigurationController::addResourceFactory( const OUString& sResourceURL, const Reference<XResourceFactory>& rxResourceFactory) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -479,7 +464,6 @@ void SAL_CALL ConfigurationController::addResourceFactory( void SAL_CALL ConfigurationController::removeResourceFactoryForURL( const OUString& sResourceURL) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -488,7 +472,6 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForURL( void SAL_CALL ConfigurationController::removeResourceFactoryForReference( const Reference<XResourceFactory>& rxResourceFactory) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -497,7 +480,6 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForReference( Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory ( const OUString& sResourceURL) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -508,7 +490,6 @@ Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory //----- XInitialization ------------------------------------------------------- void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -523,7 +504,6 @@ void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArgumen } void ConfigurationController::ThrowIfDisposed () const - throw (css::lang::DisposedException, css::uno::RuntimeException) { if (mbIsDisposed) { diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index 090eed3cf4fe..770b6c414db9 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -29,7 +29,7 @@ namespace sd { namespace framework { GenericConfigurationChangeRequest::GenericConfigurationChangeRequest ( const Reference<XResourceId>& rxResourceId, - const Mode eMode) throw(css::lang::IllegalArgumentException) + const Mode eMode) : GenericConfigurationChangeRequestInterfaceBase(MutexOwner::maMutex), mxResourceId(rxResourceId), meMode(eMode) @@ -44,7 +44,6 @@ GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest() throw() void SAL_CALL GenericConfigurationChangeRequest::execute ( const Reference<XConfiguration>& rxConfiguration) - throw (RuntimeException, std::exception) { if (rxConfiguration.is()) { @@ -62,7 +61,6 @@ void SAL_CALL GenericConfigurationChangeRequest::execute ( } OUString SAL_CALL GenericConfigurationChangeRequest::getName() - throw (RuntimeException, std::exception) { return "GenericConfigurationChangeRequest " + (meMode==Activation ? OUString("activate ") : OUString("deactivate ")) @@ -70,7 +68,6 @@ OUString SAL_CALL GenericConfigurationChangeRequest::getName() } void SAL_CALL GenericConfigurationChangeRequest::setName (const OUString& rsName) - throw (RuntimeException, std::exception) { (void)rsName; // Ignored. diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index 9582cdb4169d..ba0366d16127 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -64,8 +64,7 @@ public: GenericConfigurationChangeRequest ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, - const Mode eMode) - throw (css::lang::IllegalArgumentException); + const Mode eMode); virtual ~GenericConfigurationChangeRequest() throw() override; @@ -79,22 +78,19 @@ public: The configuration to which the requested change is made. */ virtual void SAL_CALL execute ( - const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) override; // XNamed /** Return a human readable string representation. This is used for debugging purposes. */ - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName (const OUString& rName) override; private: const css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId; diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index fa4f94a50a81..29a157d7fd12 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -58,7 +58,6 @@ ResourceFactoryManager::~ResourceFactoryManager() void ResourceFactoryManager::AddFactory ( const OUString& rsURL, const Reference<XResourceFactory>& rxFactory) - throw (RuntimeException) { if ( ! rxFactory.is()) throw lang::IllegalArgumentException(); @@ -92,7 +91,6 @@ void ResourceFactoryManager::AddFactory ( void ResourceFactoryManager::RemoveFactoryForURL ( const OUString& rsURL) - throw (RuntimeException) { if (rsURL.isEmpty()) throw lang::IllegalArgumentException(); @@ -124,7 +122,6 @@ void ResourceFactoryManager::RemoveFactoryForURL ( void ResourceFactoryManager::RemoveFactoryForReference( const Reference<XResourceFactory>& rxFactory) - throw (RuntimeException) { ::osl::MutexGuard aGuard (maMutex); @@ -153,7 +150,6 @@ void ResourceFactoryManager::RemoveFactoryForReference( Reference<XResourceFactory> ResourceFactoryManager::GetFactory ( const OUString& rsCompleteURL) - throw (RuntimeException) { OUString sURLBase (rsCompleteURL); if (mxURLTransformer.is()) @@ -184,7 +180,6 @@ Reference<XResourceFactory> ResourceFactoryManager::GetFactory ( } Reference<XResourceFactory> ResourceFactoryManager::FindFactory (const OUString& rsURLBase) - throw (RuntimeException) { ::osl::MutexGuard aGuard (maMutex); FactoryMap::const_iterator iFactory (maFactoryMap.find(rsURLBase)); diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index c6ab5c9a09ad..ed0370107d98 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -53,8 +53,7 @@ public: */ void AddFactory ( const OUString& rsURL, - const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory) - throw (css::uno::RuntimeException); + const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory); /** Unregister the specified factory. @param rsURL @@ -63,8 +62,7 @@ public: @throws css::uno::RuntimeException */ void RemoveFactoryForURL( - const OUString& rsURL) - throw (css::uno::RuntimeException); + const OUString& rsURL); /** Unregister the specified factory. @param rxFactory @@ -73,8 +71,7 @@ public: @throws css::uno::RuntimeException */ void RemoveFactoryForReference( - const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory) - throw (css::uno::RuntimeException); + const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxFactory); /** Return a factory that can create resources specified by the given URL. @param rsCompleteURL @@ -86,8 +83,7 @@ public: @throws css::uno::RuntimeException */ css::uno::Reference<css::drawing::framework::XResourceFactory> GetFactory ( - const OUString& rsURL) - throw (css::uno::RuntimeException); + const OUString& rsURL); private: ::osl::Mutex maMutex; @@ -116,8 +112,7 @@ private: @throws css::uno::RuntimeException */ css::uno::Reference<css::drawing::framework::XResourceFactory> FindFactory ( - const OUString& rsURLBase) - throw (css::uno::RuntimeException); + const OUString& rsURLBase); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 04b354e3c2b4..7eec7882c999 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -109,7 +109,6 @@ ResourceId::~ResourceId() OUString SAL_CALL ResourceId::getResourceURL() - throw(css::uno::RuntimeException, std::exception) { if (!maResourceURLs.empty()) return maResourceURLs[0]; @@ -119,7 +118,6 @@ OUString SAL_CALL util::URL SAL_CALL ResourceId::getFullResourceURL() - throw(css::uno::RuntimeException, std::exception) { if (mpURL.get() != nullptr) return *mpURL; @@ -141,14 +139,12 @@ util::URL SAL_CALL sal_Bool SAL_CALL ResourceId::hasAnchor() - throw (RuntimeException, std::exception) { return maResourceURLs.size()>1; } Reference<XResourceId> SAL_CALL ResourceId::getAnchor() - throw (RuntimeException, std::exception) { ::rtl::Reference<ResourceId> rResourceId (new ResourceId()); const sal_Int32 nAnchorCount (maResourceURLs.size()-1); @@ -163,7 +159,6 @@ Reference<XResourceId> SAL_CALL Sequence<OUString> SAL_CALL ResourceId::getAnchorURLs() - throw (RuntimeException, std::exception) { const sal_Int32 nAnchorCount (maResourceURLs.size() - 1); if (nAnchorCount > 0) @@ -179,7 +174,6 @@ Sequence<OUString> SAL_CALL OUString SAL_CALL ResourceId::getResourceTypePrefix() - throw (RuntimeException, std::exception) { if (!maResourceURLs.empty() ) { @@ -201,7 +195,6 @@ OUString SAL_CALL sal_Int16 SAL_CALL ResourceId::compareTo (const Reference<XResourceId>& rxResourceId) - throw (RuntimeException, std::exception) { sal_Int16 nResult (0); @@ -327,7 +320,6 @@ sal_Bool SAL_CALL ResourceId::isBoundTo ( const Reference<XResourceId>& rxResourceId, AnchorBindingMode eMode) - throw (RuntimeException, std::exception) { if ( ! rxResourceId.is()) { @@ -355,14 +347,12 @@ sal_Bool SAL_CALL ResourceId::isBoundToURL ( const OUString& rsAnchorURL, AnchorBindingMode eMode) - throw (RuntimeException, std::exception) { return IsBoundToAnchor(&rsAnchorURL, nullptr, eMode); } Reference<XResourceId> SAL_CALL ResourceId::clone() - throw(RuntimeException, std::exception) { return new ResourceId(maResourceURLs); } @@ -370,7 +360,6 @@ Reference<XResourceId> SAL_CALL //----- XInitialization ------------------------------------------------------- void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) - throw (RuntimeException, std::exception) { sal_uInt32 nCount (aArguments.getLength()); for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) @@ -399,19 +388,16 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) } OUString ResourceId::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.framework.ResourceId"); } sal_Bool ResourceId::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> ResourceId::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ "com.sun.star.drawing.framework.ResourceId"}; diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index 10142f9b1501..fdbb7ca24909 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -38,7 +38,6 @@ UpdateRequest::~UpdateRequest() throw() } void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfiguration) - throw (RuntimeException, std::exception) { (void)rxConfiguration; // Do nothing here. The configuration is updated when the request queue @@ -46,13 +45,11 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu } OUString SAL_CALL UpdateRequest::getName() - throw (RuntimeException, std::exception) { return OUString("UpdateRequest"); } void SAL_CALL UpdateRequest::setName (const OUString& rsName) - throw (RuntimeException, std::exception) { (void)rsName; // Ignored. diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index 54c11b2878a9..fb2b00e20c8a 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -52,22 +52,19 @@ public: // XConfigurationChangeOperation virtual void SAL_CALL execute ( - const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration) override; // XNamed /** Return a human readable string representation. This is used for debugging purposes. */ - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName (const OUString& rName) override; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index aa072a15ed88..e94ea93230d2 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -126,7 +126,6 @@ void SAL_CALL BasicPaneFactory::disposing() } void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException, std::exception) { if (aArguments.getLength() > 0) { @@ -208,7 +207,6 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments) Reference<XResource> SAL_CALL BasicPaneFactory::createResource ( const Reference<XResourceId>& rxPaneId) - throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { ThrowIfDisposed(); @@ -275,7 +273,6 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource ( void SAL_CALL BasicPaneFactory::releaseResource ( const Reference<XResource>& rxPane) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -328,7 +325,6 @@ void SAL_CALL BasicPaneFactory::releaseResource ( void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( const ConfigurationChangeEvent& /* rEvent */ ) - throw (RuntimeException, std::exception) { // FIXME: nothing to do } @@ -337,7 +333,6 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( void SAL_CALL BasicPaneFactory::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (mxConfigurationControllerWeak == rEventObject.Source) { @@ -429,7 +424,6 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( } void BasicPaneFactory::ThrowIfDisposed() const - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 82df2a858884..52e333e346ef 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -69,32 +69,27 @@ public: // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& aArguments) override; // XResourceFactory virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( - const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId) override; virtual void SAL_CALL releaseResource ( - const css::uno::Reference<css::drawing::framework::XResource>& rxPane) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResource>& rxPane) override; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // lang::XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEventObject) override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; @@ -134,8 +129,7 @@ private: const PaneDescriptor& rDescriptor); /// @throws css::lang::DisposedException - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 9efdefb9a820..407310085826 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -71,7 +71,6 @@ void BasicToolBarFactory::Shutdown() //----- XInitialization ------------------------------------------------------- void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException, std::exception) { if (aArguments.getLength() > 0) { @@ -124,7 +123,6 @@ void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments) void SAL_CALL BasicToolBarFactory::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (rEventObject.Source == mxConfigurationController) mxConfigurationController = nullptr; @@ -134,7 +132,6 @@ void SAL_CALL BasicToolBarFactory::disposing ( Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( const Reference<XResourceId>& rxToolBarId) - throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { ThrowIfDisposed(); @@ -152,7 +149,6 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( void SAL_CALL BasicToolBarFactory::releaseResource ( const Reference<XResource>& rxToolBar) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -162,7 +158,6 @@ void SAL_CALL BasicToolBarFactory::releaseResource ( } void BasicToolBarFactory::ThrowIfDisposed() const - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index bafef33ca6bc..28c5215d8a7e 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -63,26 +63,22 @@ public: virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference< - css::drawing::framework::XResourceId>& rxToolBarId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override; + css::drawing::framework::XResourceId>& rxToolBarId) override; virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& - rxToolBar) - throw (css::uno::RuntimeException, std::exception) override; + rxToolBar) override; // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& aArguments) override; // lang::XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEventObject) override; private: css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; @@ -92,8 +88,7 @@ private: void Shutdown(); /// @throws css::lang::DisposedException - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 387dafc430ea..b608cb344e8a 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -132,7 +132,6 @@ void SAL_CALL BasicViewFactory::disposing() Reference<XResource> SAL_CALL BasicViewFactory::createResource ( const Reference<XResourceId>& rxViewId) - throw(RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { Reference<XResource> xView; const bool bIsCenterPane ( @@ -186,7 +185,6 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( } void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxView) - throw(RuntimeException, std::exception) { if ( ! rxView.is()) throw lang::IllegalArgumentException(); @@ -239,7 +237,6 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV } void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException, std::exception) { if (aArguments.getLength() > 0) { diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 373b1f740f44..793fd7be5e14 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -77,18 +77,15 @@ public: virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( - const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) - throw(css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) override; virtual void SAL_CALL releaseResource ( - const css::uno::Reference<css::drawing::framework::XResource>& xView) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResource>& xView) override; // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& aArguments) override; private: css::uno::Reference<css::drawing::framework::XConfigurationController> diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index ac5f5be63319..ec0995721380 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -183,7 +183,6 @@ vcl::Window* ChildWindowPane::GetWindow() } Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow() - throw (RuntimeException, std::exception) { if (mpWindow == nullptr || ! mxWindow.is()) GetWindow(); @@ -202,7 +201,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( //----- XEventListener -------------------------------------------------------- void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index db85c0296cfb..dfe916309095 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -73,8 +73,7 @@ public: window pointer before forwarding the call to the base class. */ virtual css::uno::Reference<css::awt::XWindow> - SAL_CALL getWindow() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getWindow() override; DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() @@ -82,8 +81,7 @@ public: // XEventListener virtual void SAL_CALL disposing( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; private: sal_uInt16 mnChildWindowId; diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index c30d5860ed7b..ed63d7c30379 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -37,7 +37,6 @@ FrameWindowPane::~FrameWindowPane() throw() } sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index a0cd4b1185be..c3c827db85a6 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -42,8 +42,7 @@ public: children, if only to visualize that something (a view) is missing. Therefore this method always returns <FALSE/>. */ - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 86ffbb2d0c1b..ec9a875076bd 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -118,7 +118,6 @@ void SAL_CALL FullScreenPane::disposing() //----- XPane ----------------------------------------------------------------- sal_Bool SAL_CALL FullScreenPane::isVisible() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -129,7 +128,6 @@ sal_Bool SAL_CALL FullScreenPane::isVisible() } void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -140,7 +138,6 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) } Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -152,7 +149,6 @@ Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessibl void SAL_CALL FullScreenPane::setAccessible ( const Reference<css::accessibility::XAccessible>& rxAccessible) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -193,7 +189,6 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent&, rEvent, void) } Reference<rendering::XCanvas> FullScreenPane::CreateCanvas() - throw (RuntimeException) { VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(mxWindow); if (pWindow) diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index c299e3f97c9f..3253ea153fac 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -58,25 +58,20 @@ public: //----- XPane ------------------------------------------------------------- - virtual sal_Bool SAL_CALL isVisible() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isVisible() override; - virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisible (sal_Bool bIsVisible) override; - virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() override; virtual void SAL_CALL setAccessible ( - const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override; DECL_LINK(WindowEventHandler, VclWindowEvent&, void); protected: virtual css::uno::Reference<css::rendering::XCanvas> - CreateCanvas() - throw (css::uno::RuntimeException) override; + CreateCanvas() override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 20fec54b9f64..2429c1467d28 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -64,7 +64,6 @@ vcl::Window* Pane::GetWindow() //----- XPane ----------------------------------------------------------------- Reference<awt::XWindow> SAL_CALL Pane::getWindow() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -72,7 +71,6 @@ Reference<awt::XWindow> SAL_CALL Pane::getWindow() } Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -86,7 +84,6 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas() //----- XPane2 ---------------------------------------------------------------- sal_Bool SAL_CALL Pane::isVisible() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -98,7 +95,6 @@ sal_Bool SAL_CALL Pane::isVisible() } void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -108,7 +104,6 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) } Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); vcl::Window* pWindow = GetWindow(); @@ -120,7 +115,6 @@ Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible() void SAL_CALL Pane::setAccessible ( const Reference<css::accessibility::XAccessible>& rxAccessible) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); vcl::Window* pWindow = GetWindow(); @@ -131,7 +125,6 @@ void SAL_CALL Pane::setAccessible ( //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL Pane::getResourceId() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -139,7 +132,6 @@ Reference<XResourceId> SAL_CALL Pane::getResourceId() } sal_Bool SAL_CALL Pane::isAnchorOnly() - throw (RuntimeException, std::exception) { return true; } @@ -157,7 +149,6 @@ const Sequence<sal_Int8>& Pane::getUnoTunnelId() } sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) - throw (RuntimeException, std::exception) { sal_Int64 nResult = 0; @@ -171,7 +162,6 @@ sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) } Reference<rendering::XCanvas> Pane::CreateCanvas() - throw (RuntimeException) { Reference<rendering::XCanvas> xCanvas; @@ -187,7 +177,6 @@ Reference<rendering::XCanvas> Pane::CreateCanvas() } void Pane::ThrowIfDisposed() const - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 59e550dc4551..8bd2523c8f12 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -52,8 +52,7 @@ public: // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& aArguments) override; }; typedef ::cppu::WeakComponentImplHelper <XView> PresentationViewInterfaceBase; @@ -72,10 +71,10 @@ public: // XView - virtual Reference<XResourceId> SAL_CALL getResourceId() throw (RuntimeException, std::exception) override + virtual Reference<XResourceId> SAL_CALL getResourceId() override { return mxResourceId; }; - virtual sal_Bool SAL_CALL isAnchorOnly() throw (RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL isAnchorOnly() override { return false; } private: @@ -118,7 +117,6 @@ void SAL_CALL PresentationFactory::disposing() Reference<XResource> SAL_CALL PresentationFactory::createResource ( const Reference<XResourceId>& rxViewId) - throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { ThrowIfDisposed(); @@ -131,7 +129,6 @@ Reference<XResource> SAL_CALL PresentationFactory::createResource ( void SAL_CALL PresentationFactory::releaseResource ( const Reference<XResource>& rxView) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); (void)rxView; @@ -154,7 +151,6 @@ void SAL_CALL PresentationFactory::releaseResource ( void SAL_CALL PresentationFactory::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } @@ -163,13 +159,11 @@ void SAL_CALL PresentationFactory::notifyConfigurationChange ( void SAL_CALL PresentationFactory::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { (void)rEventObject; } void PresentationFactory::ThrowIfDisposed() const - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -197,7 +191,6 @@ void PresentationFactoryProvider::disposing() void SAL_CALL PresentationFactoryProvider::initialize( const Sequence<Any>& aArguments) - throw (Exception, RuntimeException, std::exception) { if (aArguments.getLength() > 0) { diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index c89c874aa524..b0daeff82be6 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -87,7 +87,7 @@ void SAL_CALL ViewShellWrapper::disposing() mpViewShell.reset(); } -uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) { if( mpSlideSorterViewShell && rType == cppu::UnoType<view::XSelectionSupplier>::get() ) @@ -102,20 +102,18 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId() - throw (RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } //----- XSelectionSupplier -------------------------------------------------- -sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection ) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection ) { if (!mpSlideSorterViewShell) return false; @@ -152,7 +150,6 @@ sal_Bool SAL_CALL ViewShellWrapper::select( const css::uno::Any& aSelection ) th } uno::Any SAL_CALL ViewShellWrapper::getSelection() - throw (uno::RuntimeException, std::exception) { Any aResult; @@ -177,11 +174,11 @@ uno::Any SAL_CALL ViewShellWrapper::getSelection() return aResult; } -void SAL_CALL ViewShellWrapper::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ViewShellWrapper::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) { } -void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) { } @@ -189,7 +186,6 @@ void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Refere sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( const Reference<XResource>& xResource) - throw (RuntimeException, std::exception) { bool bResult (false); @@ -236,7 +232,6 @@ const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId() } sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId) - throw (RuntimeException, std::exception) { sal_Int64 nResult = 0; @@ -252,7 +247,6 @@ sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId //===== awt::XWindowListener ================================================== void SAL_CALL ViewShellWrapper::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ViewShell* pViewShell (mpViewShell.get()); @@ -261,13 +255,11 @@ void SAL_CALL ViewShellWrapper::windowResized (const awt::WindowEvent& rEvent) } void SAL_CALL ViewShellWrapper::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ViewShell* pViewShell (mpViewShell.get()); @@ -276,7 +268,6 @@ void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) } void SAL_CALL ViewShellWrapper::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } @@ -284,7 +275,6 @@ void SAL_CALL ViewShellWrapper::windowHidden (const lang::EventObject& rEvent) //===== XEventListener ======================================================== void SAL_CALL ViewShellWrapper::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxWindow) mxWindow = nullptr; diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 5e7f1e8d9421..c8543232f538 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -102,7 +102,6 @@ void SAL_CALL CenterViewFocusModule::disposing() void SAL_CALL CenterViewFocusModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (mbValid) { @@ -151,7 +150,6 @@ void CenterViewFocusModule::HandleNewView ( void SAL_CALL CenterViewFocusModule::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (mxConfigurationController.is()) if (rEvent.Source == mxConfigurationController) diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index c86452e2d2ac..931247ae9ecc 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -59,14 +59,12 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; private: class ViewShellContainer; diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 4a0e92eaddea..803758e0e5cb 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -65,7 +65,6 @@ Reference<XModuleController> ModuleController::CreateInstance ( } ModuleController::ModuleController (const Reference<XComponentContext>& rxContext) - throw (std::exception) : ModuleControllerInterfaceBase(MutexOwner::maMutex), mxController(), mpResourceToFactoryMap(new ResourceToFactoryMap()), @@ -202,7 +201,6 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) //----- XModuleController ----------------------------------------------------- void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) - throw (RuntimeException, std::exception) { ResourceToFactoryMap::const_iterator iFactory (mpResourceToFactoryMap->find(rsResourceURL)); if (iFactory != mpResourceToFactoryMap->end()) @@ -244,7 +242,6 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) //----- XInitialization ------------------------------------------------------- void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException, std::exception) { if (aArguments.getLength() > 0) { diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index 7b007c4fdcfc..a0c77e24b83f 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -111,7 +111,6 @@ void SAL_CALL ResourceManager::disposing() void SAL_CALL ResourceManager::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { OSL_ASSERT(rEvent.ResourceId.is()); @@ -223,7 +222,6 @@ void ResourceManager::HandleResourceRequest( void SAL_CALL ResourceManager::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (mxConfigurationController.is() && rEvent.Source == mxConfigurationController) diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index ae88b746b933..080ac90d18e3 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -61,14 +61,12 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; protected: css::uno::Reference<css::drawing::framework::XConfigurationController> diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index e41c7c10f396..2372158fe950 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -91,7 +91,6 @@ void SAL_CALL ShellStackGuard::disposing() void SAL_CALL ShellStackGuard::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Type.equals(FrameworkHelper::msConfigurationUpdateStartEvent)) { @@ -108,7 +107,6 @@ void SAL_CALL ShellStackGuard::notifyConfigurationChange ( void SAL_CALL ShellStackGuard::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (mxConfigurationController.is()) if (rEvent.Source == mxConfigurationController) diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 2cdba472f5e2..bb506e3a5004 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -68,13 +68,11 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; private: css::uno::Reference<css::drawing::framework::XConfigurationController> diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index bf6c040c8034..5185e53f8988 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -87,7 +87,6 @@ void SlideSorterModule::SaveResourceState() void SAL_CALL SlideSorterModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent)) { diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index 0861ca8b1e47..3b0eb9f709a9 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -43,8 +43,7 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; private: css::uno::Reference<css::drawing::framework::XResourceId> mxViewTabBarId; diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index 1370bd07dfd5..29c1f3a18cfc 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -98,7 +98,6 @@ void SAL_CALL ToolBarModule::disposing() void SAL_CALL ToolBarModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (mxConfigurationController.is()) { @@ -184,7 +183,6 @@ void ToolBarModule::HandleUpdateEnd() } void SAL_CALL ToolBarModule::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (mxConfigurationController.is() && rEvent.Source == mxConfigurationController) diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index b8e9c6f81c02..0922f69890ca 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -61,14 +61,12 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; private: css::uno::Reference< diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 0630163be692..5915384cfd0a 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -78,7 +78,6 @@ void ToolPanelModule::SaveResourceState() void SAL_CALL ToolPanelModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (!rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent)) ResourceManager::notifyConfigurationChange(rEvent); diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index c84a6c8b140f..4e4aeee58fb0 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -42,8 +42,7 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index 02a7b553b2e1..2752493faa9d 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -91,7 +91,6 @@ void SAL_CALL ViewTabBarModule::disposing() void SAL_CALL ViewTabBarModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (mxConfigurationController.is()) { @@ -126,7 +125,6 @@ void SAL_CALL ViewTabBarModule::notifyConfigurationChange ( void SAL_CALL ViewTabBarModule::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (mxConfigurationController.is() && rEvent.Source == mxConfigurationController) diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index fb6ba518a17d..7dc0ebf30b28 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -62,14 +62,12 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; private: css::uno::Reference< diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index faff98541cac..a469dce9ec7d 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -95,11 +95,9 @@ public: virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const lang::EventObject& rEvent) override; // XConfigurationChangeListener - virtual void SAL_CALL notifyConfigurationChange (const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL notifyConfigurationChange (const ConfigurationChangeEvent& rEvent) override; private: OUString msEventType; @@ -133,8 +131,7 @@ public: /** XEventListener. This method is called when the frame::XController is being destroyed. */ - virtual void SAL_CALL disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const lang::EventObject& rEvent) override; /** This method is called when the ViewShellBase is being destroyed. */ @@ -299,8 +296,7 @@ public: virtual void SAL_CALL disposing() override; - virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) - throw(RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) override; private: ::std::shared_ptr<FrameworkHelper> mpHelper; @@ -819,7 +815,6 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing() } void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObject& rEventObject) - throw(RuntimeException, std::exception) { if (mpHelper.get() != nullptr) mpHelper->disposing(rEventObject); @@ -895,7 +890,6 @@ void CallbackCaller::disposing() } void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxConfigurationController) { @@ -906,7 +900,6 @@ void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent) void SAL_CALL CallbackCaller::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Type.equals(msEventType) && maFilter(rEvent)) { @@ -960,7 +953,6 @@ void LifetimeController::disposing() } void SAL_CALL LifetimeController::disposing (const lang::EventObject& rEvent) - throw(RuntimeException, std::exception) { (void)rEvent; mbListeningToController = false; diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 521957d81081..05f90265a294 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -139,47 +139,37 @@ public: //===== XAccessibleContext ============================================== virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL - getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent() override; /** This implementation returns either 1 or 0 depending on whether there is an active accessible OLE object or not. */ virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; /** This implementation either returns the active accessible OLE object if it exists and the given index is 0 or throws an exception. */ virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; //===== XAccessibleComponent ============================================ virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint (const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleAtPoint (const css::awt::Point& aPoint) override; - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() override; //===== XInterface ====================================================== virtual css::uno::Any SAL_CALL - queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) override; + queryInterface (const css::uno::Type & rType) override; virtual void SAL_CALL acquire() @@ -194,60 +184,46 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; //===== XTypeProvider =================================================== virtual css::uno::Sequence< css::uno::Type> SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL - propertyChange (const css::beans::PropertyChangeEvent& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + propertyChange (const css::beans::PropertyChangeEvent& rEventObject) override; //===== XWindowListener ================================================= virtual void SAL_CALL - windowResized (const css::awt::WindowEvent& e) - throw (css::uno::RuntimeException, std::exception) override; + windowResized (const css::awt::WindowEvent& e) override; virtual void SAL_CALL - windowMoved (const css::awt::WindowEvent& e) - throw (css::uno::RuntimeException, std::exception) override; + windowMoved (const css::awt::WindowEvent& e) override; virtual void SAL_CALL - windowShown (const css::lang::EventObject& e) - throw (css::uno::RuntimeException, std::exception) override; + windowShown (const css::lang::EventObject& e) override; virtual void SAL_CALL - windowHidden (const css::lang::EventObject& e) - throw (css::uno::RuntimeException, std::exception) override; + windowHidden (const css::lang::EventObject& e) override; //===== XFocusListener ================================================= - virtual void SAL_CALL focusGained (const css::awt::FocusEvent& e) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost (const css::awt::FocusEvent& e) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained (const css::awt::FocusEvent& e) override; + virtual void SAL_CALL focusLost (const css::awt::FocusEvent& e) override; //----------------------------xAttribute---------------------------- - virtual css::uno::Any SAL_CALL getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Any SAL_CALL getExtendedAttributes() override; ::sd::ViewShell* mpViewShell; private: @@ -257,18 +233,15 @@ private: // return ourself as context in default case virtual css::uno::Reference< css::accessibility::XAccessibleContext > - implGetAccessibleContext() - throw ( css::uno::RuntimeException ) override; + implGetAccessibleContext() override; // return sal_False in default case virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (css::uno::RuntimeException) override; + implIsSelected( sal_Int32 nAccessibleChildIndex ) override; // return nothing in default case virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; + implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; protected: /// The core window that is made accessible. @@ -311,8 +284,7 @@ protected: A name string. */ virtual OUString - CreateAccessibleName () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleName () override; /** Create a description string. The current description is not modified and, therefore, no events are send. This method is usually @@ -322,8 +294,7 @@ protected: A description string. */ virtual OUString - CreateAccessibleDescription () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleDescription () override; /** This method is called when (after) the frame containing this document has been activated. Can be used to send FOCUSED state @@ -357,16 +328,13 @@ protected: const css::uno::Reference<css::accessibility::XAccessible>& xOLEObject); //===== XAccessibleGetAccFromXShape ============================================ css::uno::Sequence< css::uno::Any > - SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) - throw ( css::uno::RuntimeException, std::exception ) override; + SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) override; public: void SwitchViewActivated() { Activated(); } - virtual sal_Int32 SAL_CALL getForeground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; - virtual sal_Int32 SAL_CALL getBackground( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; virtual void impl_dispose(); }; diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index af0be6c6577c..1408d90d3ac0 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -59,34 +59,27 @@ public: //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; virtual OUString SAL_CALL - getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; //===== XPropertyChangeListener ========================================= virtual void SAL_CALL - propertyChange (const css::beans::PropertyChangeEvent& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + propertyChange (const css::beans::PropertyChangeEvent& rEventObject) override; //===== XInterface ====================================================== virtual css::uno::Any SAL_CALL - queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) override; + queryInterface (const css::uno::Type & rType) override; virtual void SAL_CALL acquire() @@ -98,28 +91,21 @@ public: //===== XAccessibleGroupPosition ========================================= virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getGroupPosition( const css::uno::Any& rAny ) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException, std::exception) override; - virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) - throw (css::uno::RuntimeException, - std::exception) override; + getGroupPosition( const css::uno::Any& rAny ) override; + virtual OUString SAL_CALL getObjectLink( const css::uno::Any& accoject ) override; protected: //===== XServiceInfo ==================================================== virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (css::uno::RuntimeException) override; + implIsSelected( sal_Int32 nAccessibleChildIndex ) override; /** Select or deselect the specified child or all children if the given index has the special value ACCESSIBLE_SELECTION_CHILD_ALL. @@ -135,8 +121,7 @@ protected: reps. children. */ virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; + implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; private: ::sd::ViewShell* mpSdViewSh; @@ -157,15 +142,13 @@ protected: /// Create an accessible name that contains the current view mode. virtual OUString - CreateAccessibleName () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleName () override; /** Create an accessible description that contains the current view mode. */ virtual OUString - CreateAccessibleDescription () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleDescription () override; /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has (regained) the focus. @@ -181,8 +164,7 @@ protected: //===== XAccessibleGetAccFromXShape ============================================ css::uno::Sequence< css::uno::Any > - SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) - throw ( css::uno::RuntimeException, std::exception ) override; + SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType) override; css::uno::Reference< css::accessibility::XAccessible > GetSelAccContextInTable(); diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index fb3b16cdb24e..bcaadb755557 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -57,34 +57,28 @@ public: //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; virtual OUString SAL_CALL - getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() override; //===== XAccessibleEventBroadcaster ======================================== virtual void SAL_CALL addAccessibleEventListener ( - const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener) override; virtual void SAL_CALL removeAccessibleEventListener ( - const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener >& xListener) override; //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; //===== lang::XEventListener ============================================ @@ -93,8 +87,7 @@ public: //===== XPropertyChangeListener ========================================= virtual void SAL_CALL - propertyChange (const css::beans::PropertyChangeEvent& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + propertyChange (const css::beans::PropertyChangeEvent& rEventObject) override; protected: @@ -113,14 +106,12 @@ protected: /// Create an accessible name that contains the current view mode. virtual OUString - CreateAccessibleName () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleName () override; /// Create an accessible description that contains the current /// view mode. virtual OUString - CreateAccessibleDescription () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleDescription () override; private: diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 5009c2b243ff..a7fcaffa053d 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -65,8 +65,7 @@ public: /// Returns always 0 because there can be no children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount() - throw (std::exception) override; + getAccessibleChildCount() override; /** Return the specified child. @param nIndex @@ -78,41 +77,33 @@ public: Throws always an exception because there are no children. */ virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; //===== XAccessibleComponent ============================================ - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground() override; //===== XComponent ====================================================== virtual void SAL_CALL - dispose() - throw (css::uno::RuntimeException, std::exception) override; + dispose() override; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const css::lang::EventObject& Source) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& Source) override; using AccessibleShape::disposing; @@ -120,17 +111,14 @@ protected: /** Create a base name string that contains the accessible name. */ virtual OUString - CreateAccessibleBaseName() - throw (css::uno::RuntimeException) override; + CreateAccessibleBaseName() override; virtual OUString - CreateAccessibleName() - throw (css::uno::RuntimeException) override; + CreateAccessibleName() override; /// Create a description string that contains the accessible description. virtual OUString - CreateAccessibleDescription() - throw (css::uno::RuntimeException) override; + CreateAccessibleDescription() override; private: css::uno::Reference<css::drawing::XDrawPage> mxPage; diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 8a43b45c18f8..40798fd16567 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -42,22 +42,19 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString - CreateAccessibleBaseName () - throw (css::uno::RuntimeException) override; + CreateAccessibleBaseName () override; /// Create a description string that contains the accessible description. virtual OUString - CreateAccessibleDescription () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleDescription () override; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole () override; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 331e6a4e4600..5e47295f22ca 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -42,22 +42,19 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString - CreateAccessibleBaseName () - throw (css::uno::RuntimeException) override; + CreateAccessibleBaseName () override; /// Create a description string that contains the accessible description. virtual OUString - CreateAccessibleDescription () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleDescription () override; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole () override; }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index e32fc4141472..ae918ebcb1f8 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -41,20 +41,17 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; //===== internal ======================================================== /// Create a name string that contains the accessible name. virtual OUString - CreateAccessibleBaseName () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleBaseName () override; /// Create a description string that contains the accessible description. virtual OUString - CreateAccessibleDescription () - throw (css::uno::RuntimeException, std::exception) override; + CreateAccessibleDescription () override; OUString GetStyle() override; private: diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index eb0f9a6fa286..cdbab94393fc 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -86,113 +86,88 @@ public: //===== XAccessible ======================================================= virtual css::uno::Reference<css::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener >& rxListener ) override; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent() override; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL - getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRole() override; virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; virtual OUString SAL_CALL - getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; virtual css::lang::Locale SAL_CALL - getLocale() - throw (css::uno::RuntimeException, - css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; + getLocale() override; //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( - const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) override; - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() override; - virtual void SAL_CALL grabFocus() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() override; - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground() override; //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; private: css::uno::Reference<css::accessibility::XAccessible> mxParent; @@ -207,8 +182,7 @@ private: @throws css::lang::DisposedException */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); /** Check whether or not the object has been disposed (or is in the state of being disposed). diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 6318151a855d..b706a85989d7 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -92,75 +92,62 @@ public: //===== XAccessible ======================================================= virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener ) override; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChildCount() override; /// Return the specified child or throw exception. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; /// Return a reference to the parent. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent() override; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleIndexInParent() override; /// Return this object's role. virtual sal_Int16 SAL_CALL - getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRole() override; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; /// Return the object's current name. virtual OUString SAL_CALL - getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() override; /// Return NULL to indicate that an empty relation set. virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; /// Return the set of current states. virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual css::lang::Locale SAL_CALL - getLocale() - throw (css::uno::RuntimeException, - css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; + getLocale() override; //===== XAccessibleComponent ================================================ @@ -169,108 +156,85 @@ public: inside this object. */ virtual sal_Bool SAL_CALL containsPoint ( - const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) override; /** The default implementation returns an empty reference. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) override; /** The default implementation returns an empty rectangle. */ - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() override; /** The default implementation returns an empty position, i.e. the * result of the default constructor of <type>css::awt::Point</type>. */ - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() override; /** The default implementation does nothing. */ - virtual void SAL_CALL grabFocus() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() override; /** Returns black as the default foreground color. */ - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() override; /** Returns white as the default background color. */ - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground() override; //===== XAccessibleSelection ============================================== virtual void SAL_CALL - selectAccessibleChild (sal_Int32 nChildIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + selectAccessibleChild (sal_Int32 nChildIndex) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + isAccessibleChildSelected( sal_Int32 nChildIndex ) override; virtual void SAL_CALL - clearAccessibleSelection( ) - throw (css::uno::RuntimeException, std::exception) override; + clearAccessibleSelection( ) override; virtual void SAL_CALL - selectAllAccessibleChildren( ) - throw (css::uno::RuntimeException, std::exception) override; + selectAllAccessibleChildren( ) override; virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount( ) - throw (css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL - supportsService (const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) override; + supportsService (const OUString& sServiceName) override; /** Returns a list of all supported services. */ virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; void SwitchViewActivated(); private: @@ -290,8 +254,7 @@ private: @throws css::lang::DisposedException */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } // end of namespace ::accessibility diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index ddc042103162..5ca57eb8c0f4 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -44,20 +44,17 @@ public: // XRenderable virtual sal_Int32 SAL_CALL getRendererCount ( const css::uno::Any& aSelection, - const css::uno::Sequence<css::beans::PropertyValue >& xOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::PropertyValue >& xOptions) override; virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, - const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) override; virtual void SAL_CALL render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, - const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) override; private: class Implementation; diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index abd43d072c14..d8e203478df2 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -167,71 +167,64 @@ public: DECLARE_XTYPEPROVIDER() // 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; // XController - virtual sal_Bool SAL_CALL suspend( sal_Bool Suspend ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL suspend( sal_Bool Suspend ) 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; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSelection( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override; + virtual css::uno::Any SAL_CALL getSelection( ) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XFormLayerAccess - virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFormDesignMode( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getFormController( const css::uno::Reference< css::form::XForm >& Form ) override; + virtual sal_Bool SAL_CALL isFormDesignMode( ) override; + virtual void SAL_CALL setFormDesignMode( sal_Bool DesignMode ) override; // XControlAccess - virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const css::uno::Reference< css::awt::XControlModel >& xModel ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const css::uno::Reference< css::awt::XControlModel >& xModel ) override; // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference< - css::drawing::XDrawPage >& xPage) - throw(css::uno::RuntimeException, std::exception) override; + css::drawing::XDrawPage >& xPage) override; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL - getCurrentPage() - throw(css::uno::RuntimeException, std::exception) override; + getCurrentPage() override; // lang::XEventListener virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; // view::XSelectionChangeListener virtual void SAL_CALL - selectionChanged (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + selectionChanged (const css::lang::EventObject& rEvent) override; // XControllerManager virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL - getConfigurationController() - throw (css::uno::RuntimeException, std::exception) override; + getConfigurationController() override; virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL - getModuleController() - throw (css::uno::RuntimeException, std::exception) override; + getModuleController() override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override; protected: /** This method must return the name to index table. This table @@ -268,24 +261,21 @@ protected: css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; /** The same as setFastProperyValue, but no exception is thrown and nHandle is always valid. You must not broadcast the changes in this method. */ virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; /** When the called object has been disposed already this method throws a Disposed exception and does not return. @throws css::lang::DisposedException */ - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; using cppu::OPropertySetHelper::disposing; using cppu::OPropertySetHelper::getFastPropertyValue; diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 612e0bf8a7fd..1f13425969a8 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -37,9 +37,9 @@ namespace sd { css::lang::XServiceInfo >( aMutex ) {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override = 0; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getImplementationName( ) override = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override = 0; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override = 0; }; } diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index 0302217cbb93..8e9e2b927a35 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -49,54 +49,36 @@ public: // XSelectionSupplier virtual sal_Bool SAL_CALL select ( - const css::uno::Any& aSelection) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override; + const css::uno::Any& aSelection) override; - virtual css::uno::Any SAL_CALL getSelection() - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Any SAL_CALL getSelection() override; virtual void SAL_CALL addSelectionChangeListener ( - const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override; virtual void SAL_CALL removeSelectionChangeListener ( - const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage >& xPage) - throw (css::uno::RuntimeException, - std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage >& xPage) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( sal_Int32 nHandle, - const css::uno::Any& rValue) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getFastPropertyValue ( - sal_Int32 nHandle) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nHandle) 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; protected: bool getMasterPageMode() const throw(); @@ -116,7 +98,7 @@ protected: The new layer object. @throws css::uno::RuntimeException */ - void setActiveLayer (const css::uno::Reference< css::drawing::XLayer>& rxLayer) throw (css::uno::RuntimeException, std::exception); + void setActiveLayer (const css::uno::Reference< css::drawing::XLayer>& rxLayer); void SetZoom( sal_Int16 nZoom ); sal_Int16 GetZoom() const; diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index f305f2b57b4d..a4d0fa746b59 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -44,51 +44,36 @@ public: // XSelectionSupplier virtual sal_Bool SAL_CALL select ( - const css::uno::Any& aSelection) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aSelection) override; - virtual css::uno::Any SAL_CALL getSelection() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection() override; virtual void SAL_CALL addSelectionChangeListener ( - const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override; virtual void SAL_CALL removeSelectionChangeListener ( - const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage >& xPage) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage >& xPage) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( sal_Int32 nHandle, - const css::uno::Any& rValue) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getFastPropertyValue ( - sal_Int32 nHandle) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nHandle) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: OutlineViewShell& mrOutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index ad80e3e5ad2a..3c7621de31b8 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -44,52 +44,37 @@ public: // XSelectionSupplier - virtual sal_Bool SAL_CALL select (const css::uno::Any& aSelection) - throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL select (const css::uno::Any& aSelection) override; - virtual css::uno::Any SAL_CALL getSelection() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getSelection() override; virtual void SAL_CALL addSelectionChangeListener ( - const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override; virtual void SAL_CALL removeSelectionChangeListener ( - const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference< css::drawing::XDrawPage >& xPage) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::drawing::XDrawPage >& xPage) override; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL - getCurrentPage() - throw(css::uno::RuntimeException, std::exception) override; + getCurrentPage() override; // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( sal_Int32 nHandle, - const css::uno::Any& rValue) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getFastPropertyValue ( - sal_Int32 nHandle) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nHandle) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: slidesorter::SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index f13eedef6053..259b0869b107 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -70,55 +70,45 @@ public: virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; //----- XTabBar ----------------------------------------------------------- virtual void SAL_CALL addTabBarButtonAfter ( const css::drawing::framework::TabBarButton& rButton, - const css::drawing::framework::TabBarButton& rAnchor) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::TabBarButton& rAnchor) override; virtual void SAL_CALL appendTabBarButton ( - const css::drawing::framework::TabBarButton& rButton) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::TabBarButton& rButton) override; virtual void SAL_CALL removeTabBarButton ( - const css::drawing::framework::TabBarButton& rButton) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::TabBarButton& rButton) override; virtual sal_Bool SAL_CALL hasTabBarButton ( - const css::drawing::framework::TabBarButton& rButton) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::TabBarButton& rButton) override; virtual css::uno::Sequence<css::drawing::framework::TabBarButton> - SAL_CALL getTabBarButtons() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getTabBarButtons() override; //----- XResource --------------------------------------------------------- virtual css::uno::Reference< - css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::framework::XResourceId> SAL_CALL getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; //----- XUnoTunnel -------------------------------------------------------- - virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override; /** The returned value is calculated as the difference between the total height of the control and the heigh of its first tab page. diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx index d2d52b62ad47..a235e393818c 100644 --- a/sd/source/ui/inc/facreg.hxx +++ b/sd/source/ui/inc/facreg.hxx @@ -30,15 +30,15 @@ namespace com { namespace sun { namespace star { css::uno::Reference< css::uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags ); /// @throws css::uno::RuntimeException -OUString SdDrawingDocument_getImplementationName() throw( css::uno::RuntimeException ); +OUString SdDrawingDocument_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, SfxModelFlags _nCreationFlags ); /// @throws css::uno::RuntimeException -OUString SdPresentationDocument_getImplementationName() throw( css::uno::RuntimeException ); +OUString SdPresentationDocument_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames(); #endif diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 8c20bef04eaf..d97266cd89ab 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -84,54 +84,44 @@ public: virtual void SAL_CALL addResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& - rxResourceId) - throw (css::uno::RuntimeException, std::exception) override; + rxResourceId) override; virtual void SAL_CALL removeResource( const css::uno::Reference<css::drawing::framework::XResourceId>& - rxResourceId) - throw (css::uno::RuntimeException, std::exception) override; + rxResourceId) override; virtual css::uno::Sequence< css::uno::Reference< css::drawing::framework::XResourceId> > SAL_CALL getResources ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, - css::drawing::framework::AnchorBindingMode eMode) - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::framework::AnchorBindingMode eMode) override; virtual sal_Bool SAL_CALL hasResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& - rxResourceId) - throw (css::uno::RuntimeException, std::exception) override; + rxResourceId) override; // XCloneable virtual css::uno::Reference<css::util::XCloneable> - SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL createClone() override; // XNamed /** Return a human readable string representation. This is used for debugging purposes. */ - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; /** This call is ignored because the XNamed interface is (mis)used to give access to a human readable name for debugging purposes. */ - virtual void SAL_CALL setName (const OUString& rName) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName (const OUString& rName) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; private: class ResourceContainer; @@ -177,8 +167,7 @@ private: @throws css::lang::DisposedException */ - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; /** Return whether the two given configurations contain the same resource diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index b314f479f54f..3b48a37602a7 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -79,46 +79,35 @@ public: // XConfigurationController - virtual void SAL_CALL lock() - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL lock() override; - virtual void SAL_CALL unlock() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlock() override; virtual void SAL_CALL requestResourceActivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, - css::drawing::framework::ResourceActivationMode eMode) - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::framework::ResourceActivationMode eMode) override; virtual void SAL_CALL requestResourceDeactivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& - rxResourceId) - throw (css::uno::RuntimeException, std::exception) override; + rxResourceId) override; virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL getResource ( - const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) override; - virtual void SAL_CALL update() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; virtual css::uno::Reference< css::drawing::framework::XConfiguration> - SAL_CALL getRequestedConfiguration() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getRequestedConfiguration() override; virtual css::uno::Reference< css::drawing::framework::XConfiguration> - SAL_CALL getCurrentConfiguration() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getCurrentConfiguration() override; virtual void SAL_CALL restoreConfiguration ( const css::uno::Reference<css::drawing::framework::XConfiguration>& - rxConfiguration) - throw (css::uno::RuntimeException, - std::exception) override; + rxConfiguration) override; // XConfigurationControllerBroadcaster @@ -126,53 +115,43 @@ public: const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, const OUString& rsEventType, - const css::uno::Any& rUserData) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rUserData) override; virtual void SAL_CALL removeConfigurationChangeListener ( const css::uno::Reference< - css::drawing::framework::XConfigurationChangeListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::framework::XConfigurationChangeListener>& rxListener) override; virtual void SAL_CALL notifyEvent ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // XConfigurationRequestQueue - virtual sal_Bool SAL_CALL hasPendingRequests() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPendingRequests() override; virtual void SAL_CALL postChangeRequest ( const css::uno::Reference< - css::drawing::framework::XConfigurationChangeRequest>& rxRequest) - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::framework::XConfigurationChangeRequest>& rxRequest) override; // XResourceFactoryManager virtual void SAL_CALL addResourceFactory( const OUString& sResourceURL, - const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) override; virtual void SAL_CALL removeResourceFactoryForURL( - const OUString& sResourceURL) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& sResourceURL) override; virtual void SAL_CALL removeResourceFactoryForReference( - const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) override; virtual css::uno::Reference<css::drawing::framework::XResourceFactory> SAL_CALL getResourceFactory ( - const OUString& sResourceURL) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& sResourceURL) override; // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& rArguments) override; /** Use this class instead of calling lock() and unlock() directly in order to be exception safe. @@ -199,8 +178,7 @@ private: @throws css::lang::DisposedException @throws css::uno::RuntimeException */ - void ThrowIfDisposed () const - throw (css::lang::DisposedException, css::uno::RuntimeException); + void ThrowIfDisposed () const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index 83fd00b23a4b..213f86273ebb 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -72,14 +72,12 @@ public: // XModuleController - virtual void SAL_CALL requestResource(const OUString& rsResourceURL) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL requestResource(const OUString& rsResourceURL) override; // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& aArguments) override; private: css::uno::Reference< @@ -92,8 +90,7 @@ private: /// @throws std::exception ModuleController ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext) - throw (std::exception); + const css::uno::Reference<css::uno::XComponentContext>& rxContext); ModuleController (const ModuleController&) = delete; virtual ~ModuleController() throw() override; diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index ddbf3454621f..3c15fbdfcd64 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -88,44 +88,35 @@ public: in the window of the pane. */ virtual css::uno::Reference<css::awt::XWindow> - SAL_CALL getWindow() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getWindow() override; virtual css::uno::Reference<css::rendering::XCanvas> - SAL_CALL getCanvas() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getCanvas() override; //----- XPane2 ------------------------------------------------------------- - virtual sal_Bool SAL_CALL isVisible() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isVisible() override; - virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisible (sal_Bool bIsVisible) override; - virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() override; virtual void SAL_CALL setAccessible ( - const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override; //----- XResource --------------------------------------------------------- virtual css::uno::Reference<css::drawing::framework::XResourceId> - SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getResourceId() override; /** For the typical pane it makes no sense to be displayed without a view. Therefore this default implementation returns always <TRUE/>. */ - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; //----- XUnoTunnel -------------------------------------------------------- - virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override; protected: css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; @@ -139,8 +130,7 @@ protected: @throws css::uno::RuntimeException */ virtual css::uno::Reference<css::rendering::XCanvas> - CreateCanvas() - throw (css::uno::RuntimeException); + CreateCanvas(); /** Throw DisposedException when the object has already been disposed or is currently being disposed. Otherwise this method returns @@ -148,8 +138,7 @@ protected: @throws css::lang::DisposedException */ - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 37a5fc4f0714..aa81f38ff111 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -60,24 +60,20 @@ public: virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference< - css::drawing::framework::XResourceId>& rxViewId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override; + css::drawing::framework::XResourceId>& rxViewId) override; virtual void SAL_CALL releaseResource ( - const css::uno::Reference<css::drawing::framework::XResource>& xView) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResource>& xView) override; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // lang::XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEventObject) override; private: css::uno::Reference<css::drawing::framework::XConfigurationController> @@ -85,8 +81,7 @@ private: css::uno::Reference<css::frame::XController> mxController; /// @throws css::lang::DisposedException - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index 0558cdfb8609..aa11447df77b 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -100,67 +100,53 @@ public: //===== XResourceId ======================================================= virtual OUString SAL_CALL - getResourceURL() - throw(css::uno::RuntimeException, std::exception) override; + getResourceURL() override; virtual css::util::URL SAL_CALL - getFullResourceURL() - throw(css::uno::RuntimeException, std::exception) override; + getFullResourceURL() override; virtual sal_Bool SAL_CALL - hasAnchor() - throw (css::uno::RuntimeException, std::exception) override; + hasAnchor() override; virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL - getAnchor() - throw (css::uno::RuntimeException, std::exception) override; + getAnchor() override; virtual css::uno::Sequence<OUString> SAL_CALL - getAnchorURLs() - throw (css::uno::RuntimeException, std::exception) override; + getAnchorURLs() override; virtual OUString SAL_CALL - getResourceTypePrefix() - throw (css::uno::RuntimeException, std::exception) override; + getResourceTypePrefix() override; virtual sal_Int16 SAL_CALL compareTo (const css::uno::Reference< - css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::framework::XResourceId>& rxResourceId) override; virtual sal_Bool SAL_CALL isBoundTo ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId, - css::drawing::framework::AnchorBindingMode eMode) - throw(css::uno::RuntimeException, std::exception) override; + css::drawing::framework::AnchorBindingMode eMode) override; virtual sal_Bool SAL_CALL isBoundToURL ( const OUString& rsAnchorURL, - css::drawing::framework::AnchorBindingMode eMode) - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::framework::AnchorBindingMode eMode) override; virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL - clone() - throw(css::uno::RuntimeException, std::exception) override; + clone() override; //===== XInitialization =================================================== void SAL_CALL initialize ( - const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& aArguments) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; private: /** The set of URLs that consist of the resource URL at index 0 and the diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 061d185c4dca..6105da021f71 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -70,7 +70,7 @@ public: virtual ~ViewShellWrapper() override; virtual void SAL_CALL disposing() override; - 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; static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); @@ -82,57 +82,46 @@ public: // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething (const css::uno::Sequence<sal_Int8>& rId) override; // XResource virtual css::uno::Reference<css::drawing::framework::XResourceId> - SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSelection() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL select( const css::uno::Any& aSelection ) override; + virtual css::uno::Any SAL_CALL getSelection() override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; // XRelocatableResource virtual sal_Bool SAL_CALL relocateToAnchor ( const css::uno::Reference< - css::drawing::framework::XResource>& xResource) - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::framework::XResource>& xResource) override; // XWindowListener virtual void SAL_CALL windowResized( - const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::WindowEvent& rEvent) override; virtual void SAL_CALL windowMoved( - const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::WindowEvent& rEvent) override; virtual void SAL_CALL windowShown( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; virtual void SAL_CALL windowHidden( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; // XEventListener virtual void SAL_CALL disposing( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; private: ::std::shared_ptr< ViewShell > mpViewShell; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 2053c8d5128f..76bfa73e0dbc 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -105,7 +105,7 @@ public: SAL_DLLPRIVATE virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ) override; - SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; }; friend class SdPageObjsTLB::SdPageObjsTransferable; diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index ba00241534b5..234c4c58bcce 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -109,7 +109,7 @@ protected: virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; virtual void ObjectReleased() override; - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; private: diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 30a77de00c6e..6dba507d431b 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -117,32 +117,28 @@ public: virtual void SAL_CALL disposing() 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; // 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; // XPresentation - virtual void SAL_CALL start( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL end() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL rehearseTimings( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL start( ) override; + virtual void SAL_CALL end() override; + virtual void SAL_CALL rehearseTimings( ) override; // XPresentation2 - virtual void SAL_CALL startWithArguments(const css::uno::Sequence< css::beans::PropertyValue >& Arguments) - throw (css::uno::RuntimeException, - std::exception) override; - virtual sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::presentation::XSlideShowController > SAL_CALL getController( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startWithArguments(const css::uno::Sequence< css::beans::PropertyValue >& Arguments) override; + virtual sal_Bool SAL_CALL isRunning( ) override; + virtual css::uno::Reference< css::presentation::XSlideShowController > SAL_CALL getController( ) override; // legacy api @@ -188,7 +184,7 @@ private: void StartFullscreenPresentation(); /// @throws css::uno::RuntimeException - void ThrowIfDisposed() const throw (css::uno::RuntimeException); + void ThrowIfDisposed() const; void CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow ); WorkWindow *GetWorkWindow(); diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index f3802dca93a9..4285b9d70918 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -52,50 +52,29 @@ public: // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> - SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue ( const OUString& rsPropertyName, - const css::uno::Any& rsPropertyValue) - 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& rsPropertyName) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& rsPropertyValue) override; + + virtual css::uno::Any SAL_CALL getPropertyValue (const OUString& rsPropertyName) override; virtual void SAL_CALL addPropertyChangeListener ( const OUString& rsPropertyName, - const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override; virtual void SAL_CALL removePropertyChangeListener ( const OUString& rsPropertyName, - const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override; virtual void SAL_CALL addVetoableChangeListener ( const OUString& rsPropertyName, - const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override; virtual void SAL_CALL removeVetoableChangeListener ( const OUString& rsPropertyName, - const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override; protected: /** Return the requested property value. @@ -128,8 +107,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index d627a174da15..3d3061a2266a 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -92,14 +92,12 @@ public: */ virtual void SAL_CALL statusChanged ( - const css::frame::FeatureStateEvent& rState) - throw (css::uno::RuntimeException, std::exception) override; + const css::frame::FeatureStateEvent& rState) override; //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing(const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + disposing(const css::lang::EventObject& rEvent) override; protected: /** This method is called by the WeakComponentImplHelper base class in @@ -126,8 +124,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); /** Transform the given string into a URL object. */ diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 82d1a8a0c37e..01af05533d32 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -98,8 +98,7 @@ private: OUString const & aServiceSpecifier, OUString const & referer); /// @throws css::uno::RuntimeException - SdPage* InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) - throw (css::uno::RuntimeException, std::exception); + SdPage* InsertSdPage( sal_uInt16 nPage, bool bDuplicate ); const bool mbImpressDoc; bool mbClipBoard; @@ -156,78 +155,77 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXImpressDocument) // 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; // XModel - virtual void SAL_CALL lockControllers( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lockControllers( ) override; + virtual void SAL_CALL unlockControllers( ) override; + virtual sal_Bool SAL_CALL hasControllersLocked( ) override; + virtual css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() override; + virtual void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XDrawPageDuplicator - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL duplicate( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL duplicate( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override; // XDrawPagesSupplier - virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getDrawPages( ) override; // XMasterPagesSupplier - virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL getMasterPages( ) override; // XLayerManagerSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLayerManager( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLayerManager( ) override; // XCustomPresentationSupplier - virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getCustomPresentations( ) override; // XHandoutMasterSupplier - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) override; // XPresentationSupplier - virtual css::uno::Reference< css::presentation::XPresentation > SAL_CALL getPresentation( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::presentation::XPresentation > SAL_CALL getPresentation( ) override; // XMultiServiceFactory ( SvxFmMSFactory ) - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference<css::uno::XInterface> SAL_CALL createInstanceWithArguments( OUString const & ServiceSpecifier, - css::uno::Sequence<css::uno::Any> const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<css::uno::Any> const & Arguments) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) 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; // 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; // XLinkTargetSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks( ) override; // XStyleFamiliesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies( ) override; // XAnyCompareFactory - virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) override; // XRenderable - virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override; + virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) override; // ITiledRenderable virtual void paintTile( VirtualDevice& rDevice, @@ -276,7 +274,7 @@ public: and still has to forward the second call to the base class. See also comments of issue 27847. */ - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; }; /*********************************************************************** @@ -293,31 +291,31 @@ public: virtual ~SdDrawPagesAccess() throw() override; // XDrawPages - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) 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; // 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; // 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; // 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; }; /*********************************************************************** @@ -334,28 +332,26 @@ public: virtual ~SdMasterPagesAccess() throw() override; // XDrawPages - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) 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; // 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; // 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; }; /*********************************************************************** @@ -373,27 +369,27 @@ public: virtual ~SdDocLinkTargets() throw() 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; // 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; // intern /// @throws std::exception - SdPage* FindPage( const OUString& rName ) const throw(std::exception); + SdPage* FindPage( const OUString& rName ) const; }; #endif diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index 0d29682eb957..b930581413ad 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -72,9 +72,9 @@ protected: const SvxItemPropertySet* mpPropSet; /// @throws css::lang::IllegalArgumentException - virtual void setBackground( const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException, std::exception); + virtual void setBackground( const css::uno::Any& rValue ); /// @throws std::exception - virtual void getBackground( css::uno::Any& rValue ) throw(std::exception); + virtual void getBackground( css::uno::Any& rValue ); OUString getBookmarkURL() const; void setBookmarkURL( OUString& rURL ); @@ -95,7 +95,7 @@ protected: void setNavigationOrder( const css::uno::Any& rValue ); /// @throws css::uno::RuntimeException - void throwIfDisposed() const throw (css::uno::RuntimeException ); + void throwIfDisposed() const; public: SdGenericDrawPage( SdXImpressDocument* pModel, SdPage* pInPage, const SvxItemPropertySet* pSet ) throw(); @@ -108,63 +108,55 @@ public: SdXImpressDocument* GetModel() const; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; // this is called whenever a SdrObject must be created for a empty api shape wrapper - virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape ) - throw (css::uno::RuntimeException, std::exception) override; + virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape ) override; // SvxFmDrawPage - virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const 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 release() throw() override; // XShapeCombiner - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL combine( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL split( const css::uno::Reference< css::drawing::XShape >& xGroup ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL combine( const css::uno::Reference< css::drawing::XShapes >& xShapes ) override; + virtual void SAL_CALL split( const css::uno::Reference< css::drawing::XShape >& xGroup ) override; // XShapeBinder - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL bind( const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unbind( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL bind( const css::uno::Reference< css::drawing::XShapes >& xShapes ) override; + virtual void SAL_CALL unbind( const css::uno::Reference< css::drawing::XShape >& xShape ) 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; // XLinkTargetSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks( ) override; // XServiceInfo - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAnimationNodeSupplier - virtual css::uno::Reference< css::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::animations::XAnimationNode > SAL_CALL getAnimationNode( ) override; // XAnnotationAccess: - virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL createAndInsertAnnotation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAnnotation(const css::uno::Reference< css::office::XAnnotation > & annotation) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual css::uno::Reference< css::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL createAndInsertAnnotation() override; + virtual void SAL_CALL removeAnnotation(const css::uno::Reference< css::office::XAnnotation > & annotation) override; + virtual css::uno::Reference< css::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() override; }; /*********************************************************************** @@ -179,7 +171,7 @@ private: css::uno::Sequence< css::uno::Type > maTypeSequence; protected: - virtual void setBackground( const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException) override; + virtual void setBackground( const css::uno::Any& rValue ) override; virtual void getBackground( css::uno::Any& rValue ) throw() override; public: SdDrawPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw(); @@ -192,43 +184,41 @@ public: static OUString getUiNameFromPageApiName( const OUString& rApiName ); // 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; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // 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; // XMasterPageTarget - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMasterPage( const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getMasterPage( ) override; + virtual void SAL_CALL setMasterPage( const css::uno::Reference< css::drawing::XDrawPage >& xMasterPage ) override; // XPresentationPage - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage( ) 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; // 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; // 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; // XShapes - virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override; }; /*********************************************************************** @@ -241,8 +231,8 @@ class SdMasterPage : public css::presentation::XPresentationPage, private: css::uno::Sequence< css::uno::Type > maTypeSequence; protected: - virtual void setBackground( const css::uno::Any& rValue ) throw( css::lang::IllegalArgumentException, std::exception ) override; - virtual void getBackground( css::uno::Any& rValue ) throw (std::exception) override; + virtual void setBackground( const css::uno::Any& rValue ) override; + virtual void getBackground( css::uno::Any& rValue ) override; public: SdMasterPage( SdXImpressDocument* pModel, SdPage* pInPage ) throw(); @@ -251,39 +241,37 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdMasterPage) // 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; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // 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; // 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; // 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; // XPresentationPage - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getNotesPage( ) 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; // XShapes - virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override; }; /*********************************************************************** @@ -305,18 +293,18 @@ public: SdrObject* FindObject( const OUString& rName ) const throw(); // 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; // 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; }; OUString getUiNameFromPageApiNameImpl( const OUString& rApiName ); diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 2036051f45ae..76e17c1a4a09 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -59,14 +59,14 @@ public: virtual ~SdUnoSearchReplaceShape() throw(); // XReplaceable - virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) override; + virtual sal_Int32 SAL_CALL replaceAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override; // XSearchable - virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst( const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext( const css::uno::Reference< css::uno::XInterface >& xStartAt, const css::uno::Reference< css::util::XSearchDescriptor >& xDesc ) override; }; /* ================================================================= */ @@ -90,7 +90,7 @@ protected: public: /// @throws css::uno::RuntimeException - SdUnoSearchReplaceDescriptor(bool bReplace) throw (css::uno::RuntimeException); + SdUnoSearchReplaceDescriptor(bool bReplace); virtual ~SdUnoSearchReplaceDescriptor() throw() override; bool IsCaseSensitive() const { return mbCaseSensitive; } @@ -99,21 +99,21 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) // XSearchDescriptor - virtual OUString SAL_CALL getSearchString( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSearchString( const OUString& aString ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSearchString( ) override; + virtual void SAL_CALL setSearchString( const OUString& aString ) override; // XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getReplaceString( ) override; + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) 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; }; /* ================================================================= */ @@ -130,12 +130,12 @@ public: virtual ~SdUnoFindAllAccess() throw() 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; // 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; }; #endif // INCLUDED_SD_SOURCE_UI_INC_UNOSRCH_HXX diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 3848ec6faa9b..99634cd10f7c 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -59,38 +59,29 @@ public: const css::geometry::RealSize2D& rSpriteSize); PresenterCustomSprite(const PresenterCustomSprite&) = delete; PresenterCustomSprite& operator=(const PresenterCustomSprite&) = delete; - virtual void SAL_CALL disposing() - throw (RuntimeException) override; + virtual void SAL_CALL disposing() override; // XSprite - virtual void SAL_CALL setAlpha (double nAlpha) - throw (lang::IllegalArgumentException,RuntimeException, std::exception) override; + virtual void SAL_CALL setAlpha (double nAlpha) override; virtual void SAL_CALL move (const geometry::RealPoint2D& rNewPos, const rendering::ViewState& rViewState, - const rendering::RenderState& rRenderState) - throw (lang::IllegalArgumentException,RuntimeException, std::exception) override; + const rendering::RenderState& rRenderState) override; - virtual void SAL_CALL transform (const geometry::AffineMatrix2D& rTransformation) - throw (lang::IllegalArgumentException,RuntimeException, std::exception) override; + virtual void SAL_CALL transform (const geometry::AffineMatrix2D& rTransformation) override; - virtual void SAL_CALL clip (const Reference<rendering::XPolyPolygon2D>& rClip) - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL clip (const Reference<rendering::XPolyPolygon2D>& rClip) override; - virtual void SAL_CALL setPriority (double nPriority) - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setPriority (double nPriority) override; - virtual void SAL_CALL show() - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL show() override; - virtual void SAL_CALL hide() - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL hide() override; // XCustomSprite - virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas() - throw (RuntimeException, std::exception) override; + virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas() override; private: rtl::Reference<PresenterCanvas> mpCanvas; @@ -100,8 +91,7 @@ private: geometry::RealSize2D maSpriteSize; /// @throws css::lang::DisposedException - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; //===== PresenterCanvas ======================================================= @@ -135,7 +125,6 @@ PresenterCanvas::~PresenterCanvas() } void SAL_CALL PresenterCanvas::disposing() - throw (css::uno::RuntimeException) { if (mxWindow.is()) mxWindow->removeWindowListener(this); @@ -144,7 +133,6 @@ void SAL_CALL PresenterCanvas::disposing() //----- XCanvas --------------------------------------------------------------- void SAL_CALL PresenterCanvas::clear() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // ToDo: Clear the area covered by the child window. A simple forward @@ -155,7 +143,6 @@ void SAL_CALL PresenterCanvas::drawPoint ( const css::geometry::RealPoint2D& aPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); mxSharedCanvas->drawPoint(aPoint,MergeViewState(aViewState),aRenderState); @@ -166,7 +153,6 @@ void SAL_CALL PresenterCanvas::drawLine ( const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); mxSharedCanvas->drawLine(aStartPoint,aEndPoint,MergeViewState(aViewState),aRenderState); @@ -177,7 +163,6 @@ void SAL_CALL PresenterCanvas::drawBezier ( const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); mxSharedCanvas->drawBezier(aBezierSegment,aEndPoint,MergeViewState(aViewState),aRenderState); @@ -187,7 +172,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas:: const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawPolyPolygon( @@ -199,7 +183,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL PresenterCanvas:: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->strokePolyPolygon( @@ -213,9 +196,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::RenderState& aRenderState, const css::uno::Sequence< css::rendering::Texture >& aTextures, const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->strokeTexturedPolyPolygon( @@ -230,9 +210,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::uno::Sequence<css::rendering::Texture>& aTextures, const css::uno::Reference<css::geometry::XMapping2D>& xMapping, const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->strokeTextureMappedPolyPolygon( @@ -250,7 +227,6 @@ css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->queryStrokeShapes( @@ -262,8 +238,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->fillPolyPolygon( @@ -276,9 +250,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::uno::Sequence<css::rendering::Texture>& xTextures) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->fillTexturedPolyPolygon( @@ -292,9 +263,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::RenderState& aRenderState, const css::uno::Sequence< css::rendering::Texture >& xTextures, const css::uno::Reference< css::geometry::XMapping2D >& xMapping) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->fillTextureMappedPolyPolygon( @@ -306,8 +274,6 @@ css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL const css::rendering::FontRequest& aFontRequest, const css::uno::Sequence< css::beans::PropertyValue >& aExtraFontProperties, const css::geometry::Matrix2D& aFontMatrix) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->createFont( @@ -318,7 +284,6 @@ css::uno::Sequence<css::rendering::FontInfo> SAL_CALL PresenterCanvas::queryAvailableFonts( const css::rendering::FontInfo& aFilter, const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->queryAvailableFonts(aFilter, aFontProperties); @@ -331,7 +296,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, ::sal_Int8 nTextDirection) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawText( @@ -343,7 +307,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::uno::Reference< css::rendering::XTextLayout >& xLayoutetText, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawTextLayout( @@ -355,9 +318,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::uno::Reference< css::rendering::XBitmap >& xBitmap, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawBitmap( @@ -369,9 +329,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::uno::Reference< css::rendering::XBitmap>& xBitmap, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawBitmapModulated( @@ -380,7 +337,6 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL PresenterCanvas::getDevice() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->getDevice(); @@ -391,7 +347,6 @@ css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL Reference<rendering::XAnimatedSprite> SAL_CALL PresenterCanvas::createSpriteFromAnimation ( const css::uno::Reference<css::rendering::XAnimation>& rAnimation) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -407,9 +362,6 @@ Reference<rendering::XAnimatedSprite> SAL_CALL const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& rAnimationBitmaps, ::sal_Int8 nInterpolationMode) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -423,7 +375,6 @@ Reference<rendering::XAnimatedSprite> SAL_CALL Reference<rendering::XCustomSprite> SAL_CALL PresenterCanvas::createCustomSprite ( const css::geometry::RealSize2D& rSpriteSize) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -447,7 +398,6 @@ Reference<rendering::XCustomSprite> SAL_CALL Reference<rendering::XSprite> SAL_CALL PresenterCanvas::createClonedSprite ( const css::uno::Reference< css::rendering::XSprite >& rxOriginal) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -460,7 +410,6 @@ Reference<rendering::XSprite> SAL_CALL } sal_Bool SAL_CALL PresenterCanvas::updateScreen (sal_Bool bUpdateAll) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -479,7 +428,6 @@ sal_Bool SAL_CALL PresenterCanvas::updateScreen (sal_Bool bUpdateAll) //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterCanvas::disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); if (rEvent.Source == mxWindow) @@ -489,7 +437,6 @@ void SAL_CALL PresenterCanvas::disposing (const css::lang::EventObject& rEvent) //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterCanvas::windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -497,7 +444,6 @@ void SAL_CALL PresenterCanvas::windowResized (const css::awt::WindowEvent& rEven } void SAL_CALL PresenterCanvas::windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -505,7 +451,6 @@ void SAL_CALL PresenterCanvas::windowMoved (const css::awt::WindowEvent& rEvent) } void SAL_CALL PresenterCanvas::windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -513,7 +458,6 @@ void SAL_CALL PresenterCanvas::windowShown (const css::lang::EventObject& rEvent } void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -522,7 +466,6 @@ void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEven //----- XBitmap --------------------------------------------------------------- geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -536,7 +479,6 @@ geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize() } sal_Bool SAL_CALL PresenterCanvas::hasAlpha() - throw (RuntimeException, std::exception) { Reference<rendering::XBitmap> xBitmap (mxSharedCanvas, UNO_QUERY); if (xBitmap.is()) @@ -548,9 +490,6 @@ sal_Bool SAL_CALL PresenterCanvas::hasAlpha() Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap( const css::geometry::RealSize2D& rNewSize, sal_Bool bFast) - throw (css::uno::RuntimeException, - css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, std::exception) { (void)rNewSize; (void)bFast; @@ -766,7 +705,6 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip ( } void PresenterCanvas::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is()) { @@ -792,7 +730,6 @@ PresenterCustomSprite::PresenterCustomSprite ( } void SAL_CALL PresenterCustomSprite::disposing() - throw (RuntimeException) { Reference<XComponent> xComponent (mxSprite, UNO_QUERY); mxSprite = nullptr; @@ -804,7 +741,6 @@ void SAL_CALL PresenterCustomSprite::disposing() //----- XSprite --------------------------------------------------------------- void SAL_CALL PresenterCustomSprite::setAlpha (const double nAlpha) - throw (lang::IllegalArgumentException,RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->setAlpha(nAlpha); @@ -814,7 +750,6 @@ void SAL_CALL PresenterCustomSprite::move ( const geometry::RealPoint2D& rNewPos, const rendering::ViewState& rViewState, const rendering::RenderState& rRenderState) - throw (lang::IllegalArgumentException,RuntimeException, std::exception) { ThrowIfDisposed(); maPosition = rNewPos; @@ -830,14 +765,12 @@ void SAL_CALL PresenterCustomSprite::move ( } void SAL_CALL PresenterCustomSprite::transform (const geometry::AffineMatrix2D& rTransformation) - throw (lang::IllegalArgumentException,RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->transform(rTransformation); } void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolygon2D>& rxClip) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); // The clip region is expected in the coordinate system of the sprite. @@ -847,21 +780,18 @@ void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolyg } void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->setPriority(nPriority); } void SAL_CALL PresenterCustomSprite::show() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->show(); } void SAL_CALL PresenterCustomSprite::hide() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->hide(); @@ -870,14 +800,12 @@ void SAL_CALL PresenterCustomSprite::hide() //----- XCustomSprite --------------------------------------------------------- Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxSprite->getContentCanvas(); } void PresenterCustomSprite::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSprite.is()) { diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index bfe780df31a4..52163258bce1 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -98,8 +98,7 @@ public: PresenterCanvas(const PresenterCanvas&) = delete; PresenterCanvas& operator=(const PresenterCanvas&) = delete; - virtual void SAL_CALL disposing() - throw (css::uno::RuntimeException) override; + virtual void SAL_CALL disposing() override; css::awt::Point GetOffset (const css::uno::Reference<css::awt::XWindow>& rxBaseWindow); @@ -123,41 +122,35 @@ public: // XCanvas - virtual void SAL_CALL clear() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear() override; virtual void SAL_CALL drawPoint ( const css::geometry::RealPoint2D& aPoint, const css::rendering::ViewState& aViewState, - const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::rendering::RenderState& aRenderState) override; virtual void SAL_CALL drawLine ( const css::geometry::RealPoint2D& aStartPoint, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, - const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::rendering::RenderState& aRenderState) override; virtual void SAL_CALL drawBezier ( const css::geometry::RealBezierSegment2D& aBezierSegment, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& aViewState, - const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::rendering::RenderState& aRenderState) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawPolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, - const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::rendering::RenderState& aRenderState) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokePolyPolygon ( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, - const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::rendering::StrokeAttributes& aStrokeAttributes) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokeTexturedPolyPolygon ( @@ -165,10 +158,7 @@ public: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::uno::Sequence< css::rendering::Texture >& aTextures, - const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) override; + const css::rendering::StrokeAttributes& aStrokeAttributes) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokeTextureMappedPolyPolygon( @@ -177,36 +167,27 @@ public: const css::rendering::RenderState& aRenderState, const css::uno::Sequence<css::rendering::Texture>& aTextures, const css::uno::Reference<css::geometry::XMapping2D>& xMapping, - const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) override; + const css::rendering::StrokeAttributes& aStrokeAttributes) override; virtual css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL queryStrokeShapes( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, - const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::rendering::StrokeAttributes& aStrokeAttributes) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, const css::rendering::ViewState& aViewState, - const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::rendering::RenderState& aRenderState) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillTexturedPolyPolygon( const css::uno::Reference<css::rendering::XPolyPolygon2D>& xPolyPolygon, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, - const css::uno::Sequence<css::rendering::Texture>& xTextures) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::rendering::Texture>& xTextures) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillTextureMappedPolyPolygon( @@ -214,24 +195,18 @@ public: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::uno::Sequence< css::rendering::Texture >& xTextures, - const css::uno::Reference< css::geometry::XMapping2D >& xMapping) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::geometry::XMapping2D >& xMapping) override; virtual css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL createFont( const css::rendering::FontRequest& aFontRequest, const css::uno::Sequence< css::beans::PropertyValue >& aExtraFontProperties, - const css::geometry::Matrix2D& aFontMatrix) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::geometry::Matrix2D& aFontMatrix) override; virtual css::uno::Sequence<css::rendering::FontInfo> SAL_CALL queryAvailableFonts( const css::rendering::FontInfo& aFilter, - const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawText( @@ -239,100 +214,74 @@ public: const css::uno::Reference< css::rendering::XCanvasFont >& xFont, const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, - ::sal_Int8 nTextDirection) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + ::sal_Int8 nTextDirection) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawTextLayout( const css::uno::Reference< css::rendering::XTextLayout >& xLayoutetText, const css::rendering::ViewState& aViewState, - const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::rendering::RenderState& aRenderState) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap, const css::rendering::ViewState& aViewState, - const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) override; + const css::rendering::RenderState& aRenderState) override; virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawBitmapModulated( const css::uno::Reference< css::rendering::XBitmap>& xBitmap, const css::rendering::ViewState& aViewState, - const css::rendering::RenderState& aRenderState) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) override; + const css::rendering::RenderState& aRenderState) override; virtual css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL - getDevice() - throw (css::uno::RuntimeException, std::exception) override; + getDevice() override; // XSpriteCanvas css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation ( - const css::uno::Reference< css::rendering::XAnimation >& animation) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::rendering::XAnimation >& animation) override; css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps ( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps, - ::sal_Int8 interpolationMode) - throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int8 interpolationMode) override; css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite ( - const css::geometry::RealSize2D& spriteSize) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::geometry::RealSize2D& spriteSize) override; css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite ( - const css::uno::Reference< css::rendering::XSprite >& original) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::rendering::XSprite >& original) override; - sal_Bool SAL_CALL updateScreen (sal_Bool bUpdateAll) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL updateScreen (sal_Bool bUpdateAll) override; // XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XBitmap - virtual css::geometry::IntegerSize2D SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::geometry::IntegerSize2D SAL_CALL getSize() override; - virtual sal_Bool SAL_CALL hasAlpha() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasAlpha() override; virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& rNewSize, - sal_Bool bFast) - throw (css::uno::RuntimeException, - css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, std::exception) override; + sal_Bool bFast) override; private: css::uno::Reference<css::rendering::XSpriteCanvas> mxUpdateCanvas; @@ -374,8 +323,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 7a7f4856da53..f452e0d41893 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -58,7 +58,6 @@ PresenterHelper::~PresenterHelper() //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterHelper::initialize (const Sequence<Any>& rArguments) - throw(Exception,RuntimeException, std::exception) { (void)rArguments; } @@ -71,7 +70,6 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( sal_Bool bInitiallyVisible, sal_Bool bEnableChildTransparentMode, sal_Bool bEnableParentClip) - throw (css::uno::RuntimeException, std::exception) { VclPtr<vcl::Window> pParentWindow(VCLUnoHelper::GetWindow(rxParentWindow)); @@ -119,7 +117,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas ( const Reference<rendering::XCanvas>& rxSharedCanvas, const Reference<awt::XWindow>& rxSharedWindow, const Reference<awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception) { if ( ! rxSharedCanvas.is() || ! rxSharedWindow.is() @@ -143,7 +140,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( const Reference<awt::XWindow>& rxWindow, sal_Int16 nRequestedCanvasFeatures, const OUString& rsOptionalCanvasServiceName) - throw (css::uno::RuntimeException, std::exception) { (void)nRequestedCanvasFeatures; @@ -177,7 +173,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( void SAL_CALL PresenterHelper::toTop ( const Reference<awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception) { VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow) @@ -199,7 +194,6 @@ struct IdMapEntry { Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( const OUString& id, const Reference<rendering::XCanvas>& rxCanvas) - throw (RuntimeException, std::exception) { if ( ! rxCanvas.is()) return nullptr; @@ -421,7 +415,6 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( void SAL_CALL PresenterHelper::captureMouse ( const Reference<awt::XWindow>& rxWindow) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); @@ -434,7 +427,6 @@ void SAL_CALL PresenterHelper::captureMouse ( } void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWindow) - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); @@ -449,7 +441,6 @@ void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWi awt::Rectangle PresenterHelper::getWindowExtentsRelative ( const Reference<awt::XWindow>& rxChildWindow, const Reference<awt::XWindow>& rxParentWindow) - throw (RuntimeException, std::exception) { VclPtr<vcl::Window> pChildWindow = VCLUnoHelper::GetWindow(rxChildWindow); VclPtr<vcl::Window> pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index e5f0113f068b..cad98b4b15f4 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -48,8 +48,7 @@ public: // XInitialize - virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw(css::uno::Exception,css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override; // XPresenterHelper @@ -58,42 +57,34 @@ public: sal_Bool bCreateSystemChildWindow, sal_Bool bInitiallyVisible, sal_Bool bEnableChildTransparentMode, - sal_Bool bEnableParentClip) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bEnableParentClip) override; virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createSharedCanvas ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxUpdateCanvas, const css::uno::Reference<css::awt::XWindow>& rxUpdateWindow, const css::uno::Reference<css::rendering::XCanvas>& rxSharedCanvas, const css::uno::Reference<css::awt::XWindow>& rxSharedWindow, - const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::awt::XWindow>& rxWindow) override; virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createCanvas ( const css::uno::Reference<css::awt::XWindow>& rxWindow, sal_Int16 nRequestedCanvasFeatures, - const OUString& rsOptionalCanvasServiceName) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& rsOptionalCanvasServiceName) override; virtual void SAL_CALL toTop ( - const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::awt::XWindow>& rxWindow) override; virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL loadBitmap ( const OUString& rsURL, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) override; - virtual void SAL_CALL captureMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL captureMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) override; - virtual void SAL_CALL releaseMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) override; virtual css::awt::Rectangle SAL_CALL getWindowExtentsRelative ( const css::uno::Reference<css::awt::XWindow>& rxChildWindow, - const css::uno::Reference<css::awt::XWindow>& rxParentWindow) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::awt::XWindow>& rxParentWindow) override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 749e3b694803..da02be8d842d 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -87,7 +87,6 @@ PresenterPreviewCache::~PresenterPreviewCache() //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterPreviewCache::initialize (const Sequence<Any>& rArguments) - throw(Exception, RuntimeException, std::exception) { if (rArguments.getLength() != 0) throw RuntimeException(); @@ -98,7 +97,6 @@ void SAL_CALL PresenterPreviewCache::initialize (const Sequence<Any>& rArguments void SAL_CALL PresenterPreviewCache::setDocumentSlides ( const Reference<container::XIndexAccess>& rxSlides, const Reference<XInterface>& rxDocument) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCacheContext.get()!=nullptr); @@ -109,7 +107,6 @@ void SAL_CALL PresenterPreviewCache::setDocumentSlides ( void SAL_CALL PresenterPreviewCache::setVisibleRange ( sal_Int32 nFirstVisibleSlideIndex, sal_Int32 nLastVisibleSlideIndex) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCacheContext.get()!=nullptr); @@ -119,7 +116,6 @@ void SAL_CALL PresenterPreviewCache::setVisibleRange ( void SAL_CALL PresenterPreviewCache::setPreviewSize ( const css::geometry::IntegerSize2D& rSize) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCache.get()!=nullptr); @@ -131,7 +127,6 @@ void SAL_CALL PresenterPreviewCache::setPreviewSize ( Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( sal_Int32 nSlideIndex, const Reference<rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCacheContext.get()!=nullptr); @@ -154,7 +149,6 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( void SAL_CALL PresenterPreviewCache::addPreviewCreationNotifyListener ( const Reference<drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) return; @@ -164,14 +158,12 @@ void SAL_CALL PresenterPreviewCache::addPreviewCreationNotifyListener ( void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); mpCacheContext->RemovePreviewCreationNotifyListener(rxListener); } void SAL_CALL PresenterPreviewCache::pause() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCache.get()!=nullptr); @@ -179,7 +171,6 @@ void SAL_CALL PresenterPreviewCache::pause() } void SAL_CALL PresenterPreviewCache::resume() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCache.get()!=nullptr); @@ -187,7 +178,6 @@ void SAL_CALL PresenterPreviewCache::resume() } void PresenterPreviewCache::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 20af28218214..9c611dc72744 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -52,44 +52,35 @@ public: /** Accepts no arguments. All values that are necessary to set up a preview cache can be provided via methods. */ - virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw(css::uno::Exception,css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override; // XSlidePreviewCache virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess>& rxSlides, - const css::uno::Reference<css::uno::XInterface>& rxDocument) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::uno::XInterface>& rxDocument) override; virtual void SAL_CALL setVisibleRange ( sal_Int32 nFirstVisibleSlideIndex, - sal_Int32 nLastVisibleSlideIndex) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 nLastVisibleSlideIndex) override; virtual void SAL_CALL setPreviewSize ( - const css::geometry::IntegerSize2D& rSize) - throw (css::uno::RuntimeException, std::exception) override; + const css::geometry::IntegerSize2D& rSize) override; virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getSlidePreview ( sal_Int32 nSlideIndex, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) override; virtual void SAL_CALL addPreviewCreationNotifyListener ( - const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) override; virtual void SAL_CALL removePreviewCreationNotifyListener ( - const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) override; - virtual void SAL_CALL pause() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL pause() override; - virtual void SAL_CALL resume() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL resume() override; private: class PresenterCacheContext; @@ -100,7 +91,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 74ab94f7e667..ae5d81c9d802 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -115,7 +115,6 @@ void SAL_CALL PresenterTextView::disposing() // XInitialization void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments) - throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -217,7 +216,6 @@ Any PresenterTextView::SetPropertyValue ( } void PresenterTextView::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (PresenterTextViewInterfaceBase::rBHelper.bDisposed || PresenterTextViewInterfaceBase::rBHelper.bInDispose diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index ab70375b13fc..1024eccb5eb1 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -52,8 +52,7 @@ public: // XInitialization - virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override; protected: virtual void SAL_CALL disposing() override; @@ -71,7 +70,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index b0a6f088efea..f00cff827f4b 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -52,7 +52,6 @@ void SAL_CALL SlideRenderer::disposing() //----- XInitialization ------------------------------------------------------- void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments) - throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -64,19 +63,16 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments) } OUString SlideRenderer::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.Draw.SlideRenderer"); } sal_Bool SlideRenderer::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SlideRenderer::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{"com.sun.star.drawing.SlideRenderer"}; } @@ -87,7 +83,6 @@ Reference<awt::XBitmap> SlideRenderer::createPreview ( const Reference<drawing::XDrawPage>& rxSlide, const awt::Size& rMaximalSize, sal_Int16 nSuperSampleFactor) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -101,7 +96,6 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas ( const awt::Size& rMaximalSize, sal_Int16 nSuperSampleFactor, const Reference<rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -119,7 +113,6 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas ( awt::Size SAL_CALL SlideRenderer::calculatePreviewSize ( double nSlideAspectRatio, const awt::Size& rMaximalSize) - throw (css::uno::RuntimeException, std::exception) { if (rMaximalSize.Width <= 0 || rMaximalSize.Height <= 0 @@ -143,8 +136,6 @@ BitmapEx SlideRenderer::CreatePreview ( const Reference<drawing::XDrawPage>& rxSlide, const awt::Size& rMaximalSize, sal_Int16 nSuperSampleFactor) - throw (css::uno::RuntimeException, - std::exception) { const SdPage* pPage = SdPage::getImplementation(rxSlide); if (pPage == nullptr) @@ -198,7 +189,6 @@ BitmapEx SlideRenderer::CreatePreview ( } void SlideRenderer::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose) { diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index ca7de46f9cd7..5e0ad57d7dc2 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -54,37 +54,30 @@ public: // XInitialization - virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XSlideRenderer virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, - sal_Int16 nSuperSampleFactor) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int16 nSuperSampleFactor) override; virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL createPreviewForCanvas ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, sal_Int16 nSuperSampleFactor, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) override; virtual css::awt::Size SAL_CALL calculatePreviewSize ( double nSlideAspectRatio, - const css::awt::Size& rMaximumPreviewPixelSize) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Size& rMaximumPreviewPixelSize) override; private: PreviewRenderer maPreviewRenderer; @@ -93,13 +86,12 @@ private: BitmapEx CreatePreview ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, - sal_Int16 nSuperSampleFactor) - throw (css::uno::RuntimeException, std::exception); + sal_Int16 nSuperSampleFactor); /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 4792d6e61bfa..00e50c289093 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -64,20 +64,19 @@ void Listener::init( const css::uno::Reference< css::presentation::XSlideShowCon //----- XAnimationListener ---------------------------------------------------- void SAL_CALL Listener::beginEvent(const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) + css::animations::XAnimationNode >& rNode ) { (void) rNode; } void SAL_CALL Listener::endEvent( const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) + css::animations::XAnimationNode >& rNode ) { (void) rNode; } void SAL_CALL Listener::repeat( const css::uno::Reference< css::animations::XAnimationNode >& rNode, ::sal_Int32 aRepeat ) - throw (css::uno::RuntimeException, std::exception) { (void) rNode; (void) aRepeat; @@ -86,28 +85,23 @@ void SAL_CALL Listener::repeat( const css::uno::Reference< //----- XSlideShowListener ---------------------------------------------------- void SAL_CALL Listener::paused() - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL Listener::resumed() - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL Listener::slideEnded (sal_Bool bReverse) - throw (css::uno::RuntimeException, std::exception) { (void) bReverse; } void SAL_CALL Listener::hyperLinkClicked (const OUString &) - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL Listener::slideTransitionStarted() - throw (css::uno::RuntimeException, std::exception) { sal_Int32 aSlide = mController->getCurrentSlideIndex(); @@ -123,12 +117,10 @@ void SAL_CALL Listener::slideTransitionStarted() } void SAL_CALL Listener::slideTransitionEnded() - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL Listener::slideAnimationsEnded() - throw (css::uno::RuntimeException, std::exception) { } @@ -145,7 +137,6 @@ void SAL_CALL Listener::disposing() void SAL_CALL Listener::disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void) rEvent; dispose(); diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index e62b67340411..1e7bc4cca395 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -37,27 +37,24 @@ public: // XAnimationListener virtual void SAL_CALL beginEvent(const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) override; + css::animations::XAnimationNode >& rNode ) override; virtual void SAL_CALL endEvent( const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) override; + css::animations::XAnimationNode >& rNode ) override; virtual void SAL_CALL repeat( const css::uno::Reference< - css::animations::XAnimationNode >& rNode, ::sal_Int32 Repeat ) - throw (css::uno::RuntimeException, std::exception) override; + css::animations::XAnimationNode >& rNode, ::sal_Int32 Repeat ) override; // XSlideShowListener - virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL paused( ) override; + virtual void SAL_CALL resumed( ) override; + virtual void SAL_CALL slideTransitionStarted( ) override; + virtual void SAL_CALL slideTransitionEnded( ) override; + virtual void SAL_CALL slideAnimationsEnded( ) override; + virtual void SAL_CALL slideEnded(sal_Bool bReverse) override; + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) override; // XEventListener virtual void SAL_CALL disposing() override; - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; private: rtl::Reference<Communicator> mCommunicator; diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 808686361d9b..7e1048114eea 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -68,10 +68,6 @@ void SAL_CALL PanelFactory::disposing() Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( const ::rtl::OUString& rsUIElementResourceURL, const css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) { // Process arguments. const ::comphelper::NamedValueCollection aArguments (rArguments); diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index de4a6ec9f2db..444438255ea0 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -57,11 +57,7 @@ public: css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( const ::rtl::OUString& rsResourceURL, - const css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 2cbdf1e6dd52..23bea3a068ee 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -135,7 +135,7 @@ SlideShow::SlideShow( SdDrawDocument* pDoc ) { } -void SlideShow::ThrowIfDisposed() const throw (RuntimeException) +void SlideShow::ThrowIfDisposed() const { if( mpDoc == nullptr ) throw DisposedException(); @@ -226,17 +226,17 @@ void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::W } // XServiceInfo -OUString SAL_CALL SlideShow::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL SlideShow::getImplementationName( ) { return OUString( "com.sun.star.comp.sd.SlideShow" ); } -sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) { OUString aService( "com.sun.star.presentation.Presentation" ); Sequence< OUString > aSeq( &aService, 1 ); @@ -244,14 +244,14 @@ Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(Runt } // XPropertySet -Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() { SolarMutexGuard aGuard; static Reference< XPropertySetInfo > xInfo = maPropSet.getPropertySetInfo(); return xInfo; } -void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) { SolarMutexGuard aGuard; ThrowIfDisposed(); @@ -513,7 +513,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const mpDoc->SetChanged(); } -Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) { SolarMutexGuard aGuard; ThrowIfDisposed(); @@ -579,25 +579,25 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U } } -void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) { } -void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) { } -void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) { } -void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) { } // XPresentation -void SAL_CALL SlideShow::start() throw(RuntimeException, std::exception) +void SAL_CALL SlideShow::start() { const Sequence< PropertyValue > aArguments; startWithArguments( aArguments ); @@ -631,7 +631,6 @@ void SlideShow::SetExitAfterPresenting(bool bExit) } void SAL_CALL SlideShow::end() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -774,7 +773,7 @@ void SAL_CALL SlideShow::end() } } -void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exception) +void SAL_CALL SlideShow::rehearseTimings() { Sequence< PropertyValue > aArguments(1); aArguments[0].Name = "RehearseTimings"; @@ -785,7 +784,6 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exceptio // XPresentation2 void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rArguments) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ThrowIfDisposed(); @@ -846,13 +844,13 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr } -sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SlideShow::isRunning( ) { SolarMutexGuard aGuard; return mxController.is() && mxController->isRunning(); } -Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (RuntimeException, std::exception) +Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) { ThrowIfDisposed(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index f34d6972e312..2da56df510a4 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1163,13 +1163,13 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) } } -void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) { if( mxListenerProxy.is() ) mxListenerProxy->addSlideShowListener( xListener ); } -void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) { if( mxListenerProxy.is() ) mxListenerProxy->removeSlideShowListener( xListener ); @@ -1273,7 +1273,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber) } } -void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Exception, std::exception ) +void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) { try { @@ -1393,7 +1393,7 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl, void*, void) mxPresentation->end(); } -void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::pause() { SolarMutexGuard aSolarGuard; @@ -1419,7 +1419,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception) } } -void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::resume() { SolarMutexGuard aSolarGuard; @@ -1456,13 +1456,13 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception) #endif } -sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::isPaused() { SolarMutexGuard aSolarGuard; return mbIsPaused; } -void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) { SolarMutexGuard aSolarGuard; @@ -1619,7 +1619,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark return ( nPgNum - 1) >> 1; } -void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception) +void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) { OUString aBookmark( aHyperLink ); @@ -1670,7 +1670,7 @@ sal_Int32 SlideshowImpl::getCurrentSlideNumber() return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1; } -sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SlideshowImpl::isEndless() { SolarMutexGuard aSolarGuard; return maPresSettings.mbEndless; @@ -2500,7 +2500,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) } } -void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::activate() { SolarMutexGuard aSolarGuard; @@ -2539,7 +2539,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) } } -void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::deactivate() { SolarMutexGuard aSolarGuard; @@ -2570,7 +2570,7 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl, Timer *, void) } } -sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::isActive() { SolarMutexGuard aSolarGuard; return mbActive; @@ -2600,7 +2600,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn) } } -Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException, std::exception) +Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() { SolarMutexGuard aSolarGuard; @@ -2615,7 +2615,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE return xSlide; } -sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() { SolarMutexGuard aSolarGuard; @@ -2629,19 +2629,19 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, s } } -sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() { return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1; } // css::presentation::XSlideShowController: -::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() { return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0; } -Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) +Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) { if( (mpSlideController.get() == nullptr ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) ) throw IndexOutOfBoundsException(); @@ -2649,13 +2649,13 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index return mpSlideController->getSlideByNumber( mpSlideController->getSlideNumber( Index ) ); } -sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() { SolarMutexGuard aSolarGuard; return maPresSettings.mbAlwaysOnTop; } -void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) { SolarMutexGuard aSolarGuard; if( maPresSettings.mbAlwaysOnTop != bool(bAlways) ) @@ -2665,19 +2665,19 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx } } -sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::isFullScreen() { SolarMutexGuard aSolarGuard; return maPresSettings.mbFullScreen; } -sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() { SolarMutexGuard aSolarGuard; return maPresSettings.mbMouseVisible; } -void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) { SolarMutexGuard aSolarGuard; if( maPresSettings.mbMouseVisible != bool(bVisible) ) @@ -2688,13 +2688,13 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime } } -sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::getUsePen() { SolarMutexGuard aSolarGuard; return mbUsePen; } -void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) { SolarMutexGuard aSolarGuard; mbUsePen = bMouseAsPen; @@ -2735,33 +2735,33 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc } } -double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException, std::exception) +double SAL_CALL SlideshowImpl::getPenWidth() { SolarMutexGuard aSolarGuard; return mdUserPaintStrokeWidth; } -void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) { SolarMutexGuard aSolarGuard; mdUserPaintStrokeWidth = dStrokeWidth; setUsePen( true ); // enable pen mode, update color and width } -sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SlideshowImpl::getPenColor() { SolarMutexGuard aSolarGuard; return mnUserPaintColor; } -void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) { SolarMutexGuard aSolarGuard; mnUserPaintColor = nColor; setUsePen( true ); // enable pen mode, update color } -void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException) +void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) { if( bEraseAllInk ) { @@ -2782,13 +2782,13 @@ void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeExc } // XSlideShowController Methods -sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::isRunning( ) { SolarMutexGuard aSolarGuard; return mxShow.is(); } -void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::gotoNextEffect( ) { SolarMutexGuard aSolarGuard; @@ -2814,7 +2814,7 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::ex } } -void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) { SolarMutexGuard aSolarGuard; @@ -2836,7 +2836,7 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std } } -void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::gotoFirstSlide( ) { SolarMutexGuard aSolarGuard; @@ -2857,7 +2857,7 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::ex } } -void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::gotoNextSlide( ) { SolarMutexGuard aSolarGuard; @@ -2928,7 +2928,7 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exc } } -void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) { gotoPreviousSlide(false); } @@ -2982,7 +2982,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) } } -void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::gotoLastSlide() { SolarMutexGuard aSolarGuard; @@ -3006,7 +3006,7 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::excep } } -void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) { SolarMutexGuard aSolarGuard; @@ -3019,7 +3019,6 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru } void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) - throw(IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3039,7 +3038,7 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) } } -void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; @@ -3049,7 +3048,7 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx displaySlideIndex( nIndex ); } -void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::exception) +void SAL_CALL SlideshowImpl::stopSound( ) { SolarMutexGuard aSolarGuard; @@ -3074,27 +3073,27 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::excepti // XIndexAccess -::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) { return getSlideCount(); } -css::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) { return Any( getSlideByIndex( Index ) ); } -css::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (css::uno::RuntimeException, std::exception) +css::uno::Type SAL_CALL SlideshowImpl::getElementType( ) { return cppu::UnoType<XDrawPage>::get(); } -sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SlideshowImpl::hasElements( ) { return getSlideCount() != 0; } -Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException, std::exception) +Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() { return mxShow; } @@ -3115,7 +3114,7 @@ PresentationSettingsEx::PresentationSettingsEx( PresentationSettings& r ) { } -void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArguments ) throw (IllegalArgumentException, std::exception) +void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArguments ) { sal_Int32 nArguments = rArguments.getLength(); const PropertyValue* pValue = rArguments.getConstArray(); @@ -3127,7 +3126,7 @@ void PresentationSettingsEx::SetArguments( const Sequence< PropertyValue >& rArg } } -void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue ) throw (IllegalArgumentException, std::exception) +void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const Any& rValue ) { if ( rProperty == "RehearseTimings" ) { @@ -3276,7 +3275,7 @@ void SlideShowListenerProxy::removeSlideShowListener( const css::uno::Reference< maListeners.removeInterface(xListener); } -void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3289,7 +3288,7 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNod } } -void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3302,7 +3301,7 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode } } -void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3317,7 +3316,7 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& // css::presentation::XSlideShowListener: -void SAL_CALL SlideShowListenerProxy::paused( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::paused( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3328,7 +3327,7 @@ void SAL_CALL SlideShowListenerProxy::paused( ) throw (css::uno::RuntimeExcepti }); } -void SAL_CALL SlideShowListenerProxy::resumed( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::resumed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3339,7 +3338,7 @@ void SAL_CALL SlideShowListenerProxy::resumed( ) throw (css::uno::RuntimeExcept }); } -void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3350,7 +3349,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx }); } -void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3361,7 +3360,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (css::uno::R }); } -void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3372,7 +3371,7 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (css::uno:: }); } -void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException, std::exception) +void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3393,7 +3392,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti } } -void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception) +void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3416,7 +3415,7 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro // XEventListener -void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& aDisposeEvent ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& aDisposeEvent ) { maListeners.disposeAndClear( aDisposeEvent ); mxController.clear(); @@ -3425,7 +3424,7 @@ void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& a // XShapeEventListener -void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& aOriginalEvent ) { SolarMutexGuard aSolarGuard; if( mxController.is() ) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index eebe4c0a0a40..810e0709b288 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -101,10 +101,10 @@ struct PresentationSettingsEx : public PresentationSettings explicit PresentationSettingsEx( PresentationSettings& ); /// @throws css::lang::IllegalArgumentException - void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException, std::exception); + void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ); /// @throws css::lang::IllegalArgumentException - void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, std::exception); + void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ); }; struct WrappedShapeEventImpl @@ -135,24 +135,24 @@ public: void removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape ); // css::animations::XAnimationListener - virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override; + virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override; + virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) override; // css::presentation::XSlideShowListener: - virtual void SAL_CALL paused() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resumed() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL paused() override; + virtual void SAL_CALL resumed() override; + virtual void SAL_CALL slideTransitionStarted() override; + virtual void SAL_CALL slideTransitionEnded() override; + virtual void SAL_CALL slideAnimationsEnded() override; + virtual void SAL_CALL slideEnded(sal_Bool bReverse) override; + virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) override; // css::lang::XEventListener: - virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject & Source) override; // css::presentation::XShapeEventListener: - virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) override; ::comphelper::OInterfaceContainerHelper2 maListeners; @@ -171,57 +171,57 @@ public: explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow); // css::presentation::XSlideShowController: - virtual sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAlwaysOnTop( sal_Bool _alwaysontop ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMouseVisible() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMouseVisible( sal_Bool _mousevisible ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setUsePen( sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAlwaysOnTop() override; + virtual void SAL_CALL setAlwaysOnTop( sal_Bool _alwaysontop ) override; + virtual sal_Bool SAL_CALL getMouseVisible() override; + virtual void SAL_CALL setMouseVisible( sal_Bool _mousevisible ) override; + virtual sal_Bool SAL_CALL getUsePen() override; + virtual void SAL_CALL setUsePen( sal_Bool _usepen ) override; + virtual ::sal_Int32 SAL_CALL getPenColor() override; + virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) override; + virtual double SAL_CALL getPenWidth() override; + virtual void SAL_CALL setPenWidth( double dStrokeWidth ) override; /// @throws css::uno::RuntimeException - void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoNextEffect( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoPreviousEffect( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoFirstSlide( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoLastSlide( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stopSound( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL pause( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resume( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isPaused( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL activate( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deactivate( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getNextSlideIndex( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEndless( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFullScreen( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEraseAllInk( bool bEraseAllInk ); + virtual sal_Bool SAL_CALL isRunning( ) override; + virtual ::sal_Int32 SAL_CALL getSlideCount( ) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) override; + virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) override; + virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) override; + virtual void SAL_CALL gotoNextEffect( ) override; + virtual void SAL_CALL gotoPreviousEffect( ) override; + virtual void SAL_CALL gotoFirstSlide( ) override; + virtual void SAL_CALL gotoNextSlide( ) override; + virtual void SAL_CALL gotoPreviousSlide( ) override; + virtual void SAL_CALL gotoLastSlide( ) override; + virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) override; + virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) override; + virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) override; + virtual void SAL_CALL stopSound( ) override; + virtual void SAL_CALL pause( ) override; + virtual void SAL_CALL resume( ) override; + virtual sal_Bool SAL_CALL isPaused( ) override; + virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) override; + virtual void SAL_CALL activate( ) override; + virtual void SAL_CALL deactivate( ) override; + virtual sal_Bool SAL_CALL isActive( ) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide( ) override; + virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex( ) override; + virtual ::sal_Int32 SAL_CALL getNextSlideIndex( ) override; + virtual sal_Bool SAL_CALL isEndless( ) override; + virtual sal_Bool SAL_CALL isFullScreen( ) override; + virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow void slideEnded(const bool bReverse); /// @throws css::uno::RuntimeException - void hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception); + void hyperLinkClicked(const OUString & hyperLink); void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent); bool swipe(const CommandSwipeData &rSwipeData); bool longpress(const CommandLongPressData& rLongPressData); @@ -304,7 +304,7 @@ private: void removeShapeEvents(); void registerShapeEvents( sal_Int32 nSlideNumber ); /// @throws css::uno::Exception - void registerShapeEvents( css::uno::Reference< css::drawing::XShapes >& xShapes ) throw (css::uno::Exception, std::exception); + void registerShapeEvents( css::uno::Reference< css::drawing::XShapes >& xShapes ); static css::uno::Reference< css::presentation::XSlideShow > createSlideShow(); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 7437810555bd..a22e15baa598 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -67,7 +67,7 @@ void SlideShowViewListeners::removeListener( const Reference< util::XModifyListe maListeners.erase( aIter ); } -void SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( css::uno::Exception ) +void SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) { ::osl::MutexGuard aGuard( mrMutex ); @@ -109,7 +109,7 @@ SlideShowViewPaintListeners::SlideShowViewPaintListeners( ::osl::Mutex& rMutex ) } bool SlideShowViewPaintListeners::implTypedNotify( const Reference< awt::XPaintListener >& rListener, - const awt::PaintEvent& rEvent ) throw( uno::Exception ) + const awt::PaintEvent& rEvent ) { rListener->windowPaint( rEvent ); return true; // continue calling listeners @@ -122,7 +122,7 @@ SlideShowViewMouseListeners::SlideShowViewMouseListeners( ::osl::Mutex& rMutex ) } bool SlideShowViewMouseListeners::implTypedNotify( const Reference< awt::XMouseListener >& rListener, - const WrappedMouseEvent& rEvent ) throw( uno::Exception ) + const WrappedMouseEvent& rEvent ) { switch( rEvent.meType ) { @@ -153,7 +153,7 @@ SlideShowViewMouseMotionListeners::SlideShowViewMouseMotionListeners( ::osl::Mut } bool SlideShowViewMouseMotionListeners::implTypedNotify( const Reference< awt::XMouseMotionListener >& rListener, - const WrappedMouseMotionEvent& rEvent ) throw( uno::Exception ) + const WrappedMouseMotionEvent& rEvent ) { switch( rEvent.meType ) { @@ -200,7 +200,7 @@ SlideShowView::SlideShowView( ShowWindow& rOutputWindow, } // Dispose all internal references -void SAL_CALL SlideShowView::dispose() throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::dispose() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -227,7 +227,7 @@ void SAL_CALL SlideShowView::dispose() throw (RuntimeException, std::exception) } // Disposing our broadcaster -void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(RuntimeException, std::exception) +void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -252,7 +252,7 @@ void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(Runtime } } -void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeException) +void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -276,14 +276,14 @@ void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeExc } // XSlideShowView methods -Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas( ) throw (RuntimeException, std::exception) +Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mpCanvas.get() ? mpCanvas->getUNOSpriteCanvas() : Reference< rendering::XSpriteCanvas >(); } -void SAL_CALL SlideShowView::clear() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SlideShowView::clear() { // paint background in black ::osl::MutexGuard aGuard( m_aMutex ); @@ -307,12 +307,12 @@ void SAL_CALL SlideShowView::clear() throw (css::uno::RuntimeException, std::exc } } -geometry::IntegerSize2D SAL_CALL SlideShowView::getTranslationOffset( ) throw (RuntimeException, std::exception) +geometry::IntegerSize2D SAL_CALL SlideShowView::getTranslationOffset( ) { return mTranslationOffset; } -geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (RuntimeException, std::exception) +geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) { ::osl::MutexGuard aGuard( m_aMutex ); SolarMutexGuard aSolarGuard; @@ -373,7 +373,7 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (Ru return ::basegfx::unotools::affineMatrixFromHomMatrix( aRes, aMatrix ); } -void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -381,7 +381,7 @@ void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< mpViewListeners->addListener( xListener ); } -void SAL_CALL SlideShowView::removeTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::removeTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -389,7 +389,7 @@ void SAL_CALL SlideShowView::removeTransformationChangedListener( const Referenc mpViewListeners->removeListener( xListener ); } -void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListener >& xListener ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -397,7 +397,7 @@ void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListe mpPaintListeners->addTypedListener( xListener ); } -void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintListener >& xListener ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -405,7 +405,7 @@ void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintLi mpPaintListeners->removeTypedListener( xListener ); } -void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListener >& xListener ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -413,7 +413,7 @@ void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListe mpMouseListeners->addTypedListener( xListener ); } -void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseListener >& xListener ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -421,7 +421,7 @@ void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseLi mpMouseListeners->removeTypedListener( xListener ); } -void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -437,7 +437,7 @@ void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMous mpMouseMotionListeners->addTypedListener( xListener ); } -void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -448,7 +448,7 @@ void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XM // events, when the last listener is gone. } -void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -460,7 +460,7 @@ void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (Ru mxWindowPeer->setPointer( mxPointer ); } -awt::Rectangle SAL_CALL SlideShowView::getCanvasArea( ) throw (RuntimeException, std::exception) +awt::Rectangle SAL_CALL SlideShowView::getCanvasArea( ) { awt::Rectangle aRectangle; @@ -493,7 +493,7 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp } // XWindowListener methods -void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -509,23 +509,23 @@ void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (R } } -void SAL_CALL SlideShowView::windowMoved( const awt::WindowEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::windowMoved( const awt::WindowEvent& ) { // ignored } -void SAL_CALL SlideShowView::windowShown( const lang::EventObject& ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::windowShown( const lang::EventObject& ) { // ignored } -void SAL_CALL SlideShowView::windowHidden( const lang::EventObject& ) throw (RuntimeException, std::exception) +void SAL_CALL SlideShowView::windowHidden( const lang::EventObject& ) { // ignored } // XMouseListener implementation -void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); if( mpSlideShow && mpSlideShow->isInputFreezed() ) @@ -549,7 +549,7 @@ void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno } } -void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); if( mbMousePressedEaten ) @@ -572,7 +572,7 @@ void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (un } } -void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -588,7 +588,7 @@ void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) throw (uno updateimpl( aGuard, mpSlideShow ); // warning: clears guard! } -void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -605,7 +605,7 @@ void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) throw (uno: } // XMouseMotionListener implementation -void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -621,7 +621,7 @@ void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) throw (uno updateimpl( aGuard, mpSlideShow ); // warning: clears guard! } -void SAL_CALL SlideShowView::mouseMoved( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SlideShowView::mouseMoved( const awt::MouseEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 0d3eceba2abd..4f96a8772394 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -106,7 +106,7 @@ public: void addListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener ); void removeListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener ); /// @throws css::uno::Exception - void notify( const css::lang::EventObject& _rEvent ) throw( css::uno::Exception ); + void notify( const css::lang::EventObject& _rEvent ); void disposing( const css::lang::EventObject& _rEventSource ); protected: @@ -124,7 +124,7 @@ public: SlideShowViewPaintListeners( ::osl::Mutex& rMutex ); protected: - virtual bool implTypedNotify( const css::uno::Reference< css::awt::XPaintListener >& rListener, const css::awt::PaintEvent& rEvent ) throw( css::uno::Exception ) override; + virtual bool implTypedNotify( const css::uno::Reference< css::awt::XPaintListener >& rListener, const css::awt::PaintEvent& rEvent ) override; }; // SlideShowViewMouseListeners @@ -137,7 +137,7 @@ public: protected: virtual bool implTypedNotify( const css::uno::Reference< css::awt::XMouseListener >& rListener, - const WrappedMouseEvent& rEvent ) throw( css::uno::Exception ) override; + const WrappedMouseEvent& rEvent ) override; }; @@ -152,7 +152,7 @@ public: protected: virtual bool implTypedNotify( const css::uno::Reference< css::awt::XMouseMotionListener >& rListener, - const WrappedMouseMotionEvent& rEvent ) throw( css::uno::Exception ) override; + const WrappedMouseMotionEvent& rEvent ) override; }; // SlideShowView @@ -177,45 +177,45 @@ public: void ignoreNextMouseReleased() { mbMousePressedEaten = true; } /// Dispose all internal references - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; /// Disposing our broadcaster - virtual void SAL_CALL disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& ) override; /// @throws css::uno::RuntimeException - void SAL_CALL paint( const css::awt::PaintEvent& e ) throw (css::uno::RuntimeException); + void SAL_CALL paint( const css::awt::PaintEvent& e ); // XSlideShowView methods - virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCanvasArea( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) override; + virtual void SAL_CALL clear( ) override; + virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation( ) override; + virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) override; + virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override; + virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) override; + virtual css::awt::Rectangle SAL_CALL getCanvasArea( ) override; // XWindowListener methods - virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override; + virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) override; // XMouseListener implementation - virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override; // XMouseMotionListener implementation - virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) override; using cppu::WeakComponentImplHelperBase::disposing; diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 330e1a71a88a..271ff8ad02fa 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -394,7 +394,6 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent void SAL_CALL Listener::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if ((mbListeningToDocument || mbListeningToUNODocument) && mrSlideSorter.GetModel().GetDocument()!=nullptr @@ -418,7 +417,6 @@ void SAL_CALL Listener::disposing ( void SAL_CALL Listener::notifyEvent ( const document::EventObject& ) - throw (RuntimeException, std::exception) { } @@ -426,7 +424,6 @@ void SAL_CALL Listener::notifyEvent ( void SAL_CALL Listener::propertyChange ( const PropertyChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -475,7 +472,6 @@ void SAL_CALL Listener::propertyChange ( //===== frame::XFrameActionListener ========================================== void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { switch (rEvent.Action) { @@ -500,7 +496,6 @@ void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent) void SAL_CALL Listener::notifyEvent ( const AccessibleEventObject& ) - throw (RuntimeException, std::exception) { } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 429ff75162d4..3b0d26e619d8 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -96,27 +96,23 @@ public: //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; //===== document::XEventListener ======================================== virtual void SAL_CALL notifyEvent ( - const css::document::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + const css::document::EventObject& rEventObject) override; //===== beans::XPropertySetListener ===================================== virtual void SAL_CALL propertyChange ( - const css::beans::PropertyChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyChangeEvent& rEvent) override; //===== accessibility::XAccessibleEventListener ========================== virtual void SAL_CALL notifyEvent ( const css::accessibility::AccessibleEventObject& - rEvent) - throw (css::uno::RuntimeException, std::exception) override; + rEvent) override; //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -124,8 +120,7 @@ public: in the center pane is replaced by another view shell. */ virtual void SAL_CALL - frameAction (const css::frame::FrameActionEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + frameAction (const css::frame::FrameActionEvent& rEvent) override; virtual void SAL_CALL disposing() override; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 35f53ae46036..a1e00135e4bf 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -66,7 +66,6 @@ void SAL_CALL SlideSorterService::disposing() //----- XInitialization ------------------------------------------------------- void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) - throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -116,13 +115,11 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) //----- XView ----------------------------------------------------------------- Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId() - throw (RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL SlideSorterService::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } @@ -130,7 +127,6 @@ sal_Bool SAL_CALL SlideSorterService::isAnchorOnly() //----- XWindowListener ------------------------------------------------------- void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -139,13 +135,11 @@ void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent) } void SAL_CALL SlideSorterService::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -153,7 +147,6 @@ void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent) } void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -162,7 +155,6 @@ void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxParentWindow) mxParentWindow = nullptr; @@ -171,7 +163,6 @@ void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) //----- XDrawView ------------------------------------------------------------- void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr) @@ -180,7 +171,6 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP } Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr) @@ -192,14 +182,12 @@ Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage() //----- attributes ------------------------------------------------------------ Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides() - throw (RuntimeException, std::exception) { return mpSlideSorter->GetModel().GetDocumentSlides(); } void SAL_CALL SlideSorterService::setDocumentSlides ( const Reference<container::XIndexAccess >& rxSlides) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -207,7 +195,6 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( } sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -217,7 +204,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide() } void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -229,7 +215,6 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) } sal_Bool SAL_CALL SlideSorterService::getIsShowSelection() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -239,7 +224,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowSelection() } void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -247,7 +231,6 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) } sal_Bool SAL_CALL SlideSorterService::getIsShowFocus() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -257,7 +240,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowFocus() } void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -265,7 +247,6 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) } sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -275,7 +256,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection() } void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -283,7 +263,6 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) } sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -295,7 +274,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreen void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bValue) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -304,7 +282,6 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres } sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -314,7 +291,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical() } void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -324,7 +300,6 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) } sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -334,7 +309,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling() } void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -342,7 +316,6 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) } util::Color SAL_CALL SlideSorterService::getBackgroundColor() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -353,7 +326,6 @@ util::Color SAL_CALL SlideSorterService::getBackgroundColor() } void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundColor) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -361,7 +333,6 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol } util::Color SAL_CALL SlideSorterService::getTextColor() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -372,7 +343,6 @@ util::Color SAL_CALL SlideSorterService::getTextColor() } void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -380,7 +350,6 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) } util::Color SAL_CALL SlideSorterService::getSelectionColor() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -391,7 +360,6 @@ util::Color SAL_CALL SlideSorterService::getSelectionColor() } void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -399,7 +367,6 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor } util::Color SAL_CALL SlideSorterService::getHighlightColor() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -410,7 +377,6 @@ util::Color SAL_CALL SlideSorterService::getHighlightColor() } void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -418,7 +384,6 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor } sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == nullptr || ! mpSlideSorter->IsValid()) @@ -428,7 +393,6 @@ sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly() } void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != nullptr && mpSlideSorter->IsValid()) @@ -447,7 +411,6 @@ void SlideSorterService::Resize() } void SlideSorterService::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose) { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 6613b96131e1..26b98c989aa0 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -56,125 +56,89 @@ public: // XInitialization - virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override; // XResourceId - css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override; - sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isAnchorOnly() override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; // XDrawView virtual void SAL_CALL setCurrentPage( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; // Attributes - virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides() override; virtual void SAL_CALL setDocumentSlides ( - const css::uno::Reference<css::container::XIndexAccess >& rxSlides) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::container::XIndexAccess >& rxSlides) override; - virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide() override; - virtual void SAL_CALL setIsHighlightCurrentSlide (sal_Bool bIsHighlightCurrentSlide) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsHighlightCurrentSlide (sal_Bool bIsHighlightCurrentSlide) override; - virtual sal_Bool SAL_CALL getIsShowSelection() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsShowSelection() override; - virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) override; - virtual sal_Bool SAL_CALL getIsCenterSelection() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsCenterSelection() override; - virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) override; - virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation() override; virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( - sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) override; - virtual sal_Bool SAL_CALL getIsOrientationVertical() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsOrientationVertical() override; - virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) override; - virtual sal_Bool SAL_CALL getIsSmoothScrolling() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsSmoothScrolling() override; - virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) override; - virtual css::util::Color SAL_CALL getBackgroundColor() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getBackgroundColor() override; - virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) override; - virtual css::util::Color SAL_CALL getTextColor() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getTextColor() override; - virtual void SAL_CALL setTextColor (css::util::Color aTextColor) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTextColor (css::util::Color aTextColor) override; - virtual css::util::Color SAL_CALL getSelectionColor() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getSelectionColor() override; - virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) override; - virtual css::util::Color SAL_CALL getHighlightColor() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getHighlightColor() override; - virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) override; - virtual sal_Bool SAL_CALL getIsUIReadOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsUIReadOnly() override; - virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) override; - virtual sal_Bool SAL_CALL getIsShowFocus() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getIsShowFocus() override; - virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) override; private: std::shared_ptr<SlideSorter> mpSlideSorter; @@ -186,7 +150,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sd::slidesorter diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index cb21b379a049..6496ac33f805 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -77,20 +77,17 @@ public: //===== lang::XEventListener ============================================== virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; //===== beans::XPropertySetListener ======================================= virtual void SAL_CALL propertyChange ( - const css::beans::PropertyChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyChangeEvent& rEvent) override; //===== view::XSelectionChangeListener ==================================== virtual void SAL_CALL selectionChanged ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -98,14 +95,12 @@ public: in the center pane is replaced by another view shell. */ virtual void SAL_CALL - frameAction (const css::frame::FrameActionEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + frameAction (const css::frame::FrameActionEvent& rEvent) override; //===== drawing::framework::XConfigurationChangeListener ================== virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; virtual void SAL_CALL disposing() override; @@ -430,7 +425,6 @@ void EventMultiplexer::Implementation::DisconnectFromController() void SAL_CALL EventMultiplexer::Implementation::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (mbListeningToController) { @@ -454,7 +448,6 @@ void SAL_CALL EventMultiplexer::Implementation::disposing ( void SAL_CALL EventMultiplexer::Implementation::propertyChange ( const beans::PropertyChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -482,7 +475,6 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( void SAL_CALL EventMultiplexer::Implementation::frameAction ( const frame::FrameActionEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { Reference<frame::XFrame> xFrame (mxFrameWeak); if (rEvent.Frame == xFrame) @@ -514,7 +506,6 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction ( void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( const lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) { CallListeners (EventMultiplexerEventId::EditViewSelection); } @@ -523,7 +514,6 @@ void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { sal_Int32 nEventType = 0; rEvent.UserData >>= nEventType; diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index b386f53a5e56..59d25cb0618c 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -42,7 +42,6 @@ void SAL_CALL PropertySet::disposing() //----- XPropertySet ---------------------------------------------------------- Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo() - throw(RuntimeException, std::exception) { return nullptr; } @@ -50,11 +49,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo() void SAL_CALL PropertySet::setPropertyValue ( const OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -76,9 +70,6 @@ void SAL_CALL PropertySet::setPropertyValue ( } Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -88,9 +79,6 @@ Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) void SAL_CALL PropertySet::addPropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if ( ! rxListener.is()) throw lang::IllegalArgumentException(); @@ -107,9 +95,6 @@ void SAL_CALL PropertySet::addPropertyChangeListener ( void SAL_CALL PropertySet::removePropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) - throw(beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { ::std::pair<ChangeListenerContainer::iterator,ChangeListenerContainer::iterator> aRange (mpChangeListeners->equal_range(rsPropertyName)); @@ -135,9 +120,6 @@ void SAL_CALL PropertySet::removePropertyChangeListener ( void SAL_CALL PropertySet::addVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { // Constraint properties are not supported and thus no vetoable // listeners. @@ -148,9 +130,6 @@ void SAL_CALL PropertySet::addVetoableChangeListener ( void SAL_CALL PropertySet::removeVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { // Constraint properties are not supported and thus no vetoable // listeners. @@ -173,7 +152,6 @@ void PropertySet::CallListeners ( } void PropertySet::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index e827ff4ec723..1d359ace214d 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -118,7 +118,6 @@ uno::Reference<frame::XDispatch> void SlotStateListener::statusChanged ( const frame::FeatureStateEvent& rState) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); OUString sSlotName (rState.FeatureURL.Complete); @@ -146,12 +145,10 @@ void SlotStateListener::ReleaseListeners() void SAL_CALL SlotStateListener::disposing ( const lang::EventObject& ) - throw (uno::RuntimeException, std::exception) { } void SlotStateListener::ThrowIfDisposed() - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { 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; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 6dfcbfd36747..e08eac833ed5 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2234,7 +2234,6 @@ DocumentRenderer::~DocumentRenderer() sal_Int32 SAL_CALL DocumentRenderer::getRendererCount ( const css::uno::Any& aSelection, const css::uno::Sequence<css::beans::PropertyValue >& rOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)aSelection; mpImpl->ProcessProperties(rOptions); @@ -2245,7 +2244,6 @@ Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence<css::beans::PropertyValue>& rOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)nRenderer; (void)rSelection; @@ -2257,7 +2255,6 @@ void SAL_CALL DocumentRenderer::render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence<css::beans::PropertyValue>& rOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)rSelection; mpImpl->ProcessProperties(rOptions); diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index e82108ef7e88..fc7492c7e92c 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -235,7 +235,6 @@ vcl::Window* ViewTabBar::GetAnchorWindow( void SAL_CALL ViewTabBar::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent) && rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix) @@ -249,7 +248,6 @@ void SAL_CALL ViewTabBar::notifyConfigurationChange ( void SAL_CALL ViewTabBar::disposing( const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxConfigurationController) { @@ -263,35 +261,30 @@ void SAL_CALL ViewTabBar::disposing( void SAL_CALL ViewTabBar::addTabBarButtonAfter ( const TabBarButton& rButton, const TabBarButton& rAnchor) - throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; AddTabBarButton(rButton, rAnchor); } void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton) - throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; AddTabBarButton(rButton); } void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton) - throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; RemoveTabBarButton(rButton); } sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) - throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; return HasTabBarButton(rButton); } Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons() - throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; return GetTabBarButtons(); @@ -300,13 +293,11 @@ Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons() //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId() - throw (RuntimeException, std::exception) { return mxViewTabBarId; } sal_Bool SAL_CALL ViewTabBar::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } @@ -324,7 +315,6 @@ const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId() } sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) - throw (RuntimeException, std::exception) { sal_Int64 nResult = 0; diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 5257e60796b3..7c4f59dab434 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -90,12 +90,12 @@ public: explicit ScannerEventListener( DrawViewShell* pParent ) : mpParent( pParent ) {} // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) override; void ParentDestroyed() { mpParent = nullptr; } }; -void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) { if( mpParent ) mpParent->ScannerEvent( rEventObject ); |