diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /sd/source/ui | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sd/source/ui')
138 files changed, 1678 insertions, 1678 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 3928f304cb7a..343551981b28 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -242,7 +242,7 @@ void AccessibleDocumentViewBase::ViewForwarderChanged(ChangeType, const IAccessi Reference<XAccessible> SAL_CALL AccessibleDocumentViewBase::getAccessibleParent (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -253,7 +253,7 @@ Reference<XAccessible> SAL_CALL sal_Int32 SAL_CALL AccessibleDocumentViewBase::getAccessibleChildCount (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -268,7 +268,7 @@ sal_Int32 SAL_CALL Reference<XAccessible> SAL_CALL AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { ThrowIfDisposed (); @@ -292,7 +292,7 @@ Reference<XAccessible> SAL_CALL uno::Reference<XAccessible > SAL_CALL AccessibleDocumentViewBase::getAccessibleAtPoint ( const awt::Point& aPoint) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -332,7 +332,7 @@ uno::Reference<XAccessible > SAL_CALL awt::Rectangle SAL_CALL AccessibleDocumentViewBase::getBounds (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -371,7 +371,7 @@ awt::Rectangle SAL_CALL awt::Point SAL_CALL AccessibleDocumentViewBase::getLocation (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -383,7 +383,7 @@ awt::Point SAL_CALL awt::Point SAL_CALL AccessibleDocumentViewBase::getLocationOnScreen (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); ::Point aLogicalPoint (maShapeTreeInfo.GetViewForwarder()->GetVisibleArea().TopLeft()); @@ -396,7 +396,7 @@ awt::Point SAL_CALL awt::Size SAL_CALL AccessibleDocumentViewBase::getSize (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -421,7 +421,7 @@ awt::Size SAL_CALL uno::Any SAL_CALL AccessibleDocumentViewBase::queryInterface (const uno::Type & rType) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aReturn = AccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -466,7 +466,7 @@ void SAL_CALL OUString SAL_CALL AccessibleDocumentViewBase::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleDocumentViewBase"); } @@ -476,7 +476,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleDocumentViewBase::getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return AccessibleContextBase::getSupportedServiceNames (); @@ -490,7 +490,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL AccessibleDocumentViewBase::getTypes (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -591,7 +591,7 @@ void AccessibleDocumentViewBase::impl_dispose() void SAL_CALL AccessibleDocumentViewBase::disposing (const lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -611,7 +611,7 @@ void SAL_CALL //===== XPropertyChangeListener ============================================= void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyChangeEvent& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { // Empty } @@ -623,7 +623,7 @@ void SAL_CALL AccessibleDocumentViewBase::propertyChange (const beans::PropertyC void SAL_CALL AccessibleDocumentViewBase::windowResized (const ::com::sun::star::awt::WindowEvent& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -638,7 +638,7 @@ void SAL_CALL void SAL_CALL AccessibleDocumentViewBase::windowMoved (const ::com::sun::star::awt::WindowEvent& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -653,7 +653,7 @@ void SAL_CALL void SAL_CALL AccessibleDocumentViewBase::windowShown (const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -668,7 +668,7 @@ void SAL_CALL void SAL_CALL AccessibleDocumentViewBase::windowHidden (const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if( IsDisposed() ) return; @@ -684,7 +684,7 @@ void SAL_CALL //===== XFocusListener ================================================== void AccessibleDocumentViewBase::focusGained (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (e.Source == mxWindow) @@ -692,7 +692,7 @@ void AccessibleDocumentViewBase::focusGained (const ::com::sun::star::awt::Focus } void AccessibleDocumentViewBase::focusLost (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (e.Source == mxWindow) @@ -959,7 +959,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL AccessibleDocumentViewBase::get_AccFlowTo(const ::com::sun::star::uno::Any&, sal_Int32 ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Sequence< uno::Any> aRet; @@ -967,13 +967,13 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() } sal_Int32 SAL_CALL AccessibleDocumentViewBase::getForeground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL AccessibleDocumentViewBase::getBackground( ) - throw (uno::RuntimeException) + 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 1ba149e83896..63a3b0e0a26d 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -207,7 +207,7 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh sal_Int32 SAL_CALL AccessibleDrawDocumentView::getAccessibleChildCount (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -225,7 +225,7 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible> SAL_CALL AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { ThrowIfDisposed (); @@ -259,7 +259,7 @@ uno::Reference<XAccessible> SAL_CALL OUString SAL_CALL AccessibleDrawDocumentView::getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -297,7 +297,7 @@ OUString SAL_CALL void SAL_CALL AccessibleDrawDocumentView::disposing (const lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -318,7 +318,7 @@ void SAL_CALL void SAL_CALL AccessibleDrawDocumentView::propertyChange (const beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -421,7 +421,7 @@ void SAL_CALL OUString SAL_CALL AccessibleDrawDocumentView::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleDrawDocumentView"); } @@ -431,7 +431,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleDrawDocumentView::getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // Get list of supported service names from base class... @@ -451,7 +451,7 @@ OUString SAL_CALL uno::Any SAL_CALL AccessibleDrawDocumentView::queryInterface (const uno::Type & rType) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aReturn = AccessibleDocumentViewBase::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -476,7 +476,7 @@ void SAL_CALL //===== XAccessibleGroupPosition ========================================= uno::Sequence< sal_Int32 > SAL_CALL AccessibleDrawDocumentView::getGroupPosition( const uno::Any& rAny ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -893,7 +893,7 @@ void SAL_CALL AccessibleDrawDocumentView::disposing (void) ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL AccessibleDrawDocumentView::get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 4980d77a7b4d..c37ab858f765 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -122,7 +122,7 @@ void AccessibleOutlineView::ViewForwarderChanged (ChangeType aChangeType, sal_Int32 SAL_CALL AccessibleOutlineView::getAccessibleChildCount (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -133,7 +133,7 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible> SAL_CALL AccessibleOutlineView::getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Forward request to children manager. @@ -144,7 +144,7 @@ uno::Reference<XAccessible> SAL_CALL OUString SAL_CALL AccessibleOutlineView::getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -172,7 +172,7 @@ OUString SAL_CALL //===== XAccessibleEventBroadcaster ======================================== -void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException) +void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception) { // delegate listener handling to children manager. if ( ! IsDisposed()) @@ -180,7 +180,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) +void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception) { // forward if ( ! IsDisposed()) @@ -192,7 +192,7 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R OUString SAL_CALL AccessibleOutlineView::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleOutlineView"); } @@ -202,7 +202,7 @@ OUString SAL_CALL void SAL_CALL AccessibleOutlineView::disposing (const lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { AccessibleDocumentViewBase::disposing (rEventObject); } @@ -243,7 +243,7 @@ void SAL_CALL AccessibleOutlineView::disposing (void) void SAL_CALL AccessibleOutlineView::propertyChange (const beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 84b3695401a1..011db15fc205 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -74,7 +74,7 @@ void AccessiblePageShape::Init (void) sal_Int32 SAL_CALL AccessiblePageShape::getAccessibleChildCount (void) - throw () + throw (std::exception) { return 0; } @@ -87,7 +87,7 @@ sal_Int32 SAL_CALL */ uno::Reference<XAccessible> SAL_CALL AccessiblePageShape::getAccessibleChild( sal_Int32 ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException ("page shape has no children", static_cast<uno::XWeak*>(this)); @@ -99,7 +99,7 @@ uno::Reference<XAccessible> SAL_CALL //===== XAccessibleComponent ================================================ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -167,7 +167,7 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -196,7 +196,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) draw page or its master page. */ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x01020ffL); @@ -249,7 +249,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) OUString SAL_CALL AccessiblePageShape::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return OUString("AccessiblePageShape"); @@ -260,7 +260,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessiblePageShape::getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); return AccessibleShape::getSupportedServiceNames(); @@ -273,7 +273,7 @@ OUString SAL_CALL void SAL_CALL AccessiblePageShape::disposing (const ::com::sun::star::lang::EventObject& aEvent) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); AccessibleShape::disposing (aEvent); @@ -285,7 +285,7 @@ void SAL_CALL //===== XComponent ========================================================== void AccessiblePageShape::dispose (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { OSL_TRACE ("AccessiblePageShape::dispose"); diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index d8600b0b1c0d..385e102dbf30 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -53,7 +53,7 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) OUString SAL_CALL AccessiblePresentationGraphicShape::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationGraphicShape"); } @@ -113,7 +113,7 @@ OUString } sal_Int16 SAL_CALL AccessiblePresentationGraphicShape::getAccessibleRole () - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleRole::GRAPHIC ; } diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index c3f2be9a5df0..187d478a10d7 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -47,7 +47,7 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) OUString SAL_CALL AccessiblePresentationOLEShape::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationOLEShape"); } @@ -120,7 +120,7 @@ OUString // Return this object's role. sal_Int16 SAL_CALL AccessiblePresentationOLEShape::getAccessibleRole () - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 7d6771e72fd4..6c325abe5863 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -55,7 +55,7 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void) OUString SAL_CALL AccessiblePresentationShape::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationShape"); } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index d76e90cb6b6f..992ba05128b4 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -121,7 +121,7 @@ void SAL_CALL AccessibleSlideSorterObject::disposing (void) Reference<XAccessibleContext> SAL_CALL AccessibleSlideSorterObject::getAccessibleContext (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return this; @@ -132,7 +132,7 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ==================================================== sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return 0; @@ -142,7 +142,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int32 ) - throw (lang::IndexOutOfBoundsException, RuntimeException) + throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); throw lang::IndexOutOfBoundsException(); @@ -152,7 +152,7 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxParent; @@ -162,7 +162,7 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -191,7 +191,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); //set Role = Shape @@ -204,7 +204,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return SD_RESSTR(STR_PAGE); @@ -214,7 +214,7 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -231,7 +231,7 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) Reference<XAccessibleRelationSet> SAL_CALL AccessibleSlideSorterObject::getAccessibleRelationSet (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return Reference<XAccessibleRelationSet>(); @@ -242,7 +242,7 @@ Reference<XAccessibleRelationSet> SAL_CALL Reference<XAccessibleStateSet> SAL_CALL AccessibleSlideSorterObject::getAccessibleStateSet (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -275,7 +275,7 @@ Reference<XAccessibleStateSet> SAL_CALL lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) throw (IllegalAccessibleComponentStateException, - RuntimeException) + RuntimeException, std::exception) { ThrowIfDisposed(); // Delegate request to parent. @@ -299,7 +299,7 @@ lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener( const Reference<XAccessibleEventListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rxListener.is()) { @@ -324,7 +324,7 @@ void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener( void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener( const Reference<XAccessibleEventListener>& rxListener) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); if (rxListener.is()) @@ -350,7 +350,7 @@ void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener( //===== XAccessibleComponent ================================================== sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& aPoint) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Size aSize (getSize()); @@ -365,7 +365,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterObject::containsPoint(const awt::Point& a Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleAtPoint(const awt::Point& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return NULL; } @@ -374,7 +374,7 @@ Reference<XAccessible> SAL_CALL awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -411,7 +411,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed (); const awt::Rectangle aBBox (getBounds()); @@ -422,7 +422,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -448,7 +448,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed (); const awt::Rectangle aBBox (getBounds()); @@ -459,7 +459,7 @@ awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) void SAL_CALL AccessibleSlideSorterObject::grabFocus (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // nothing to do } @@ -468,7 +468,7 @@ void SAL_CALL AccessibleSlideSorterObject::grabFocus (void) sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); svtools::ColorConfig aColorConfig; @@ -480,7 +480,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -490,20 +490,20 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) //===== XServiceInfo ======================================================== OUString SAL_CALL AccessibleSlideSorterObject::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterObject"); } sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterObject::getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index a1027f6517eb..985b286c2e2c 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -207,7 +207,7 @@ void AccessibleSlideSorterView::Destroyed (void) Reference<XAccessibleContext > SAL_CALL AccessibleSlideSorterView::getAccessibleContext (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); return this; @@ -216,7 +216,7 @@ Reference<XAccessibleContext > SAL_CALL //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (maMutex); @@ -225,7 +225,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount (void) Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleChild (sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, RuntimeException) + throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (maMutex); @@ -237,7 +237,7 @@ Reference<XAccessible > SAL_CALL } Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -254,7 +254,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent } sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_ASSERT(getAccessibleParent().is()); ThrowIfDisposed(); @@ -282,7 +282,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); static sal_Int16 nRole = AccessibleRole::DOCUMENT; @@ -293,7 +293,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -305,7 +305,7 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -318,7 +318,7 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) Reference<XAccessibleRelationSet> SAL_CALL AccessibleSlideSorterView::getAccessibleRelationSet (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference<XAccessibleRelationSet>(); } @@ -328,7 +328,7 @@ Reference<XAccessibleRelationSet> SAL_CALL Reference<XAccessibleStateSet > SAL_CALL AccessibleSlideSorterView::getAccessibleStateSet (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -356,7 +356,7 @@ Reference<XAccessibleStateSet > SAL_CALL lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) throw (IllegalAccessibleComponentStateException, - RuntimeException) + RuntimeException, std::exception) { ThrowIfDisposed (); Reference<XAccessibleContext> xParentContext; @@ -376,7 +376,7 @@ lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rxListener.is()) { @@ -401,7 +401,7 @@ void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (rxListener.is()) @@ -431,7 +431,7 @@ void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener( //===== XAccessibleComponent ================================================== sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aPoint) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Rectangle aBBox (getBounds()); @@ -446,7 +446,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::containsPoint (const awt::Point& aP Reference<XAccessible> SAL_CALL AccessibleSlideSorterView::getAccessibleAtPoint (const awt::Point& aPoint) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); Reference<XAccessible> xAccessible; @@ -466,7 +466,7 @@ Reference<XAccessible> SAL_CALL awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -490,7 +490,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); awt::Point aLocation; @@ -512,7 +512,7 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) and our own relative location. */ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -538,7 +538,7 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); awt::Size aSize; @@ -557,7 +557,7 @@ awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) void SAL_CALL AccessibleSlideSorterView::grabFocus (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -570,7 +570,7 @@ void SAL_CALL AccessibleSlideSorterView::grabFocus (void) sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); svtools::ColorConfig aColorConfig; @@ -582,7 +582,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -596,7 +596,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChildIndex) throw (lang::IndexOutOfBoundsException, - RuntimeException) + RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -613,7 +613,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int32 nChildIndex) throw (lang::IndexOutOfBoundsException, - RuntimeException) + RuntimeException, std::exception) { ThrowIfDisposed(); sal_Bool bIsSelected = sal_False; @@ -633,7 +633,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3 void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -645,7 +645,7 @@ void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -657,7 +657,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); const SolarMutexGuard aSolarGuard; @@ -669,7 +669,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (v Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int32 nSelectedChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed (); const SolarMutexGuard aSolarGuard; @@ -702,7 +702,7 @@ Reference<XAccessible > SAL_CALL void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChildIndex) throw (lang::IndexOutOfBoundsException, - RuntimeException) + RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -717,20 +717,20 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi //===== XServiceInfo ======================================================== OUString SAL_CALL AccessibleSlideSorterView::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterView"); } sal_Bool SAL_CALL AccessibleSlideSorterView::supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString> SAL_CALL AccessibleSlideSorterView::getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index c65f3050d2a9..c29f8dce6ef2 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -1258,7 +1258,7 @@ SdrObjClosedKind MotionPathTag::GetMarkedObjectsClosedState() const } // XChangesListener -void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ ) throw (RuntimeException) +void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ ) throw (RuntimeException, std::exception) { if( mpPathObj && !mbInUpdatePath && (mpEffect->getPath() != msLastPath) ) { @@ -1271,13 +1271,13 @@ void SAL_CALL MotionPathTag::changesOccurred( const ChangesEvent& /*Event*/ ) th } } -void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) +void SAL_CALL MotionPathTag::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) { if( mpPathObj ) Dispose(); } -Any SAL_CALL MotionPathTag::queryInterface( const ::com::sun::star::uno::Type& aType ) throw (RuntimeException) +Any SAL_CALL MotionPathTag::queryInterface( const ::com::sun::star::uno::Type& aType ) throw (RuntimeException, std::exception) { 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 75d3733f4973..7ee43f90eb99 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -86,9 +86,9 @@ public: bool OnMove( const KeyEvent& rKEvt ); // XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( ) throw (); virtual void SAL_CALL release( ) throw (); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 71d12c73e308..88b9cae50598 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -249,7 +249,7 @@ void SAL_CALL AnnotationManagerImpl::disposing () // XEventListener -void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( aEvent.EventName == "OnAnnotationInserted" || aEvent.EventName == "OnAnnotationRemoved" || aEvent.EventName == "OnAnnotationChanged" ) { @@ -257,7 +257,7 @@ void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::docume } } -void SAL_CALL AnnotationManagerImpl::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AnnotationManagerImpl::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { } diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 77cb12405725..ac92bd18c7a9 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 (); // XEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); 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 359da9f18f78..f2afea7be63e 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -712,7 +712,7 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar } } -sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ) +sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { sal_Int64 nRet; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 605fd24f413e..2e82bf81f3bc 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -378,7 +378,7 @@ SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentCo // XServiceInfo -OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeException, std::exception ) { if( mbInsertPage ) return InsertSlideController_getImplementationName(); @@ -388,7 +388,7 @@ OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeE -Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( ) throw( RuntimeException ) +Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames( ) throw( RuntimeException, std::exception ) { if( mbInsertPage ) return InsertSlideController_getSupportedServiceNames(); diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 35850c54ed11..3711f1f99d41 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -35,8 +35,8 @@ public: virtual ::Window* createPopupWindow( ::Window* pParent ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); using svt::PopupWindowController::createPopupWindow; private: diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index c3147e4aeb72..13a262db8295 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -52,7 +52,7 @@ ClientBoxEntry::~ClientBoxEntry() // ClientRemovedListener void ClientRemovedListener::disposing( lang::EventObject const & rEvt ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { (void) rEvt; } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 1c39e3b6ba5e..9daa69a170e4 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -78,7 +78,7 @@ public: // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; class ClientBox: diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 7dd1477c935a..82401f1b17b1 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -167,7 +167,7 @@ NavigatorDragType SdPageObjsTLB::SdPageObjsTransferable::GetDragType() const -sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ) +sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { sal_Int64 nRet; diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 7eef3b88557f..9684d916aed8 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -137,7 +137,7 @@ void SAL_CALL Configuration::disposing (void) //----- XConfiguration -------------------------------------------------------- void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResourceId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -158,7 +158,7 @@ void SAL_CALL Configuration::addResource (const Reference<XResourceId>& rxResour void SAL_CALL Configuration::removeResource (const Reference<XResourceId>& rxResourceId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -183,7 +183,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( const Reference<XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, AnchorBindingMode eMode) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -234,7 +234,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources ( sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxResourceId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -249,7 +249,7 @@ sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxRe //----- XCloneable ------------------------------------------------------------ Reference<util::XCloneable> SAL_CALL Configuration::createClone (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -268,7 +268,7 @@ Reference<util::XCloneable> SAL_CALL Configuration::createClone (void) //----- XNamed ---------------------------------------------------------------- OUString SAL_CALL Configuration::getName (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); OUString aString; @@ -295,7 +295,7 @@ OUString SAL_CALL Configuration::getName (void) void SAL_CALL Configuration::setName (const OUString& rsName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rsName; // rsName is ignored. } diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index ac4eb3a44d57..989570442f0a 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -219,7 +219,7 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener, const OUString& rsEventType, const Any& rUserData) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -233,7 +233,7 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener ( void SAL_CALL ConfigurationController::removeConfigurationChangeListener ( const Reference<XConfigurationChangeListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -246,7 +246,7 @@ void SAL_CALL ConfigurationController::removeConfigurationChangeListener ( void SAL_CALL ConfigurationController::notifyEvent ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); mpImplementation->mpBroadcaster->NotifyListeners(rEvent); @@ -274,7 +274,7 @@ void SAL_CALL ConfigurationController::lock() void SAL_CALL ConfigurationController::unlock (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -295,7 +295,7 @@ void SAL_CALL ConfigurationController::unlock (void) void SAL_CALL ConfigurationController::requestResourceActivation ( const Reference<XResourceId>& rxResourceId, ResourceActivationMode eMode) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -356,7 +356,7 @@ void SAL_CALL ConfigurationController::requestResourceActivation ( void SAL_CALL ConfigurationController::requestResourceDeactivation ( const Reference<XResourceId>& rxResourceId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -397,7 +397,7 @@ void SAL_CALL ConfigurationController::requestResourceDeactivation ( Reference<XResource> SAL_CALL ConfigurationController::getResource ( const Reference<XResourceId>& rxResourceId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -411,7 +411,7 @@ Reference<XResource> SAL_CALL ConfigurationController::getResource ( void SAL_CALL ConfigurationController::update (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -433,7 +433,7 @@ void SAL_CALL ConfigurationController::update (void) sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -447,7 +447,7 @@ sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) void SAL_CALL ConfigurationController::postChangeRequest ( const Reference<XConfigurationChangeRequest>& rxRequest) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -459,7 +459,7 @@ void SAL_CALL ConfigurationController::postChangeRequest ( Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -475,7 +475,7 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfigur Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -560,7 +560,7 @@ void SAL_CALL ConfigurationController::restoreConfiguration ( void SAL_CALL ConfigurationController::addResourceFactory( const OUString& sResourceURL, const Reference<XResourceFactory>& rxResourceFactory) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -572,7 +572,7 @@ void SAL_CALL ConfigurationController::addResourceFactory( void SAL_CALL ConfigurationController::removeResourceFactoryForURL( const OUString& sResourceURL) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -584,7 +584,7 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForURL( void SAL_CALL ConfigurationController::removeResourceFactoryForReference( const Reference<XResourceFactory>& rxResourceFactory) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -596,7 +596,7 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForReference( Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory ( const OUString& sResourceURL) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -610,7 +610,7 @@ Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory //----- XInitialization ------------------------------------------------------- void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index cde24baacd29..d4eba7c6e3d6 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -52,7 +52,7 @@ GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest (void) thr void SAL_CALL GenericConfigurationChangeRequest::execute ( const Reference<XConfiguration>& rxConfiguration) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rxConfiguration.is()) { @@ -73,7 +73,7 @@ void SAL_CALL GenericConfigurationChangeRequest::execute ( OUString SAL_CALL GenericConfigurationChangeRequest::getName (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString("GenericConfigurationChangeRequest ") + (meMode==Activation ? OUString("activate ") : OUString("deactivate ")) @@ -84,7 +84,7 @@ OUString SAL_CALL GenericConfigurationChangeRequest::getName (void) void SAL_CALL GenericConfigurationChangeRequest::setName (const OUString& rsName) - throw (RuntimeException) + 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 d615b3eca48f..b3f7aa1b1287 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -86,7 +86,7 @@ public: virtual void SAL_CALL execute ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XNamed @@ -95,13 +95,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** 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 (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId; diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 49519d379acf..7c7f2cad7380 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -154,7 +154,7 @@ ResourceId::~ResourceId (void) OUString SAL_CALL ResourceId::getResourceURL (void) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { if (!maResourceURLs.empty()) return maResourceURLs[0]; @@ -167,7 +167,7 @@ OUString SAL_CALL util::URL SAL_CALL ResourceId::getFullResourceURL (void) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { if (mpURL.get() != NULL) return *mpURL; @@ -192,7 +192,7 @@ util::URL SAL_CALL sal_Bool SAL_CALL ResourceId::hasAnchor (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return maResourceURLs.size()>1; } @@ -202,7 +202,7 @@ sal_Bool SAL_CALL Reference<XResourceId> SAL_CALL ResourceId::getAnchor (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::rtl::Reference<ResourceId> rResourceId (new ResourceId()); const sal_Int32 nAnchorCount (maResourceURLs.size()-1); @@ -220,7 +220,7 @@ Reference<XResourceId> SAL_CALL Sequence<OUString> SAL_CALL ResourceId::getAnchorURLs (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { const sal_Int32 nAnchorCount (maResourceURLs.size() - 1); if (nAnchorCount > 0) @@ -239,7 +239,7 @@ Sequence<OUString> SAL_CALL OUString SAL_CALL ResourceId::getResourceTypePrefix (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (!maResourceURLs.empty() ) { @@ -264,7 +264,7 @@ OUString SAL_CALL sal_Int16 SAL_CALL ResourceId::compareTo (const Reference<XResourceId>& rxResourceId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int16 nResult (0); @@ -399,7 +399,7 @@ sal_Bool SAL_CALL ResourceId::isBoundTo ( const Reference<XResourceId>& rxResourceId, AnchorBindingMode eMode) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if ( ! rxResourceId.is()) { @@ -430,7 +430,7 @@ sal_Bool SAL_CALL ResourceId::isBoundToURL ( const OUString& rsAnchorURL, AnchorBindingMode eMode) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return IsBoundToAnchor(&rsAnchorURL, NULL, eMode); } @@ -440,7 +440,7 @@ sal_Bool SAL_CALL Reference<XResourceId> SAL_CALL ResourceId::clone (void) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return new ResourceId(maResourceURLs); } @@ -451,7 +451,7 @@ Reference<XResourceId> SAL_CALL //----- XInitialization ------------------------------------------------------- void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_uInt32 nCount (aArguments.getLength()); for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index 621a2f41b98a..3b47379c0269 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -46,7 +46,7 @@ UpdateRequest::~UpdateRequest (void) throw() void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfiguration) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rxConfiguration; // Do nothing here. The configuration is updated when the request queue @@ -57,7 +57,7 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu OUString SAL_CALL UpdateRequest::getName (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString("UpdateRequest"); } @@ -66,7 +66,7 @@ OUString SAL_CALL UpdateRequest::getName (void) void SAL_CALL UpdateRequest::setName (const OUString& rsName) - throw (RuntimeException) + 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 a6ded76bc78e..32ca67bcf055 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -62,7 +62,7 @@ public: virtual void SAL_CALL execute ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XNamed @@ -71,13 +71,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** 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 (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index ed51255f8437..4d10a1368eae 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -165,7 +165,7 @@ void SAL_CALL BasicPaneFactory::disposing (void) void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { if (aArguments.getLength() > 0) { @@ -250,7 +250,7 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments) Reference<XResource> SAL_CALL BasicPaneFactory::createResource ( const Reference<XResourceId>& rxPaneId) - throw (RuntimeException, IllegalArgumentException, WrappedTargetException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { ThrowIfDisposed(); @@ -319,7 +319,7 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource ( void SAL_CALL BasicPaneFactory::releaseResource ( const Reference<XResource>& rxPane) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -375,7 +375,7 @@ void SAL_CALL BasicPaneFactory::releaseResource ( void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( const ConfigurationChangeEvent& /* rEvent */ ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // FIXME: nothing to do } @@ -387,7 +387,7 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( void SAL_CALL BasicPaneFactory::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mxConfigurationControllerWeak == rEventObject.Source) { diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 1bac96201684..b8a639581356 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -78,7 +78,7 @@ public: virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XResourceFactory @@ -86,26 +86,26 @@ public: 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); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& rxPane) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 02b7c3f11ee6..e05f32e9da9a 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -112,7 +112,7 @@ void BasicToolBarFactory::Shutdown (void) //----- XInitialization ------------------------------------------------------- void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { if (aArguments.getLength() > 0) { @@ -168,7 +168,7 @@ void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments) void SAL_CALL BasicToolBarFactory::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEventObject.Source == mxConfigurationController) mxConfigurationController = NULL; @@ -181,7 +181,7 @@ void SAL_CALL BasicToolBarFactory::disposing ( Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( const Reference<XResourceId>& rxToolBarId) - throw (RuntimeException, IllegalArgumentException, WrappedTargetException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { ThrowIfDisposed(); @@ -204,7 +204,7 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( void SAL_CALL BasicToolBarFactory::releaseResource ( const Reference<XResource>& rxToolBar) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index cf13c331d697..c4b7ec3fc8e9 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -70,27 +70,27 @@ public: createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxToolBarId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); virtual void SAL_CALL releaseResource ( const css::uno::Reference<com::sun::star::drawing::framework::XResource>& rxToolBar) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<com::sun::star::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index bb940a5621a0..d3624a54a787 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -178,7 +178,7 @@ void SAL_CALL BasicViewFactory::disposing (void) Reference<XResource> SAL_CALL BasicViewFactory::createResource ( const Reference<XResourceId>& rxViewId) - throw(RuntimeException, IllegalArgumentException, WrappedTargetException) + throw(RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { Reference<XResource> xView; const bool bIsCenterPane ( @@ -236,7 +236,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxView) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if ( ! rxView.is()) throw lang::IllegalArgumentException(); @@ -290,7 +290,7 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException) + 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 004c462efe2c..bff242c20c4e 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -86,18 +86,18 @@ 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); + throw(css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& xView) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); 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 53594c0b772f..41e179818950 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -200,7 +200,7 @@ void SAL_CALL ChildWindowPane::disposing (void) Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mpWindow == NULL || ! mxWindow.is()) GetWindow(); @@ -224,7 +224,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( //----- XEventListener -------------------------------------------------------- void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index e89fe19259dc..bcbbfc6acd80 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -80,7 +80,7 @@ public: */ virtual ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> SAL_CALL getWindow (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() @@ -90,7 +90,7 @@ public: virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId; diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index ad3c420d2d96..b6a878b5b581 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -44,7 +44,7 @@ FrameWindowPane::~FrameWindowPane (void) throw() sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly (void) - throw (RuntimeException) + 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 99f285c75804..b8725f92b153 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -45,7 +45,7 @@ public: Therefore this method always returns <FALSE/>. */ virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 4b3e61d960a8..5ab5f82d7230 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -134,7 +134,7 @@ void SAL_CALL FullScreenPane::disposing (void) //----- XPane ----------------------------------------------------------------- sal_Bool SAL_CALL FullScreenPane::isVisible (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -148,7 +148,7 @@ sal_Bool SAL_CALL FullScreenPane::isVisible (void) void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -162,7 +162,7 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -177,7 +177,7 @@ Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessibl void SAL_CALL FullScreenPane::setAccessible ( const Reference<css::accessibility::XAccessible>& rxAccessible) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index 75388099f7f3..f99e161a71cc 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -59,17 +59,17 @@ public: //----- XPane ------------------------------------------------------------- virtual sal_Bool SAL_CALL isVisible (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL setAccessible ( const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 523b3cf0a7ff..d1ae16009e0b 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -88,7 +88,7 @@ void Pane::SetWindow (::Window* pWindow) //----- XPane ----------------------------------------------------------------- Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -99,7 +99,7 @@ Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed(); @@ -116,7 +116,7 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) //----- XPane2 ---------------------------------------------------------------- sal_Bool SAL_CALL Pane::isVisible (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -131,7 +131,7 @@ sal_Bool SAL_CALL Pane::isVisible (void) void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -144,7 +144,7 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); ::Window* pWindow = GetWindow(); @@ -159,7 +159,7 @@ Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) void SAL_CALL Pane::setAccessible ( const Reference<css::accessibility::XAccessible>& rxAccessible) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); ::Window* pWindow = GetWindow(); @@ -173,7 +173,7 @@ void SAL_CALL Pane::setAccessible ( //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL Pane::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -184,7 +184,7 @@ Reference<XResourceId> SAL_CALL Pane::getResourceId (void) sal_Bool SAL_CALL Pane::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return true; } @@ -205,7 +205,7 @@ const Sequence<sal_Int8>& Pane::getUnoTunnelId (void) } sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int64 nResult = 0; diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 51103b1b1fb9..3651f4615765 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -56,7 +56,7 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); }; @@ -79,10 +79,10 @@ public: // XView - virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException) + virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException, std::exception) { return mxResourceId; }; - virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException) + virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException, std::exception) { return false; } @@ -169,7 +169,7 @@ void SAL_CALL PresentationFactory::disposing (void) Reference<XResource> SAL_CALL PresentationFactory::createResource ( const Reference<XResourceId>& rxViewId) - throw (RuntimeException, IllegalArgumentException, WrappedTargetException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { ThrowIfDisposed(); @@ -185,7 +185,7 @@ Reference<XResource> SAL_CALL PresentationFactory::createResource ( void SAL_CALL PresentationFactory::releaseResource ( const Reference<XResource>& rxView) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); (void)rxView; @@ -211,7 +211,7 @@ void SAL_CALL PresentationFactory::releaseResource ( void SAL_CALL PresentationFactory::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } @@ -223,7 +223,7 @@ void SAL_CALL PresentationFactory::notifyConfigurationChange ( void SAL_CALL PresentationFactory::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEventObject; } @@ -278,7 +278,7 @@ void PresentationFactoryProvider::disposing (void) void SAL_CALL PresentationFactoryProvider::initialize( const Sequence<Any>& aArguments) - throw (Exception, RuntimeException) + 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 63e10307f448..51c943e198f8 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -96,7 +96,7 @@ void SAL_CALL ViewShellWrapper::disposing (void) mpViewShell.reset(); } -uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { if( mpSlideSorterViewShell && rType == ::getCppuType( static_cast< uno::Reference< view::XSelectionSupplier > * >( 0 ) ) ) @@ -124,7 +124,7 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return mxViewId; } @@ -133,7 +133,7 @@ Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void) sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return false; } @@ -141,7 +141,7 @@ sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly (void) //----- XSelectionSupplier -------------------------------------------------- -sal_Bool SAL_CALL ViewShellWrapper::select( const ::com::sun::star::uno::Any& aSelection ) throw(lang::IllegalArgumentException, uno::RuntimeException) +sal_Bool SAL_CALL ViewShellWrapper::select( const ::com::sun::star::uno::Any& aSelection ) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if (!mpSlideSorterViewShell) return false; @@ -203,11 +203,11 @@ uno::Any SAL_CALL ViewShellWrapper::getSelection() return aResult; } -void SAL_CALL ViewShellWrapper::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) throw(uno::RuntimeException) +void SAL_CALL ViewShellWrapper::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) throw(uno::RuntimeException, std::exception) { } -void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) throw(uno::RuntimeException) +void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& ) throw(uno::RuntimeException, std::exception) { } @@ -216,7 +216,7 @@ void SAL_CALL ViewShellWrapper::removeSelectionChangeListener( const uno::Refere sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( const Reference<XResource>& xResource) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Bool bResult (false); @@ -269,7 +269,7 @@ const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void) sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int64 nResult = 0; @@ -288,7 +288,7 @@ sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId //===== awt::XWindowListener ================================================== void SAL_CALL ViewShellWrapper::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ViewShell* pViewShell (mpViewShell.get()); @@ -300,7 +300,7 @@ void SAL_CALL ViewShellWrapper::windowResized (const awt::WindowEvent& rEvent) void SAL_CALL ViewShellWrapper::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } @@ -309,7 +309,7 @@ void SAL_CALL ViewShellWrapper::windowMoved (const awt::WindowEvent& rEvent) void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ViewShell* pViewShell (mpViewShell.get()); @@ -321,7 +321,7 @@ void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) void SAL_CALL ViewShellWrapper::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } @@ -332,7 +332,7 @@ void SAL_CALL ViewShellWrapper::windowHidden (const lang::EventObject& rEvent) //===== XEventListener ======================================================== void SAL_CALL ViewShellWrapper::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxWindow) mxWindow = NULL; diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 067f46c86a19..faba6d580217 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -113,7 +113,7 @@ void SAL_CALL CenterViewFocusModule::disposing (void) void SAL_CALL CenterViewFocusModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mbValid) { @@ -169,7 +169,7 @@ void CenterViewFocusModule::HandleNewView ( void SAL_CALL CenterViewFocusModule::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException) + 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 df20ff2ee7c8..66a5f6b29107 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -69,13 +69,13 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: class ViewShellContainer; diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 983c93d0dd1e..568d2b04e172 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -258,7 +258,7 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues) //----- XModuleController ----------------------------------------------------- void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ResourceToFactoryMap::const_iterator iFactory (mpResourceToFactoryMap->find(rsResourceURL)); if (iFactory != mpResourceToFactoryMap->end()) @@ -305,7 +305,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL) //----- XInitialization ------------------------------------------------------- void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException) + 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 dbab4f42b618..9c780e0b6821 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -124,7 +124,7 @@ void SAL_CALL ResourceManager::disposing (void) void SAL_CALL ResourceManager::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ASSERT(rEvent.ResourceId.is()); @@ -253,7 +253,7 @@ void ResourceManager::HandleResourceRequest( void SAL_CALL ResourceManager::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException) + 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 e1e6b39df074..2d1dc1b4093f 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -69,13 +69,13 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); protected: ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfigurationController> diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index 6d56720d39d0..d9521cfecc4a 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -102,7 +102,7 @@ void SAL_CALL ShellStackGuard::disposing (void) void SAL_CALL ShellStackGuard::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Type.equals(FrameworkHelper::msConfigurationUpdateStartEvent)) { @@ -122,7 +122,7 @@ void SAL_CALL ShellStackGuard::notifyConfigurationChange ( void SAL_CALL ShellStackGuard::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException) + 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 0a1f500ed6a4..31102989aca4 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -77,12 +77,12 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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 89e038b60cf1..788edef411ee 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -94,7 +94,7 @@ void SlideSorterModule::SaveResourceState (void) void SAL_CALL SlideSorterModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + 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 9de49069f3f5..ae12d651d434 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -44,7 +44,7 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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 97256c8e704b..47f4ecaf1b55 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -109,7 +109,7 @@ void SAL_CALL ToolBarModule::disposing (void) void SAL_CALL ToolBarModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mxConfigurationController.is()) { @@ -207,7 +207,7 @@ void ToolBarModule::HandleUpdateEnd (void) void SAL_CALL ToolBarModule::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + 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 88b8de6aa602..c03b7c2d9704 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -68,13 +68,13 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference< diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 08b34520e85d..dc4d13a24cd1 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -82,7 +82,7 @@ void ToolPanelModule::SaveResourceState (void) void SAL_CALL ToolPanelModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + 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 2286960b7aa2..10f22b985d6f 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -43,7 +43,7 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::drawing::framework::XControllerManager> mxControllerManager; diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index 0e943e265cc0..437584dc38dd 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -102,7 +102,7 @@ void SAL_CALL ViewTabBarModule::disposing (void) void SAL_CALL ViewTabBarModule::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mxConfigurationController.is()) { @@ -140,7 +140,7 @@ void SAL_CALL ViewTabBarModule::notifyConfigurationChange ( void SAL_CALL ViewTabBarModule::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException) + 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 8f4f92a03a76..232ce6840ada 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -71,13 +71,13 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference< diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index f2cb8095dd4e..8a8d27195813 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -98,10 +98,10 @@ public: virtual void SAL_CALL disposing (void); // XEventListener virtual void SAL_CALL disposing (const lang::EventObject& rEvent) - throw (RuntimeException); + throw (RuntimeException, std::exception); // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange (const ConfigurationChangeEvent& rEvent) - throw (RuntimeException); + throw (RuntimeException, std::exception); private: OUString msEventType; @@ -139,7 +139,7 @@ public: is being destroyed. */ virtual void SAL_CALL disposing (const lang::EventObject& rEvent) - throw (RuntimeException); + throw (RuntimeException, std::exception); /** This method is called when the ViewShellBase is being destroyed. */ @@ -318,7 +318,7 @@ public: virtual void SAL_CALL disposing (void); virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) - throw(RuntimeException); + throw(RuntimeException, std::exception); private: ::boost::shared_ptr<FrameworkHelper> mpHelper; @@ -946,7 +946,7 @@ void SAL_CALL FrameworkHelper::DisposeListener::disposing (void) void SAL_CALL FrameworkHelper::DisposeListener::disposing (const lang::EventObject& rEventObject) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (mpHelper.get() != NULL) mpHelper->disposing(rEventObject); @@ -1039,7 +1039,7 @@ void CallbackCaller::disposing (void) void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxConfigurationController) { @@ -1053,7 +1053,7 @@ void SAL_CALL CallbackCaller::disposing (const lang::EventObject& rEvent) void SAL_CALL CallbackCaller::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Type.equals(msEventType) && maFilter(rEvent)) { @@ -1119,7 +1119,7 @@ void LifetimeController::disposing (void) void SAL_CALL LifetimeController::disposing (const lang::EventObject& rEvent) - throw(RuntimeException) + 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 da429f077a55..7791eded64e4 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -145,14 +145,14 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** 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 (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** This implementation either returns the active accessible OLE object if it exists and the given index is 0 or throws an exception. @@ -161,7 +161,7 @@ public: ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); //===== XAccessibleComponent ============================================ @@ -169,26 +169,26 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XInterface ====================================================== virtual com::sun::star::uno::Any SAL_CALL queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire (void) @@ -205,58 +205,58 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XWindowListener ================================================= virtual void SAL_CALL windowResized (const ::com::sun::star::awt::WindowEvent& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const ::com::sun::star::awt::WindowEvent& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const ::com::sun::star::lang::EventObject& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const ::com::sun::star::lang::EventObject& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XFocusListener ================================================= virtual void SAL_CALL focusGained (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //----------------------------xAttribute---------------------------- virtual com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, @@ -374,15 +374,15 @@ protected: //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); public: virtual void SwitchViewActivated (void) { Activated(); } virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void impl_dispose (void); }; diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index de4db6b1f8c4..e7bd34c04f2e 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -65,34 +65,34 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XInterface ====================================================== virtual com::sun::star::uno::Any SAL_CALL queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire (void) @@ -106,7 +106,7 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getGroupPosition( const ::com::sun::star::uno::Any& rAny ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); virtual OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -117,11 +117,11 @@ protected: virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual bool @@ -189,7 +189,7 @@ protected: //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetSelAccContextInTable(); diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 237b32656d7b..fd9350645e19 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -66,27 +66,27 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XAccessibleEventBroadcaster ======================================== virtual void SAL_CALL addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XServiceInfo ==================================================== @@ -94,19 +94,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XPropertyChangeListener ========================================= virtual void SAL_CALL propertyChange (const ::com::sun::star::beans::PropertyChangeEvent& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index ba9963ac0ea0..27fd6c4f98bc 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -80,7 +80,7 @@ public: /// Returns always 0 because there can be no children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (); + throw (std::exception); /** Return the specified child. @param nIndex @@ -94,43 +94,43 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XAccessibleComponent ============================================ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XComponent ====================================================== virtual void SAL_CALL dispose (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& Source) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); using AccessibleShape::disposing; diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index b3b987dbb934..3f5f4111270d 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -44,7 +44,7 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== internal ======================================================== @@ -58,7 +58,7 @@ public: CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index df639a0f5dfa..64f63c76ab5f 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -44,7 +44,7 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== internal ======================================================== @@ -58,7 +58,7 @@ public: CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getAccessibleRole () throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 860be7a44299..3acc032732ed 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -42,7 +42,7 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== internal ======================================================== diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index ca78cdc38277..787e2675f558 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -88,11 +88,11 @@ public: //===== XComponent ============================================== - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::removeEventListener(xListener); } //===== XAccessible ======================================================= @@ -100,7 +100,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XAccessibleEventBroadcaster ======================================= @@ -108,88 +108,88 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); + getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception); //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL grabFocus (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -199,19 +199,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 3a231f045563..e76855f03715 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -93,11 +93,11 @@ public: //===== XComponent ============================================== - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::removeEventListener(xListener); } //===== XAccessible ======================================================= @@ -105,7 +105,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XAccessibleEventBroadcaster ======================================= @@ -113,61 +113,61 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); + getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** Return the parents locale or throw exception if this object has no parent yet/anymore. @@ -175,7 +175,7 @@ public: virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception); //===== XAccessibleComponent ================================================ @@ -185,7 +185,7 @@ public: */ virtual sal_Bool SAL_CALL containsPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** The default implementation returns an empty reference. */ @@ -193,45 +193,45 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** The default implementation returns an empty rectangle. */ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** The default implementation returns an empty position, i.e. the * result of the default constructor of <type>com::sun::star::awt::Point</type>. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** The default implementation does nothing. */ virtual void SAL_CALL grabFocus (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** Returns black as the default foreground color. */ virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** Returns white as the default background color. */ virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== XAccessibleSelection ============================================== @@ -239,35 +239,35 @@ public: virtual void SAL_CALL selectAccessibleChild (sal_Int32 nChildIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); //===== XServiceInfo ==================================================== @@ -276,19 +276,19 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SwitchViewActivated (void); private: diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index a7cd653e51bb..40c9b341d4ae 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -48,19 +48,19 @@ public: 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); private: class Implementation; diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 010beae8d1a8..c62f8072bcff 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -167,75 +167,75 @@ public: DECLARE_XTYPEPROVIDER() // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XController - virtual ::sal_Bool SAL_CALL suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XControlAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getCurrentPage (void) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // view::XSelectionChangeListener virtual void SAL_CALL selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XControllerManager virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL getConfigurationController (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL getModuleController (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); protected: /** This method must return the name to index table. This table @@ -281,7 +281,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); /** When the called object has been disposed already this method throws a Disposed exception and does not return. diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 02e3bd48d128..5eb77118cfbd 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -37,9 +37,9 @@ namespace sd { ::com::sun::star::lang::XServiceInfo >( aMutex ) {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; }; } diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index 0c0ab2211f0f..b9138cd69416 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -60,11 +60,11 @@ public: virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XDrawView @@ -75,7 +75,7 @@ public: std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XFastPropertySet @@ -87,18 +87,18 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); protected: sal_Bool getMasterPageMode(void) const throw(); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 6641b9e83fd7..75c4d44dd1f5 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -48,28 +48,28 @@ public: virtual sal_Bool SAL_CALL select ( const css::uno::Any& aSelection) throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getSelection (void) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage >& xPage) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XFastPropertySet @@ -81,13 +81,13 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL @@ -95,9 +95,9 @@ public: throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: OutlineViewShell& mrOutlineViewShell; diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index f292b221f426..9e5993322ac3 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -46,29 +46,29 @@ public: virtual sal_Bool SAL_CALL select (const ::com::sun::star::uno::Any& aSelection) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getSelection (void) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getCurrentPage (void) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XFastPropertySet @@ -80,18 +80,18 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: slidesorter::SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 5dbbbc77a5e9..864f30377b60 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -79,14 +79,14 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); //----- XTabBar ----------------------------------------------------------- @@ -95,42 +95,42 @@ public: SAL_CALL addTabBarButtonAfter ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, const ::com::sun::star::drawing::framework::TabBarButton& rAnchor) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL appendTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> SAL_CALL getTabBarButtons (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 81bd6d733c53..04356d9c8c2d 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -92,12 +92,12 @@ public: virtual void SAL_CALL addResource ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeResource( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId> > SAL_CALL getResources ( @@ -105,19 +105,19 @@ public: ::com::sun::star::drawing::framework::XResourceId>& rxAnchorId, const OUString& rsResourceURLPrefix, ::com::sun::star::drawing::framework::AnchorBindingMode eMode) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasResource ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XCloneable virtual ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable> SAL_CALL createClone (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XNamed @@ -126,13 +126,13 @@ public: debugging purposes. */ virtual OUString SAL_CALL getName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** 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 (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: class ResourceContainer; diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index 334124637689..62c4fb3d1e44 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -91,35 +91,35 @@ public: std::exception); virtual void SAL_CALL unlock (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL requestResourceActivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::ResourceActivationMode eMode) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL requestResourceDeactivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL getResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL update (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::drawing::framework::XConfiguration> SAL_CALL getRequestedConfiguration (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::drawing::framework::XConfiguration> SAL_CALL getCurrentConfiguration (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL restoreConfiguration ( const css::uno::Reference<css::drawing::framework::XConfiguration>& @@ -135,27 +135,27 @@ public: css::drawing::framework::XConfigurationChangeListener>& rxListener, const OUString& rsEventType, const css::uno::Any& rUserData) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyEvent ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XConfigurationRequestQueue virtual sal_Bool SAL_CALL hasPendingRequests (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL postChangeRequest ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeRequest>& rxRequest) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XResourceFactoryManager @@ -163,27 +163,27 @@ public: virtual void SAL_CALL addResourceFactory( const OUString& sResourceURL, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeResourceFactoryForURL( const OUString& sResourceURL) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeResourceFactoryForReference( const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::framework::XResourceFactory> SAL_CALL getResourceFactory ( const OUString& sResourceURL) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); /** Use this class instead of calling lock() and unlock() directly in diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index dcfe5d9602b6..e3f214811861 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -80,14 +80,14 @@ public: // XModuleController virtual void SAL_CALL requestResource(const OUString& rsResourceURL) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); private: css::uno::Reference< diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index b5b9d0275988..4710029913bc 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -98,46 +98,46 @@ public: */ virtual cssu::Reference<css::awt::XWindow> SAL_CALL getWindow (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XPane2 ------------------------------------------------------------- virtual sal_Bool SAL_CALL isVisible (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL setVisible (sal_Bool bIsVisible) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL setAccessible ( const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** For the typical pane it makes no sense to be dislayed without a view. Therefore this default implementation returns always <TRUE/>. */ virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); protected: diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index f7746b3ba010..646a8e4ec1f6 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -72,25 +72,25 @@ public: SAL_CALL createResource ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception); virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& xView) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::drawing::framework::XConfigurationController> diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index 497b4147e28d..e308e2389f5a 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -107,57 +107,57 @@ public: virtual OUString SAL_CALL getResourceURL (void) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual css::util::URL SAL_CALL getFullResourceURL (void) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasAnchor (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL getAnchor (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<OUString> SAL_CALL getAnchorURLs (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getResourceTypePrefix (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL compareTo (const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isBoundTo ( const css::uno::Reference< css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::AnchorBindingMode eMode) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isBoundToURL ( const OUString& rsAnchorURL, css::drawing::framework::AnchorBindingMode eMode) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL clone (void) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //===== XInitialization =================================================== void SAL_CALL initialize ( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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 e9db2511066c..0ba3c93a98ca 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -75,7 +75,7 @@ public: virtual ~ViewShellWrapper (void); virtual void SAL_CALL disposing (void); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); @@ -88,58 +88,58 @@ public: // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XResource virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XRelocatableResource virtual sal_Bool SAL_CALL relocateToAnchor ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResource>& xResource) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: ::boost::shared_ptr< ViewShell > mpViewShell; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 99c78bd7a0ea..bc42e3c249f0 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -104,7 +104,7 @@ public: SAL_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); - SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); + SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; friend class SdPageObjsTLB::SdPageObjsTransferable; diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index a36bf44dbce9..70b621f81acf 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -111,7 +111,7 @@ protected: virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void ObjectReleased(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index abee9ea14788..5b8b0b7c6f9b 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -117,32 +117,32 @@ public: virtual void SAL_CALL disposing (void); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XPresentation - virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL end() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rehearseTimings( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPresentation2 virtual void SAL_CALL startWithArguments(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isRunning( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SAL_CALL getController( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isRunning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SAL_CALL getController( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // legacy api diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index 308aaff91e6a..1076a72467a9 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -56,7 +56,7 @@ public: virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue ( const OUString& rsPropertyName, @@ -65,40 +65,40 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getPropertyValue (const OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); 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); + css::uno::RuntimeException, std::exception); 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); + css::uno::RuntimeException, std::exception); 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); + css::uno::RuntimeException, std::exception); 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); + css::uno::RuntimeException, std::exception); protected: /** Return the requested property value. diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 2deb30938cc2..a61b306d77eb 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -97,13 +97,13 @@ public: virtual void SAL_CALL statusChanged ( const ::com::sun::star::frame::FeatureStateEvent& rState) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); protected: /** This method is called by the WeakComponentImplHelper base class in diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index ba33e4d9a579..eccded2e0ad7 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -144,78 +144,78 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXImpressDocument) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XModel - virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference < ::com::sun::star::container::XIndexAccess >& aData ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDrawPageDuplicator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL duplicate( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL duplicate( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDrawPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XMasterPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getMasterPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XLayerManagerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLayerManager( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLayerManager( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XCustomPresentationSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getCustomPresentations( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XHandoutMasterSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getHandoutMasterPage( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPresentationSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation > SAL_CALL getPresentation( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XMultiServiceFactory ( SvxFmMSFactory ) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); 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); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XStyleFamiliesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XRenderable - virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XComponent @@ -226,7 +226,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 (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); }; /*********************************************************************** @@ -245,31 +245,31 @@ public: virtual ~SdDrawPagesAccess() throw(); // XDrawPages - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; /*********************************************************************** @@ -291,25 +291,25 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; /*********************************************************************** @@ -327,23 +327,23 @@ public: virtual ~SdDocLinkTargets() throw(); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // intern SdPage* FindPage( const OUString& rName ) const throw(); diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 66bb2f912f36..45c2f3ad8aad 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -55,14 +55,14 @@ public: virtual ~SdUnoSearchReplaceShape() throw(); // XReplaceable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL replaceAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XSearchable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL createSearchDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; /* ================================================================= */ @@ -97,21 +97,21 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) // XSearchDescriptor - virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getReplaceString( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setReplaceString( const OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; /* ================================================================= */ @@ -130,12 +130,12 @@ public: virtual ~SdUnoFindAllAccess() throw(); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 1fb36b0a7f1a..ed25cbc0af3f 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -96,33 +96,33 @@ public: // XSprite virtual void SAL_CALL setAlpha (double nAlpha) - throw (lang::IllegalArgumentException,RuntimeException); + throw (lang::IllegalArgumentException,RuntimeException, std::exception); virtual void SAL_CALL move (const geometry::RealPoint2D& rNewPos, const rendering::ViewState& rViewState, const rendering::RenderState& rRenderState) - throw (lang::IllegalArgumentException,RuntimeException); + throw (lang::IllegalArgumentException,RuntimeException, std::exception); virtual void SAL_CALL transform (const geometry::AffineMatrix2D& rTransformation) - throw (lang::IllegalArgumentException,RuntimeException); + throw (lang::IllegalArgumentException,RuntimeException, std::exception); virtual void SAL_CALL clip (const Reference<rendering::XPolyPolygon2D>& rClip) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL setPriority (double nPriority) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL show (void) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual void SAL_CALL hide (void) - throw (RuntimeException); + throw (RuntimeException, std::exception); // XCustomSprite virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas (void) - throw (RuntimeException); + throw (RuntimeException, std::exception); private: rtl::Reference<PresenterCanvas> mpCanvas; @@ -205,7 +205,7 @@ void SAL_CALL PresenterCanvas::disposing (void) void SAL_CALL PresenterCanvas::initialize ( const Sequence<Any>& rArguments) - throw(Exception, RuntimeException) + throw(Exception, RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) ThrowIfDisposed(); @@ -265,7 +265,7 @@ void SAL_CALL PresenterCanvas::initialize ( //----- XCanvas --------------------------------------------------------------- void SAL_CALL PresenterCanvas::clear (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // ToDo: Clear the area covered by the child window. A simple forward @@ -279,7 +279,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); mxSharedCanvas->drawPoint(aPoint,MergeViewState(aViewState),aRenderState); @@ -293,7 +293,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); mxSharedCanvas->drawLine(aStartPoint,aEndPoint,MergeViewState(aViewState),aRenderState); @@ -307,7 +307,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); mxSharedCanvas->drawBezier(aBezierSegment,aEndPoint,MergeViewState(aViewState),aRenderState); @@ -320,7 +320,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawPolyPolygon( @@ -335,7 +335,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->strokePolyPolygon( @@ -354,7 +354,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->strokeTexturedPolyPolygon( @@ -374,7 +374,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->strokeTextureMappedPolyPolygon( @@ -395,7 +395,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->queryStrokeShapes( @@ -411,7 +411,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->fillPolyPolygon( @@ -429,7 +429,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::uno::Sequence<css::rendering::Texture>& xTextures) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->fillTexturedPolyPolygon( @@ -448,7 +448,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::uno::Reference< css::geometry::XMapping2D >& xMapping) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->fillTextureMappedPolyPolygon( @@ -464,7 +464,7 @@ css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL const css::uno::Sequence< css::beans::PropertyValue >& aExtraFontProperties, const css::geometry::Matrix2D& aFontMatrix) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->createFont( @@ -478,7 +478,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->queryAvailableFonts(aFilter, aFontProperties); @@ -494,7 +494,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawText( @@ -509,7 +509,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawTextLayout( @@ -526,7 +526,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawBitmap( @@ -543,7 +543,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->drawBitmapModulated( @@ -555,7 +555,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL PresenterCanvas::getDevice (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); return mxSharedCanvas->getDevice(); @@ -600,7 +600,7 @@ void SAL_CALL PresenterCanvas::copyRect( Reference<rendering::XAnimatedSprite> SAL_CALL PresenterCanvas::createSpriteFromAnimation ( const css::uno::Reference<css::rendering::XAnimation>& rAnimation) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -621,7 +621,7 @@ Reference<rendering::XAnimatedSprite> SAL_CALL ::sal_Int8 nInterpolationMode) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -638,7 +638,7 @@ Reference<rendering::XAnimatedSprite> SAL_CALL Reference<rendering::XCustomSprite> SAL_CALL PresenterCanvas::createCustomSprite ( const css::geometry::RealSize2D& rSpriteSize) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -665,7 +665,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -681,7 +681,7 @@ Reference<rendering::XSprite> SAL_CALL ::sal_Bool SAL_CALL PresenterCanvas::updateScreen (::sal_Bool bUpdateAll) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -703,7 +703,7 @@ Reference<rendering::XSprite> SAL_CALL //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterCanvas::disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); if (rEvent.Source == mxWindow) @@ -716,7 +716,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -727,7 +727,7 @@ void SAL_CALL PresenterCanvas::windowResized (const css::awt::WindowEvent& rEven void SAL_CALL PresenterCanvas::windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -738,7 +738,7 @@ void SAL_CALL PresenterCanvas::windowMoved (const css::awt::WindowEvent& rEvent) void SAL_CALL PresenterCanvas::windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -749,7 +749,7 @@ void SAL_CALL PresenterCanvas::windowShown (const css::lang::EventObject& rEvent void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -761,7 +761,7 @@ void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEven //----- XBitmap --------------------------------------------------------------- geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -778,7 +778,7 @@ geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void) sal_Bool SAL_CALL PresenterCanvas::hasAlpha (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference<rendering::XBitmap> xBitmap (mxSharedCanvas, UNO_QUERY); if (xBitmap.is()) @@ -795,7 +795,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap( sal_Bool bFast) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException) + css::rendering::VolatileContentDestroyedException, std::exception) { (void)rNewSize; (void)bFast; @@ -1085,7 +1085,7 @@ void SAL_CALL PresenterCustomSprite::disposing (void) //----- XSprite --------------------------------------------------------------- void SAL_CALL PresenterCustomSprite::setAlpha (const double nAlpha) - throw (lang::IllegalArgumentException,RuntimeException) + throw (lang::IllegalArgumentException,RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->setAlpha(nAlpha); @@ -1098,7 +1098,7 @@ void SAL_CALL PresenterCustomSprite::move ( const geometry::RealPoint2D& rNewPos, const rendering::ViewState& rViewState, const rendering::RenderState& rRenderState) - throw (lang::IllegalArgumentException,RuntimeException) + throw (lang::IllegalArgumentException,RuntimeException, std::exception) { ThrowIfDisposed(); maPosition = rNewPos; @@ -1117,7 +1117,7 @@ void SAL_CALL PresenterCustomSprite::move ( void SAL_CALL PresenterCustomSprite::transform (const geometry::AffineMatrix2D& rTransformation) - throw (lang::IllegalArgumentException,RuntimeException) + throw (lang::IllegalArgumentException,RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->transform(rTransformation); @@ -1127,7 +1127,7 @@ void SAL_CALL PresenterCustomSprite::transform (const geometry::AffineMatrix2D& void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolygon2D>& rxClip) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); // The clip region is expected in the coordinate system of the sprite. @@ -1140,7 +1140,7 @@ void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolyg void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->setPriority(nPriority); @@ -1149,7 +1149,7 @@ void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority) void SAL_CALL PresenterCustomSprite::show (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->show(); @@ -1159,7 +1159,7 @@ void SAL_CALL PresenterCustomSprite::show (void) void SAL_CALL PresenterCustomSprite::hide (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->hide(); @@ -1171,7 +1171,7 @@ void SAL_CALL PresenterCustomSprite::hide (void) //----- XCustomSprite --------------------------------------------------------- Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxSprite->getContentCanvas(); diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index 807ce589de81..724b7a0b0deb 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -146,46 +146,46 @@ public: virtual void SAL_CALL initialize ( const css::uno::Sequence<css::uno::Any>& rArguments) - throw(css::uno::Exception, css::uno::RuntimeException); + throw(css::uno::Exception, css::uno::RuntimeException, std::exception); // XCanvas virtual void SAL_CALL clear (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokeTexturedPolyPolygon ( @@ -196,7 +196,7 @@ public: const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL strokeTextureMappedPolyPolygon( @@ -208,7 +208,7 @@ public: const css::rendering::StrokeAttributes& aStrokeAttributes) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XPolyPolygon2D> SAL_CALL queryStrokeShapes( @@ -216,7 +216,7 @@ public: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, const css::rendering::StrokeAttributes& aStrokeAttributes) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillPolyPolygon( @@ -224,7 +224,7 @@ public: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillTexturedPolyPolygon( @@ -234,7 +234,7 @@ public: const css::uno::Sequence<css::rendering::Texture>& xTextures) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL fillTextureMappedPolyPolygon( @@ -245,7 +245,7 @@ public: const css::uno::Reference< css::geometry::XMapping2D >& xMapping) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCanvasFont> SAL_CALL createFont( @@ -253,13 +253,13 @@ public: const css::uno::Sequence< css::beans::PropertyValue >& aExtraFontProperties, const css::geometry::Matrix2D& aFontMatrix) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawText( @@ -268,14 +268,14 @@ public: const css::rendering::ViewState& aViewState, const css::rendering::RenderState& aRenderState, ::sal_Int8 nTextDirection) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); 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); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawBitmap( @@ -284,7 +284,7 @@ public: const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL drawBitmapModulated( @@ -293,11 +293,11 @@ public: const css::rendering::RenderState& aRenderState) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL getDevice (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XBitmapCanvas @@ -320,7 +320,7 @@ public: css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation ( const css::uno::Reference< css::rendering::XAnimation >& animation) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps ( @@ -329,57 +329,57 @@ public: ::sal_Int8 interpolationMode) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite ( const css::geometry::RealSize2D& spriteSize) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite ( const css::uno::Reference< css::rendering::XSprite >& original) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); ::sal_Bool SAL_CALL updateScreen (::sal_Bool bUpdateAll) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XBitmap virtual css::geometry::IntegerSize2D SAL_CALL getSize (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasAlpha (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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); + css::rendering::VolatileContentDestroyedException, std::exception); private: css::uno::Reference<css::rendering::XSpriteCanvas> mxUpdateCanvas; diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index a8622a091b0a..8bcc7ec34fa9 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -92,7 +92,7 @@ PresenterHelper::~PresenterHelper (void) //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterHelper::initialize (const Sequence<Any>& rArguments) - throw(Exception,RuntimeException) + throw(Exception,RuntimeException, std::exception) { (void)rArguments; } @@ -108,7 +108,7 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( sal_Bool bInitiallyVisible, sal_Bool bEnableChildTransparentMode, sal_Bool bEnableParentClip) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); @@ -163,7 +163,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { if ( ! rxSharedCanvas.is() || ! rxSharedWindow.is() @@ -191,7 +191,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( const Reference<awt::XWindow>& rxWindow, sal_Int16 nRequestedCanvasFeatures, const OUString& rsOptionalCanvasServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)nRequestedCanvasFeatures; @@ -228,7 +228,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( void SAL_CALL PresenterHelper::toTop ( const Reference<awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL) @@ -252,7 +252,7 @@ struct IdMapEntry { Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( const OUString& id, const Reference<rendering::XCanvas>& rxCanvas) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if ( ! rxCanvas.is()) return NULL; @@ -474,7 +474,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap ( void SAL_CALL PresenterHelper::captureMouse ( const Reference<awt::XWindow>& rxWindow) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); @@ -490,7 +490,7 @@ void SAL_CALL PresenterHelper::captureMouse ( void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWindow) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); @@ -508,7 +508,7 @@ 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) + throw (RuntimeException, std::exception) { ::Window* pChildWindow = VCLUnoHelper::GetWindow(rxChildWindow); ::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 9d0424362972..48f87c29425e 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -51,7 +51,7 @@ public: // XInitialize virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw(css::uno::Exception,css::uno::RuntimeException); + throw(css::uno::Exception,css::uno::RuntimeException, std::exception); // XPresenterHelper @@ -62,7 +62,7 @@ public: sal_Bool bInitiallyVisible, sal_Bool bEnableChildTransparentMode, sal_Bool bEnableParentClip) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createSharedCanvas ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxUpdateCanvas, @@ -70,33 +70,33 @@ public: 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); + throw (css::uno::RuntimeException, std::exception); 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); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL toTop ( const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL captureMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL releaseMouse (const css::uno::Reference<css::awt::XWindow>& rxWindow) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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); + throw (css::uno::RuntimeException, std::exception); 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 f1ae9f7994c8..c9df2112b632 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -127,7 +127,7 @@ PresenterPreviewCache::~PresenterPreviewCache (void) //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterPreviewCache::initialize (const Sequence<Any>& rArguments) - throw(Exception, RuntimeException) + throw(Exception, RuntimeException, std::exception) { if (rArguments.getLength() != 0) throw RuntimeException(); @@ -141,7 +141,7 @@ 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) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCacheContext.get()!=NULL); @@ -155,7 +155,7 @@ void SAL_CALL PresenterPreviewCache::setDocumentSlides ( void SAL_CALL PresenterPreviewCache::setVisibleRange ( sal_Int32 nFirstVisibleSlideIndex, sal_Int32 nLastVisibleSlideIndex) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCacheContext.get()!=NULL); @@ -168,7 +168,7 @@ void SAL_CALL PresenterPreviewCache::setVisibleRange ( void SAL_CALL PresenterPreviewCache::setPreviewSize ( const css::geometry::IntegerSize2D& rSize) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCache.get()!=NULL); @@ -183,7 +183,7 @@ void SAL_CALL PresenterPreviewCache::setPreviewSize ( Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( sal_Int32 nSlideIndex, const Reference<rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCacheContext.get()!=NULL); @@ -209,7 +209,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterPreviewCache::getSlidePreview ( void SAL_CALL PresenterPreviewCache::addPreviewCreationNotifyListener ( const Reference<drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) return; @@ -222,7 +222,7 @@ void SAL_CALL PresenterPreviewCache::addPreviewCreationNotifyListener ( void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); mpCacheContext->RemovePreviewCreationNotifyListener(rxListener); @@ -232,7 +232,7 @@ void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( void SAL_CALL PresenterPreviewCache::pause (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCache.get()!=NULL); @@ -243,7 +243,7 @@ void SAL_CALL PresenterPreviewCache::pause (void) void SAL_CALL PresenterPreviewCache::resume (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); OSL_ASSERT(mpCache.get()!=NULL); diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 2d00eca41192..354b1da49fc0 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -55,7 +55,7 @@ public: 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); + throw(css::uno::Exception,css::uno::RuntimeException, std::exception); // XSlidePreviewCache @@ -63,36 +63,36 @@ public: 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); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setVisibleRange ( sal_Int32 nFirstVisibleSlideIndex, sal_Int32 nLastVisibleSlideIndex) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setPreviewSize ( const css::geometry::IntegerSize2D& rSize) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addPreviewCreationNotifyListener ( const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removePreviewCreationNotifyListener ( const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL pause (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL resume (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index b53d7fd9d6dc..b3cea2b393d0 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -155,7 +155,7 @@ void SAL_CALL PresenterTextView::disposing (void) // XInitialization void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index f99b5d358752..e1e32fe175dc 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -56,7 +56,7 @@ public: // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); protected: diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 938dbe36bc6c..ff42f71582c2 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -89,7 +89,7 @@ void SAL_CALL SlideRenderer::disposing (void) //----- XInitialization ------------------------------------------------------- void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -109,7 +109,7 @@ Reference<awt::XBitmap> SlideRenderer::createPreview ( const Reference<drawing::XDrawPage>& rxSlide, const awt::Size& rMaximalSize, sal_Int16 nSuperSampleFactor) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -126,7 +126,7 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas ( const awt::Size& rMaximalSize, sal_Int16 nSuperSampleFactor, const Reference<rendering::XCanvas>& rxCanvas) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -147,7 +147,7 @@ Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas ( awt::Size SAL_CALL SlideRenderer::calculatePreviewSize ( double nSlideAspectRatio, const awt::Size& rMaximalSize) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if (rMaximalSize.Width <= 0 || rMaximalSize.Height <= 0 diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index 67a172057fb6..5eb4a078f517 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -57,7 +57,7 @@ public: // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XSlideRenderer @@ -66,19 +66,19 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::awt::Size& rMaximumPreviewPixelSize, sal_Int16 nSuperSampleFactor) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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); + throw (css::uno::RuntimeException, std::exception); virtual css::awt::Size SAL_CALL calculatePreviewSize ( double nSlideAspectRatio, const css::awt::Size& rMaximumPreviewPixelSize) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: PreviewRenderer maPreviewRenderer; diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index be0c9cee6c7c..5237d53a7928 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -66,20 +66,20 @@ 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) + css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) { (void) rNode; } void SAL_CALL Listener::endEvent( const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException) + css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception) { (void) rNode; } void SAL_CALL Listener::repeat( const css::uno::Reference< css::animations::XAnimationNode >& rNode, ::sal_Int32 aRepeat ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void) rNode; (void) aRepeat; @@ -88,28 +88,28 @@ void SAL_CALL Listener::repeat( const css::uno::Reference< //----- XSlideShowListener ---------------------------------------------------- void SAL_CALL Listener::paused (void) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL Listener::resumed (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL Listener::slideEnded (sal_Bool bReverse) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void) bReverse; } void SAL_CALL Listener::hyperLinkClicked (const OUString &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL Listener::slideTransitionStarted (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { sal_Int32 aSlide = mController->getCurrentSlideIndex(); @@ -125,12 +125,12 @@ void SAL_CALL Listener::slideTransitionStarted (void) } void SAL_CALL Listener::slideTransitionEnded (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL Listener::slideAnimationsEnded (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } @@ -147,7 +147,7 @@ void SAL_CALL Listener::disposing (void) void SAL_CALL Listener::disposing ( const css::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { (void) rEvent; dispose(); diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index 407dff6d38a9..41dc351f414c 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -37,28 +37,28 @@ public: // XAnimationListener virtual void SAL_CALL beginEvent(const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException); + css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL endEvent( const css::uno::Reference< - css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException); + css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& rNode, ::sal_Int32 Repeat ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XSlideShowListener - virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException); + virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing (void); virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: rtl::Reference<Communicator> mCommunicator; diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index cce5f9e4940a..a647e89d94de 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -124,7 +124,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException) + cssu::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 c1c05d8babae..3e2592ba5dc2 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -74,7 +74,7 @@ public: throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException); + cssu::RuntimeException, std::exception); }; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 849b2a7d36fe..79943fb413d4 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -260,17 +260,17 @@ void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Wind } // XServiceInfo -OUString SAL_CALL SlideShow::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL SlideShow::getImplementationName( ) throw(RuntimeException, std::exception) { return OUString( "com.sun.star.comp.sd.SlideShow" ); } -sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { OUString aService( "com.sun.star.presentation.Presentation" ); Sequence< OUString > aSeq( &aService, 1 ); @@ -278,14 +278,14 @@ Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames( ) throw(Runt } // XPropertySet -Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(RuntimeException, std::exception) { 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) +void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; ThrowIfDisposed(); @@ -563,7 +563,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const -Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; ThrowIfDisposed(); @@ -631,25 +631,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) +void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } -void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } -void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } -void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } @@ -657,7 +657,7 @@ void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const R // XPresentation -void SAL_CALL SlideShow::start() throw(RuntimeException) +void SAL_CALL SlideShow::start() throw(RuntimeException, std::exception) { const Sequence< PropertyValue > aArguments; startWithArguments( aArguments ); @@ -823,7 +823,7 @@ void SAL_CALL SlideShow::end() -void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException) +void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException, std::exception) { Sequence< PropertyValue > aArguments(1); aArguments[0].Name = "RehearseTimings"; @@ -899,7 +899,7 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr -::sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException) +::sal_Bool SAL_CALL SlideShow::isRunning( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mxController.is() && mxController->isRunning(); @@ -907,7 +907,7 @@ void SAL_CALL SlideShow::startWithArguments(const Sequence< PropertyValue >& rAr -Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (RuntimeException) +Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 9424c114c7d5..953312e7f629 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1231,7 +1231,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ ) -void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception) { if( mxListenerProxy.is() ) mxListenerProxy->addSlideShowListener( xListener ); @@ -1239,7 +1239,7 @@ void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowLi -void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException, std::exception) { if( mxListenerProxy.is() ) mxListenerProxy->removeSlideShowListener( xListener ); @@ -1455,7 +1455,7 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl) -void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) +void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1483,7 +1483,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException) -void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) +void SAL_CALL SlideshowImpl::resume() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1522,7 +1522,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException) -sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException) +sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbIsPaused; @@ -1530,7 +1530,7 @@ sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException) -void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1800,7 +1800,7 @@ sal_Int32 SlideshowImpl::getLastSlideNumber() -sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException ) +sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; return maPresSettings.mbEndless; @@ -2717,7 +2717,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) -void SAL_CALL SlideshowImpl::activate() throw (RuntimeException) +void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2758,7 +2758,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException) -void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException) +void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2794,7 +2794,7 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) -sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException) +sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbActive; @@ -2882,7 +2882,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn) -Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException) +Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2899,7 +2899,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE -sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException) +sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -2915,7 +2915,7 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException) -sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException) +sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException, std::exception) { return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1; } @@ -2924,14 +2924,14 @@ sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException // ::com::sun::star::presentation::XSlideShowController: -::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException) +::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException, std::exception) { return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0; } -Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException) +Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) { if( (mpSlideController.get() == 0 ) || (Index < 0) || (Index >= mpSlideController->getSlideIndexCount() ) ) throw IndexOutOfBoundsException(); @@ -2939,7 +2939,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index return mpSlideController->getSlideByNumber( mpSlideController->getSlideNumber( Index ) ); } -sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException) +sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return maPresSettings.mbAlwaysOnTop; @@ -2947,7 +2947,7 @@ sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException) -void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; if( maPresSettings.mbAlwaysOnTop != bAlways ) @@ -2959,7 +2959,7 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx -sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException) +sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return maPresSettings.mbFullScreen; @@ -2967,7 +2967,7 @@ sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException) -sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException) +sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return maPresSettings.mbMouseVisible; @@ -2975,7 +2975,7 @@ sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException) -void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; if( maPresSettings.mbMouseVisible != bVisible ) @@ -2988,7 +2988,7 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime -sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException) +sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mbUsePen; @@ -2996,7 +2996,7 @@ sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException) -void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; mbUsePen = bMouseAsPen; @@ -3039,7 +3039,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc -double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException) +double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mdUserPaintStrokeWidth; @@ -3047,7 +3047,7 @@ double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException) -void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; mdUserPaintStrokeWidth = dStrokeWidth; @@ -3056,7 +3056,7 @@ void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeEx -sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException) +sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mnUserPaintColor; @@ -3064,7 +3064,7 @@ sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException) -void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; mnUserPaintColor = nColor; @@ -3157,7 +3157,7 @@ void SAL_CALL SlideshowImpl::setEraserMode( bool /*bSwitchEraserMode*/ ) throw ( // XSlideShowController Methods -sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException) +sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return mxShow.is(); @@ -3165,7 +3165,7 @@ sal_Bool SAL_CALL SlideshowImpl::isRunning( ) throw (RuntimeException) -void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3193,7 +3193,7 @@ void SAL_CALL SlideshowImpl::gotoNextEffect( ) throw (RuntimeException) -void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3217,7 +3217,7 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect( ) throw (RuntimeException) -void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3240,7 +3240,7 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide( ) throw (RuntimeException) -void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3313,7 +3313,7 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException) -void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::gotoPreviousSlide( ) throw (RuntimeException, std::exception) { gotoPreviousSlide(false); } @@ -3369,7 +3369,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects) -void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException) +void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3395,7 +3395,7 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException) -void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3410,7 +3410,7 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3432,7 +3432,7 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide ) -void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3444,7 +3444,7 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx -void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) +void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3471,35 +3471,35 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException) // XIndexAccess -::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL SlideshowImpl::getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return getSlideCount(); } -::com::sun::star::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return Any( getSlideByIndex( Index ) ); } -::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return cppu::UnoType<XDrawPage>::get(); } -::sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL SlideshowImpl::hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return getSlideCount() != 0; } -Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException) +Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException, std::exception) { return mxShow; } @@ -3708,7 +3708,7 @@ void SlideShowListenerProxy::removeSlideShowListener( const css::uno::Reference< -void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException) +void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3718,7 +3718,7 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNod -void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException) +void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3728,7 +3728,7 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode -void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException) +void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3740,7 +3740,7 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& // ::com::sun::star::presentation::XSlideShowListener: -void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3750,7 +3750,7 @@ void SAL_CALL SlideShowListenerProxy::paused( ) throw (::com::sun::star::uno::R -void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3760,7 +3760,7 @@ void SAL_CALL SlideShowListenerProxy::resumed( ) throw (::com::sun::star::uno:: -void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException) +void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3770,7 +3770,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx -void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3780,7 +3780,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun: -void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3790,7 +3790,7 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded( ) throw (::com::sun -void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException) +void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3809,7 +3809,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti -void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException) +void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3829,7 +3829,7 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro // XEventListener -void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::EventObject& aDisposeEvent ) throw (RuntimeException) +void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::EventObject& aDisposeEvent ) throw (RuntimeException, std::exception) { maListeners.disposeAndClear( aDisposeEvent ); mxController.clear(); @@ -3840,7 +3840,7 @@ void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::E // XShapeEventListener -void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException) +void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; if( mxController.is() ) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 17584c78797a..baba13d01e32 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -137,24 +137,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); - virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException); - virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException); + virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception); // css::presentation::XSlideShowListener: - virtual void SAL_CALL paused() throw (css::uno::RuntimeException); - virtual void SAL_CALL resumed() throw (css::uno::RuntimeException); - virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException); - virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException); - virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException); - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException); + virtual void SAL_CALL paused() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL resumed() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideTransitionStarted() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException, std::exception); // css::lang::XEventListener: - virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException); + virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException, std::exception); // 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); + virtual void SAL_CALL click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent) throw (css::uno::RuntimeException, std::exception); ::cppu::OInterfaceContainerHelper maListeners; @@ -175,57 +175,57 @@ public: explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow); // css::presentation::XSlideShowController: - virtual ::sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAlwaysOnTop( ::sal_Bool _alwaysontop ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getMouseVisible() throw (css::uno::RuntimeException); - virtual void SAL_CALL setMouseVisible( ::sal_Bool _mousevisible ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException); - virtual void SAL_CALL setUsePen( ::sal_Bool _usepen ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAlwaysOnTop( ::sal_Bool _alwaysontop ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getMouseVisible() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMouseVisible( ::sal_Bool _mousevisible ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getUsePen() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setUsePen( ::sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setUseEraser( ::sal_Bool _usepen ) throw (css::uno::RuntimeException); - virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException); + virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException); virtual void SAL_CALL setEraseInk( sal_Int32 nEraseInkSize ) throw (css::uno::RuntimeException); virtual void SAL_CALL setPenMode( bool bSwitchPenMode) throw (css::uno::RuntimeException); virtual void SAL_CALL setEraserMode( bool bSwitchEraserMode ) throw (css::uno::RuntimeException); virtual void SAL_CALL setPointerMode( bool bSwitchPointerMode) throw (css::uno::RuntimeException); virtual void SAL_CALL setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoNextEffect( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoPreviousEffect( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoFirstSlide( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoLastSlide( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException); - virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException); - virtual void SAL_CALL stopSound( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL pause( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL resume( ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isPaused( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) throw (css::uno::RuntimeException); - virtual void SAL_CALL activate( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL deactivate( ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide( ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex( ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getNextSlideIndex( ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isEndless( ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isFullScreen( ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoNextEffect( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoPreviousEffect( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoFirstSlide( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoNextSlide( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoPreviousSlide( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoLastSlide( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL stopSound( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL pause( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL resume( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isPaused( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL blankScreen( ::sal_Int32 Color ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL activate( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL deactivate( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getCurrentSlide( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getCurrentSlideIndex( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getNextSlideIndex( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isEndless( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isFullScreen( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::presentation::XSlideShow > SAL_CALL getSlideShow( ) throw (css::uno::RuntimeException, std::exception); // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow void slideEnded(const bool bReverse); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index b56ee18e4c20..903e1eeb2a16 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -214,7 +214,7 @@ SlideShowView::SlideShowView( ShowWindow& rOutputWindow, } // Dispose all internal references -void SAL_CALL SlideShowView::dispose() throw (RuntimeException) +void SAL_CALL SlideShowView::dispose() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -241,7 +241,7 @@ void SAL_CALL SlideShowView::dispose() throw (RuntimeException) } // Disposing our broadcaster -void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(RuntimeException) +void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -290,14 +290,14 @@ void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) throw (RuntimeExc } // XSlideShowView methods -Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas( ) throw (RuntimeException) +Reference< rendering::XSpriteCanvas > SAL_CALL SlideShowView::getCanvas( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mpCanvas.get() ? mpCanvas->getUNOSpriteCanvas() : Reference< rendering::XSpriteCanvas >(); } -void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeException, std::exception) { // paint background in black ::osl::MutexGuard aGuard( m_aMutex ); @@ -322,12 +322,12 @@ void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeExcept } } -geometry::IntegerSize2D SAL_CALL SlideShowView::getTranslationOffset( ) throw (RuntimeException) +geometry::IntegerSize2D SAL_CALL SlideShowView::getTranslationOffset( ) throw (RuntimeException, std::exception) { return mTranslationOffset; } -geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (RuntimeException) +geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); SolarMutexGuard aSolarGuard; @@ -388,7 +388,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) +void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -396,7 +396,7 @@ void SAL_CALL SlideShowView::addTransformationChangedListener( const Reference< mpViewListeners->addListener( xListener ); } -void SAL_CALL SlideShowView::removeTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException) +void SAL_CALL SlideShowView::removeTransformationChangedListener( const Reference< util::XModifyListener >& xListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -404,7 +404,7 @@ void SAL_CALL SlideShowView::removeTransformationChangedListener( const Referenc mpViewListeners->removeListener( xListener ); } -void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException) +void SAL_CALL SlideShowView::addPaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -412,7 +412,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) +void SAL_CALL SlideShowView::removePaintListener( const Reference< awt::XPaintListener >& xListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -420,7 +420,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) +void SAL_CALL SlideShowView::addMouseListener( const Reference< awt::XMouseListener >& xListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -428,7 +428,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) +void SAL_CALL SlideShowView::removeMouseListener( const Reference< awt::XMouseListener >& xListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -436,7 +436,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) +void SAL_CALL SlideShowView::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -452,7 +452,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) +void SAL_CALL SlideShowView::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& xListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -463,7 +463,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) +void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -475,7 +475,7 @@ void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (Ru mxWindowPeer->setPointer( mxPointer ); } -awt::Rectangle SAL_CALL SlideShowView::getCanvasArea( ) throw (RuntimeException) +awt::Rectangle SAL_CALL SlideShowView::getCanvasArea( ) throw (RuntimeException, std::exception) { awt::Rectangle aRectangle; @@ -508,7 +508,7 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp } // XWindowListener methods -void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (RuntimeException) +void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -524,23 +524,23 @@ void SAL_CALL SlideShowView::windowResized( const awt::WindowEvent& e ) throw (R } } -void SAL_CALL SlideShowView::windowMoved( const awt::WindowEvent& ) throw (RuntimeException) +void SAL_CALL SlideShowView::windowMoved( const awt::WindowEvent& ) throw (RuntimeException, std::exception) { // ignored } -void SAL_CALL SlideShowView::windowShown( const lang::EventObject& ) throw (RuntimeException) +void SAL_CALL SlideShowView::windowShown( const lang::EventObject& ) throw (RuntimeException, std::exception) { // ignored } -void SAL_CALL SlideShowView::windowHidden( const lang::EventObject& ) throw (RuntimeException) +void SAL_CALL SlideShowView::windowHidden( const lang::EventObject& ) throw (RuntimeException, std::exception) { // ignored } // XMouseListener implementation -void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno::RuntimeException) +void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); if( mpSlideShow && mpSlideShow->isInputFreezed() ) @@ -564,7 +564,7 @@ void SAL_CALL SlideShowView::mousePressed( const awt::MouseEvent& e ) throw (uno } } -void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (uno::RuntimeException) +void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); if( mbMousePressedEaten ) @@ -587,7 +587,7 @@ void SAL_CALL SlideShowView::mouseReleased( const awt::MouseEvent& e ) throw (un } } -void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) throw (uno::RuntimeException) +void SAL_CALL SlideShowView::mouseEntered( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -603,7 +603,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) +void SAL_CALL SlideShowView::mouseExited( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -620,7 +620,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) +void SAL_CALL SlideShowView::mouseDragged( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -636,7 +636,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) +void SAL_CALL SlideShowView::mouseMoved( const awt::MouseEvent& e ) throw (uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index c6d674d7117c..4708e0746c0d 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -190,44 +190,44 @@ public: void ignoreNextMouseReleased() { mbMousePressedEaten = true; } /// Dispose all internal references - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); /// Disposing our broadcaster - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL paint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); // XSlideShowView methods - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::geometry::AffineMatrix2D SAL_CALL getTransformation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getTranslationOffset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeTransformationChangedListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XWindowListener methods - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XMouseListener implementation - virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XMouseMotionListener implementation - virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); using cppu::WeakComponentImplHelperBase::disposing; diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index e85a6c85f6d7..3721ed278b51 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -444,7 +444,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent void SAL_CALL Listener::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if ((mbListeningToDocument || mbListeningToUNODocument) && mrSlideSorter.GetModel().GetDocument()!=NULL @@ -471,7 +471,7 @@ void SAL_CALL Listener::disposing ( void SAL_CALL Listener::notifyEvent ( const document::EventObject& ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } @@ -482,7 +482,7 @@ void SAL_CALL Listener::notifyEvent ( void SAL_CALL Listener::propertyChange ( const PropertyChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -533,7 +533,7 @@ void SAL_CALL Listener::propertyChange ( //===== frame::XFrameActionListener ========================================== void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { switch (rEvent.Action) { @@ -561,7 +561,7 @@ void SAL_CALL Listener::frameAction (const frame::FrameActionEvent& rEvent) void SAL_CALL Listener::notifyEvent ( const AccessibleEventObject& ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index 97e7feb0f6ab..4df4dcff83e8 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -98,27 +98,27 @@ public: //===== lang::XEventListener ============================================ virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== document::XEventListener ======================================== virtual void SAL_CALL notifyEvent ( const ::com::sun::star::document::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== beans::XPropertySetListener ===================================== virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== accessibility::XAccessibleEventListener ========================== virtual void SAL_CALL notifyEvent ( const ::com::sun::star::accessibility::AccessibleEventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -127,7 +127,7 @@ public: */ virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL disposing (void); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 634638fcf6a1..93fc714425bc 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -121,7 +121,7 @@ void SAL_CALL SlideSorterService::disposing (void) //----- XInitialization ------------------------------------------------------- void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -174,7 +174,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) //----- XView ----------------------------------------------------------------- Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return mxViewId; } @@ -183,7 +183,7 @@ Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) sal_Bool SAL_CALL SlideSorterService::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return sal_False; } @@ -194,7 +194,7 @@ sal_Bool SAL_CALL SlideSorterService::isAnchorOnly (void) //----- XWindowListener ------------------------------------------------------- void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -207,7 +207,7 @@ void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent& rEvent) void SAL_CALL SlideSorterService::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } @@ -216,7 +216,7 @@ void SAL_CALL SlideSorterService::windowMoved (const awt::WindowEvent& rEvent) void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -227,7 +227,7 @@ void SAL_CALL SlideSorterService::windowShown (const lang::EventObject& rEvent) void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -239,7 +239,7 @@ void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject& rEvent) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxParentWindow) mxParentWindow = NULL; @@ -251,7 +251,7 @@ void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent) //----- XDrawView ------------------------------------------------------------- void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL) @@ -263,7 +263,7 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL) @@ -279,7 +279,7 @@ Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return mpSlideSorter->GetModel().GetDocumentSlides(); } @@ -289,7 +289,7 @@ Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlide void SAL_CALL SlideSorterService::setDocumentSlides ( const Reference<container::XIndexAccess >& rxSlides) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -300,7 +300,7 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -313,7 +313,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -328,7 +328,7 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -341,7 +341,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -352,7 +352,7 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -365,7 +365,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -376,7 +376,7 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -389,7 +389,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -400,7 +400,7 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -415,7 +415,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreen void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bValue) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -427,7 +427,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -440,7 +440,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -453,7 +453,7 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -466,7 +466,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -477,7 +477,7 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -491,7 +491,7 @@ util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundColor) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -502,7 +502,7 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol util::Color SAL_CALL SlideSorterService::getTextColor (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -516,7 +516,7 @@ util::Color SAL_CALL SlideSorterService::getTextColor (void) void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -527,7 +527,7 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) util::Color SAL_CALL SlideSorterService::getSelectionColor (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -541,7 +541,7 @@ util::Color SAL_CALL SlideSorterService::getSelectionColor (void) void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -552,7 +552,7 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor util::Color SAL_CALL SlideSorterService::getHighlightColor (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -566,7 +566,7 @@ util::Color SAL_CALL SlideSorterService::getHighlightColor (void) void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) @@ -576,7 +576,7 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() == NULL || ! mpSlideSorter->IsValid()) @@ -589,7 +589,7 @@ sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mpSlideSorter.get() != NULL && mpSlideSorter->IsValid()) diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 5983228ad468..50494b2123cd 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -63,129 +63,129 @@ public: // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XResourceId css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); sal_Bool SAL_CALL isAnchorOnly (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // Attributes virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess >& rxSlides) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setIsHighlightCurrentSlide (::sal_Bool bIsHighlightCurrentSlide) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getIsShowSelection (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getIsCenterSelection (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getIsOrientationVertical (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getIsSmoothScrolling (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::Color SAL_CALL getBackgroundColor (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::Color SAL_CALL getTextColor (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setTextColor (css::util::Color aTextColor) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::Color SAL_CALL getSelectionColor (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::Color SAL_CALL getHighlightColor (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getIsUIReadOnly (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getIsShowFocus (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: ::boost::shared_ptr<SlideSorter> mpSlideSorter; diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 5052e60758ad..ca64375b3aaf 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -83,20 +83,20 @@ public: //===== lang::XEventListener ============================================== virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== beans::XPropertySetListener ======================================= virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== view::XSelectionChangeListener ==================================== virtual void SAL_CALL selectionChanged ( const com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -105,13 +105,13 @@ public: */ virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== drawing::framework::XConfigurationChangeListener ================== virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL disposing (void); @@ -514,7 +514,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) void SAL_CALL EventMultiplexer::Implementation::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mbListeningToController) { @@ -541,7 +541,7 @@ void SAL_CALL EventMultiplexer::Implementation::disposing ( void SAL_CALL EventMultiplexer::Implementation::propertyChange ( const beans::PropertyChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -567,7 +567,7 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( void SAL_CALL EventMultiplexer::Implementation::frameAction ( const frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference<frame::XFrame> xFrame (mxFrameWeak); if (rEvent.Frame == xFrame) @@ -602,7 +602,7 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction ( void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( const lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { CallListeners (EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION); } @@ -614,7 +614,7 @@ void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + 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 f16f2439cb77..6632a4be8e4d 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -50,7 +50,7 @@ void SAL_CALL PropertySet::disposing (void) //----- XPropertySet ---------------------------------------------------------- Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (void) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return NULL; } @@ -65,7 +65,7 @@ void SAL_CALL PropertySet::setPropertyValue ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -92,7 +92,7 @@ void SAL_CALL PropertySet::setPropertyValue ( Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -107,7 +107,7 @@ void SAL_CALL PropertySet::addPropertyChangeListener ( const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if ( ! rxListener.is()) throw lang::IllegalArgumentException(); @@ -129,7 +129,7 @@ void SAL_CALL PropertySet::removePropertyChangeListener ( const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ::std::pair<ChangeListenerContainer::iterator,ChangeListenerContainer::iterator> aRange (mpChangeListeners->equal_range(rsPropertyName)); @@ -160,7 +160,7 @@ void SAL_CALL PropertySet::addVetoableChangeListener ( const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // Constraint properties are not supported and thus no vetoable // listeners. @@ -176,7 +176,7 @@ void SAL_CALL PropertySet::removeVetoableChangeListener ( const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // Constraint properties are not supported and thus no vetoable // listeners. diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 00833dd2c270..09f7c454f3b1 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -145,7 +145,7 @@ uno::Reference<frame::XDispatch> void SlotStateListener::statusChanged ( const frame::FeatureStateEvent& rState) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); OUString sSlotName (rState.FeatureURL.Complete); @@ -180,7 +180,7 @@ void SlotStateListener::ReleaseListeners (void) void SAL_CALL SlotStateListener::disposing ( const lang::EventObject& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 99591d1fd5a7..635bfe81c385 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -119,7 +119,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( // XTypeProvider Sequence<Type> SAL_CALL DrawController::getTypes (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // OPropertySetHelper does not provide getTypes, so we have to @@ -143,7 +143,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID(DrawController); void SAL_CALL DrawController::dispose (void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( !mbDisposing ) { @@ -188,7 +188,7 @@ void SAL_CALL DrawController::dispose (void) void SAL_CALL DrawController::addEventListener( const Reference<lang::XEventListener >& xListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); SfxBaseController::addEventListener( xListener ); @@ -199,14 +199,14 @@ void SAL_CALL DrawController::addEventListener( void SAL_CALL DrawController::removeEventListener ( const Reference<lang::XEventListener >& aListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if(!rBHelper.bDisposed && !rBHelper.bInDispose && !mbDisposing) SfxBaseController::removeEventListener( aListener ); } // XController -::sal_Bool SAL_CALL DrawController::suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL DrawController::suspend( ::sal_Bool Suspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( Suspend ) { @@ -224,7 +224,7 @@ void SAL_CALL DrawController::removeEventListener ( } // XServiceInfo -OUString SAL_CALL DrawController::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL DrawController::getImplementationName( ) throw(RuntimeException, std::exception) { // Do not throw an excepetion at the moment. This leads to a crash // under Solaris on relead. See issue i70929 for details. @@ -235,13 +235,13 @@ OUString SAL_CALL DrawController::getImplementationName( ) throw(RuntimeExcepti static OUString ssServiceName( "com.sun.star.drawing.DrawingDocumentDrawView"); sal_Bool SAL_CALL DrawController::supportsService (const OUString& rsServiceName) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, rsServiceName); } Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames (void) - throw(RuntimeException) + throw(RuntimeException, std::exception) { ThrowIfDisposed(); Sequence<OUString> aSupportedServices (1); @@ -252,7 +252,7 @@ Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames (void) //------ XSelectionSupplier -------------------------------------------- sal_Bool SAL_CALL DrawController::select (const Any& aSelection) - throw(lang::IllegalArgumentException, RuntimeException) + throw(lang::IllegalArgumentException, RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -267,7 +267,7 @@ sal_Bool SAL_CALL DrawController::select (const Any& aSelection) Any SAL_CALL DrawController::getSelection() - throw(RuntimeException) + throw(RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -283,7 +283,7 @@ Any SAL_CALL DrawController::getSelection() void SAL_CALL DrawController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if( mbDisposing ) throw lang::DisposedException(); @@ -296,7 +296,7 @@ void SAL_CALL DrawController::addSelectionChangeListener( void SAL_CALL DrawController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (rBHelper.bDisposed) throw lang::DisposedException(); @@ -312,7 +312,7 @@ void SAL_CALL DrawController::removeSelectionChangeListener( void SAL_CALL DrawController::disposing (const lang::EventObject& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -323,7 +323,7 @@ void SAL_CALL void SAL_CALL DrawController::selectionChanged (const lang::EventObject& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); // Have to forward the event to our selection change listeners. @@ -356,7 +356,7 @@ void SAL_CALL // XDrawView void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPage >& xPage ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -369,7 +369,7 @@ void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPag Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage (void) - throw(RuntimeException) + throw(RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard aGuard; @@ -638,7 +638,7 @@ void DrawController::ReleaseViewShellBase (void) Reference<XConfigurationController> SAL_CALL DrawController::getConfigurationController (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -650,7 +650,7 @@ Reference<XConfigurationController> SAL_CALL Reference<XModuleController> SAL_CALL DrawController::getModuleController (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -676,7 +676,7 @@ const Sequence<sal_Int8>& DrawController::getUnoTunnelId (void) sal_Int64 SAL_CALL DrawController::getSomething (const Sequence<sal_Int8>& rId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int64 nResult = 0; @@ -786,7 +786,7 @@ IPropertyArrayHelper & DrawController::getInfoHelper() Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() - throw ( ::com::sun::star::uno::RuntimeException) + throw ( ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -795,7 +795,7 @@ Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() } -uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException) +uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -810,7 +810,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFor return xController; } -::sal_Bool SAL_CALL DrawController::isFormDesignMode( ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL DrawController::isFormDesignMode( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -823,7 +823,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFor return bIsDesignMode; } -void SAL_CALL DrawController::setFormDesignMode( ::sal_Bool _DesignMode ) throw (uno::RuntimeException) +void SAL_CALL DrawController::setFormDesignMode( ::sal_Bool _DesignMode ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -832,7 +832,7 @@ void SAL_CALL DrawController::setFormDesignMode( ::sal_Bool _DesignMode ) throw pFormShell->SetDesignMode( _DesignMode ); } -uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::Reference< awt::XControlModel >& xModel ) throw (container::NoSuchElementException, uno::RuntimeException) +uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno::Reference< awt::XControlModel >& xModel ) throw (container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -889,7 +889,7 @@ sal_Bool DrawController::convertFastPropertyValue ( void DrawController::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue) - throw ( com::sun::star::uno::Exception) + throw ( com::sun::star::uno::Exception, std::exception) { SolarMutexGuard aGuard; if (nHandle == PROPERTY_SUB_CONTROLLER) diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index b2bfc2e2b6eb..1b5747e8b9dd 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -329,7 +329,7 @@ Any SAL_CALL SdUnoDrawView::getSelection() void SAL_CALL SdUnoDrawView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -339,7 +339,7 @@ void SAL_CALL SdUnoDrawView::addSelectionChangeListener ( void SAL_CALL SdUnoDrawView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -354,7 +354,7 @@ void SdUnoDrawView::setFastPropertyValue ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { switch( nHandle ) { @@ -421,7 +421,7 @@ Any SAL_CALL SdUnoDrawView::getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { Any aValue; switch( nHandle ) @@ -491,7 +491,7 @@ void SAL_CALL SdUnoDrawView::setCurrentPage ( Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() - throw(RuntimeException) + throw(RuntimeException, std::exception) { Reference< drawing::XDrawPage > xPage; @@ -610,17 +610,17 @@ Any SdUnoDrawView::getDrawViewMode() const } // XServiceInfo -OUString SAL_CALL SdUnoDrawView::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL SdUnoDrawView::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.sd.SdUnoDrawView") ; } -sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL SdUnoDrawView::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { 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 32b1606eb6b0..057aa3c9aeb9 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -66,7 +66,7 @@ void SAL_CALL SdUnoOutlineView::disposing (void) //----- XSelectionSupplier ---------------------------------------------------- sal_Bool SAL_CALL SdUnoOutlineView::select( const Any& ) - throw(lang::IllegalArgumentException, RuntimeException) + throw(lang::IllegalArgumentException, RuntimeException, std::exception) { // todo: add selections for text ranges return sal_False; @@ -75,7 +75,7 @@ sal_Bool SAL_CALL SdUnoOutlineView::select( const Any& ) Any SAL_CALL SdUnoOutlineView::getSelection() - throw(RuntimeException) + throw(RuntimeException, std::exception) { Any aAny; return aAny; @@ -85,7 +85,7 @@ Any SAL_CALL SdUnoOutlineView::getSelection() void SAL_CALL SdUnoOutlineView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -95,7 +95,7 @@ void SAL_CALL SdUnoOutlineView::addSelectionChangeListener ( void SAL_CALL SdUnoOutlineView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -108,7 +108,7 @@ void SAL_CALL SdUnoOutlineView::removeSelectionChangeListener ( void SAL_CALL SdUnoOutlineView::setCurrentPage ( const Reference< drawing::XDrawPage >& xPage) - throw(RuntimeException) + throw(RuntimeException, std::exception) { SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xPage ); SdrPage *pSdrPage = pDrawPage ? pDrawPage->GetSdrPage() : NULL; @@ -121,7 +121,7 @@ void SAL_CALL SdUnoOutlineView::setCurrentPage ( Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage (void) - throw(RuntimeException) + throw(RuntimeException, std::exception) { Reference<drawing::XDrawPage> xPage; @@ -139,7 +139,7 @@ void SdUnoOutlineView::setFastPropertyValue ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { switch( nHandle ) { @@ -171,7 +171,7 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { Any aValue; @@ -195,17 +195,17 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue ( } // XServiceInfo -OUString SAL_CALL SdUnoOutlineView::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL SdUnoOutlineView::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.sd.SdUnoOutlineView"); } -sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL SdUnoOutlineView::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { 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 e8c6c075ca88..2bf6b4418e90 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -60,7 +60,7 @@ SdUnoSlideView::~SdUnoSlideView (void) throw() //----- XSelectionSupplier ---------------------------------------------------- sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) - throw(lang::IllegalArgumentException, RuntimeException) + throw(lang::IllegalArgumentException, RuntimeException, std::exception) { bool bOk = true; @@ -97,7 +97,7 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) Any SAL_CALL SdUnoSlideView::getSelection (void) - throw(RuntimeException) + throw(RuntimeException, std::exception) { Any aResult; @@ -124,7 +124,7 @@ Any SAL_CALL SdUnoSlideView::getSelection (void) void SAL_CALL SdUnoSlideView::addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -134,7 +134,7 @@ void SAL_CALL SdUnoSlideView::addSelectionChangeListener ( void SAL_CALL SdUnoSlideView::removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rxListener; } @@ -146,7 +146,7 @@ void SAL_CALL SdUnoSlideView::removeSelectionChangeListener ( void SAL_CALL SdUnoSlideView::setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxDrawPage) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { Reference<beans::XPropertySet> xProperties (rxDrawPage, UNO_QUERY); if (xProperties.is()) @@ -166,7 +166,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage ( css::uno::Reference<css::drawing::XDrawPage > SAL_CALL SdUnoSlideView::getCurrentPage (void) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()->GetXDrawPage(); } @@ -183,7 +183,7 @@ void SdUnoSlideView::setFastPropertyValue ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { (void)nHandle; (void)rValue; @@ -198,7 +198,7 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { (void)nHandle; @@ -210,17 +210,17 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue ( // XServiceInfo -OUString SAL_CALL SdUnoSlideView::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL SdUnoSlideView::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.sd.SdUnoSlideView" ); } -sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL SdUnoSlideView::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { 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 70c6b5a22669..d3e65e9f8d19 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -75,30 +75,30 @@ namespace sd virtual ~DocumentSettings() throw(); // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException); + virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception); virtual void SAL_CALL acquire( ) throw (); virtual void SAL_CALL release( ) throw (); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception); // DocumentSettingsSerializer cf. xmloff virtual uno::Sequence<beans::PropertyValue> @@ -1168,7 +1168,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException) } // XInterface -Any SAL_CALL DocumentSettings::queryInterface( const Type& aType ) throw (RuntimeException) +Any SAL_CALL DocumentSettings::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { return WeakImplHelper3< XPropertySet, XMultiPropertySet, XServiceInfo >::queryInterface( aType ); } @@ -1185,82 +1185,82 @@ void SAL_CALL DocumentSettings::release( ) throw () // XPropertySet -Reference< XPropertySetInfo > SAL_CALL DocumentSettings::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL DocumentSettings::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return PropertySetHelper::getPropertySetInfo(); } -void SAL_CALL DocumentSettings::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL DocumentSettings::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { PropertySetHelper::setPropertyValue( aPropertyName, aValue ); } -Any SAL_CALL DocumentSettings::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL DocumentSettings::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { return PropertySetHelper::getPropertyValue( PropertyName ); } -void SAL_CALL DocumentSettings::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL DocumentSettings::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetHelper::addPropertyChangeListener( aPropertyName, xListener ); } -void SAL_CALL DocumentSettings::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL DocumentSettings::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetHelper::removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL DocumentSettings::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL DocumentSettings::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetHelper::addVetoableChangeListener( PropertyName, aListener ); } -void SAL_CALL DocumentSettings::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL DocumentSettings::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetHelper::removeVetoableChangeListener( PropertyName, aListener ); } // XMultiPropertySet -void SAL_CALL DocumentSettings::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL DocumentSettings::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { PropertySetHelper::setPropertyValues( aPropertyNames, aValues ); } -Sequence< Any > SAL_CALL DocumentSettings::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) +Sequence< Any > SAL_CALL DocumentSettings::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException, std::exception) { return PropertySetHelper::getPropertyValues( aPropertyNames ); } -void SAL_CALL DocumentSettings::addPropertiesChangeListener( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException) +void SAL_CALL DocumentSettings::addPropertiesChangeListener( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception) { PropertySetHelper::addPropertiesChangeListener( aPropertyNames, xListener ); } -void SAL_CALL DocumentSettings::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException) +void SAL_CALL DocumentSettings::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception) { PropertySetHelper::removePropertiesChangeListener( xListener ); } -void SAL_CALL DocumentSettings::firePropertiesChangeEvent( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException) +void SAL_CALL DocumentSettings::firePropertiesChangeEvent( const Sequence< OUString >& aPropertyNames, const Reference< XPropertiesChangeListener >& xListener ) throw(RuntimeException, std::exception) { PropertySetHelper::firePropertiesChangeEvent( aPropertyNames, xListener ); } // XServiceInfo OUString SAL_CALL DocumentSettings::getImplementationName( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return OUString( "com.sun.star.comp.Draw.DocumentSettings" ); } sal_Bool SAL_CALL DocumentSettings::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL DocumentSettings::getSupportedServiceNames( ) - throw(RuntimeException) + 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 4a54b13ee4d2..d85500d6ffe3 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); + void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception); // XChild - Reference< XInterface > SAL_CALL getParent( ) throw (RuntimeException); - void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException); + Reference< XInterface > SAL_CALL getParent( ) throw (RuntimeException, std::exception); + void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception); // XCloneable - virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException); + virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException, std::exception); // XServiceInfo - OUString SAL_CALL getImplementationName() throw(); - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(); - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); + OUString SAL_CALL getImplementationName() throw(std::exception); + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception); + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); // XAnimationNode - ::sal_Int16 SAL_CALL getType() throw (RuntimeException); - Any SAL_CALL getBegin() throw (RuntimeException); - void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException); - Any SAL_CALL getDuration() throw (RuntimeException); - void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException); - Any SAL_CALL getEnd() throw (RuntimeException); - void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException); - Any SAL_CALL getEndSync() throw (RuntimeException); - void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException); - Any SAL_CALL getRepeatCount() throw (RuntimeException); - void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException); - Any SAL_CALL getRepeatDuration() throw (RuntimeException); - void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException); - ::sal_Int16 SAL_CALL getFill() throw (RuntimeException); - void SAL_CALL setFill( ::sal_Int16 _fill ) throw (RuntimeException); - ::sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException); - void SAL_CALL setFillDefault( ::sal_Int16 _filldefault ) throw (RuntimeException); - ::sal_Int16 SAL_CALL getRestart() throw (RuntimeException); - void SAL_CALL setRestart( ::sal_Int16 _restart ) throw (RuntimeException); - ::sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException); - void SAL_CALL setRestartDefault( ::sal_Int16 _restartdefault ) throw (RuntimeException); - double SAL_CALL getAcceleration() throw (RuntimeException); - void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException); - double SAL_CALL getDecelerate() throw (RuntimeException); - void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException); - ::sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException); - void SAL_CALL setAutoReverse( ::sal_Bool _autoreverse ) throw (RuntimeException); - Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException); - void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException); + ::sal_Int16 SAL_CALL getType() throw (RuntimeException, std::exception); + Any SAL_CALL getBegin() throw (RuntimeException, std::exception); + void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException, std::exception); + Any SAL_CALL getDuration() throw (RuntimeException, std::exception); + void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException, std::exception); + Any SAL_CALL getEnd() throw (RuntimeException, std::exception); + void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException, std::exception); + Any SAL_CALL getEndSync() throw (RuntimeException, std::exception); + void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception); + Any SAL_CALL getRepeatCount() throw (RuntimeException, std::exception); + void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception); + Any SAL_CALL getRepeatDuration() throw (RuntimeException, std::exception); + void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception); + ::sal_Int16 SAL_CALL getFill() throw (RuntimeException, std::exception); + void SAL_CALL setFill( ::sal_Int16 _fill ) throw (RuntimeException, std::exception); + ::sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException, std::exception); + void SAL_CALL setFillDefault( ::sal_Int16 _filldefault ) throw (RuntimeException, std::exception); + ::sal_Int16 SAL_CALL getRestart() throw (RuntimeException, std::exception); + void SAL_CALL setRestart( ::sal_Int16 _restart ) throw (RuntimeException, std::exception); + ::sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException, std::exception); + void SAL_CALL setRestartDefault( ::sal_Int16 _restartdefault ) throw (RuntimeException, std::exception); + double SAL_CALL getAcceleration() throw (RuntimeException, std::exception); + void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException, std::exception); + double SAL_CALL getDecelerate() throw (RuntimeException, std::exception); + void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException, std::exception); + ::sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException, std::exception); + void SAL_CALL setAutoReverse( ::sal_Bool _autoreverse ) throw (RuntimeException, std::exception); + Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException, std::exception); + void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception); // XElementAccess - virtual Type SAL_CALL getElementType() throw (RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException); + virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception); // XEnumerationAccess - virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException); + virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception); // XTimeContainer - Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException); - Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException); - Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException); - Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException); - Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException); + Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); + Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); + Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); + Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception); + Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); private: // our first, last and only protection from mutli-threads! @@ -235,7 +235,7 @@ void RandomAnimationNode::init( sal_Int16 nPresetClass ) // XInitialization -void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) +void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) { if( aArguments.getLength() != 1 ) throw IllegalArgumentException(); @@ -257,7 +257,7 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException) +sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return ::com::sun::star::animations::AnimationNodeType::PAR; @@ -266,7 +266,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException) // XAnimationNode -Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException) +Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maBegin; @@ -275,7 +275,7 @@ Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maBegin = _begin; @@ -284,7 +284,7 @@ void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeE // XAnimationNode -Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException) +Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maDuration; @@ -293,7 +293,7 @@ Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maDuration = _duration; @@ -302,7 +302,7 @@ void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (Ru // XAnimationNode -Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException) +Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maEnd; @@ -311,7 +311,7 @@ Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maEnd = _end; @@ -320,7 +320,7 @@ void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeExcep // XAnimationNode -Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException) +Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maEndSync; @@ -329,7 +329,7 @@ Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maEndSync = _endsync; @@ -338,7 +338,7 @@ void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (Runt // XAnimationNode -Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException) +Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maRepeatCount; @@ -347,7 +347,7 @@ Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maRepeatCount = _repeatcount; @@ -356,7 +356,7 @@ void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) thr // XAnimationNode -Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException) +Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maRepeatDuration; @@ -365,7 +365,7 @@ Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maRepeatDuration = _repeatduration; @@ -374,7 +374,7 @@ void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException) +sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnFill; @@ -383,7 +383,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); mnFill = _fill; @@ -392,7 +392,7 @@ void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeExce // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException) +sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnFillDefault; @@ -401,7 +401,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException // XAnimationNode -void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); mnFillDefault = _filldefault; @@ -410,7 +410,7 @@ void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) thro // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException) +sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnRestart; @@ -419,7 +419,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); mnRestart = _restart; @@ -428,7 +428,7 @@ void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (Runti // XAnimationNode -sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeException) +sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnRestartDefault; @@ -437,7 +437,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeExcept // XAnimationNode -void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); mnRestartDefault = _restartdefault; @@ -446,7 +446,7 @@ void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault // XAnimationNode -double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException) +double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mfAcceleration; @@ -455,7 +455,7 @@ double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); mfAcceleration = _acceleration; @@ -464,7 +464,7 @@ void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw // XAnimationNode -double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException) +double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mfDecelerate; @@ -473,7 +473,7 @@ double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); mfDecelerate = _decelerate; @@ -482,7 +482,7 @@ void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (Ru // XAnimationNode -sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException) +sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mbAutoReverse; @@ -491,7 +491,7 @@ sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException) // XAnimationNode -void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); mbAutoReverse = _autoreverse; @@ -499,7 +499,7 @@ void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw -Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (RuntimeException) +Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maUserData; @@ -507,7 +507,7 @@ Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (Runtim -void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException) +void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maUserData = _userdata; @@ -516,7 +516,7 @@ void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _u // XChild -Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (RuntimeException) +Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mxParent; @@ -525,7 +525,7 @@ Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (Runtime // XChild -void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException) +void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); mxParent = Parent; @@ -534,7 +534,7 @@ void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Par // XCloneable -Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (RuntimeException) +Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (RuntimeException, std::exception) { Reference< XCloneable > xNewNode( new RandomAnimationNode( *this ) ); return xNewNode; @@ -543,7 +543,7 @@ Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (Runti // XElementAccess -Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException) +Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException, std::exception) { return ::getCppuType((const Reference< XAnimationNode >*)0); } @@ -551,7 +551,7 @@ Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException) // XElementAccess -sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException) +sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException, std::exception) { return sal_True; } @@ -560,7 +560,7 @@ sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException) // XEnumerationAccess Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -607,7 +607,7 @@ 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) + throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { return appendChild( newChild ); } @@ -616,7 +616,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertBefore( const Re // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) - throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { return appendChild( newChild ); } @@ -625,7 +625,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Ref // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& ) - throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException) + throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { return appendChild( newChild ); } @@ -634,7 +634,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Re // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Reference< XAnimationNode >& oldChild ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { return oldChild; } @@ -643,7 +643,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Ref // XTimeContainer Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Reference< XAnimationNode >& newChild ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Reference< XAnimate > xAnimate( newChild, UNO_QUERY ); if( xAnimate.is() ) @@ -660,19 +660,19 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Ref } // XServiceInfo -OUString RandomAnimationNode::getImplementationName() throw() +OUString RandomAnimationNode::getImplementationName() throw(std::exception) { return RandomNode__getImplementationName(); } // XServiceInfo -sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) throw() +sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) throw(std::exception) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > RandomAnimationNode::getSupportedServiceNames(void) throw() +Sequence< OUString > RandomAnimationNode::getSupportedServiceNames(void) throw(std::exception) { return RandomNode_getSupportedServiceNames(); } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 901f8b2a0c90..b03566047229 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -103,7 +103,7 @@ SdFilterDetect::~SdFilterDetect() { } -OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDescriptor ) throw( RuntimeException ) +OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDescriptor ) throw( RuntimeException, std::exception ) { Reference< XInputStream > xStream; Reference< XContent > xContent; @@ -523,19 +523,19 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes } // XServiceInfo -OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } \ // XServiceInfo -sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } // XServiceInfo -Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx index f58c1cd33f04..14c7437b3bc7 100644 --- a/sd/source/ui/unoidl/sddetect.hxx +++ b/sd/source/ui/unoidl/sddetect.hxx @@ -61,7 +61,7 @@ public: // XExtendedFilterDetect - virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); }; #endif diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index 79770d7c0685..6f4db923bb24 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -65,19 +65,19 @@ UNO3_GETIMPLEMENTATION_IMPL( SdXCustomPresentation ); // XServiceInfo OUString SAL_CALL SdXCustomPresentation::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdXCustomPresentation" ) ; } sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentation::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { OUString aSN( "com.sun.star.presentation.CustomPresentation" ); uno::Sequence< OUString > aSeq( &aSN, 1 ); @@ -86,7 +86,7 @@ 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) + throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -121,7 +121,7 @@ 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) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -154,7 +154,7 @@ 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) + throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByIndex( Index ); insertByIndex( Index, Element ); @@ -162,13 +162,13 @@ void SAL_CALL SdXCustomPresentation::replaceByIndex( sal_Int32 Index, const uno: // XElementAccess uno::Type SAL_CALL SdXCustomPresentation::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SdXCustomPresentation::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -180,7 +180,7 @@ sal_Bool SAL_CALL SdXCustomPresentation::hasElements() // XIndexAccess sal_Int32 SAL_CALL SdXCustomPresentation::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( bDisposing ) @@ -190,7 +190,7 @@ sal_Int32 SAL_CALL SdXCustomPresentation::getCount() } uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -217,7 +217,7 @@ uno::Any SAL_CALL SdXCustomPresentation::getByIndex( sal_Int32 Index ) // XNamed OUString SAL_CALL SdXCustomPresentation::getName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -231,7 +231,7 @@ OUString SAL_CALL SdXCustomPresentation::getName() } void SAL_CALL SdXCustomPresentation::setName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -243,7 +243,7 @@ void SAL_CALL SdXCustomPresentation::setName( const OUString& aName ) } // XComponent -void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException) +void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -263,7 +263,7 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException) void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( bDisposing ) throw lang::DisposedException(); @@ -272,7 +272,7 @@ void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lan } -void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException) +void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception) { if( !bDisposing ) aDisposeListeners.removeInterface(aListener); @@ -294,19 +294,19 @@ SdXCustomPresentationAccess::~SdXCustomPresentationAccess() throw() // XServiceInfo OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdXCustomPresentationAccess" ); } sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { const OUString aNS( "com.sun.star.presentation.CustomPresentationAccess" ); uno::Sequence< OUString > aSeq( &aNS, 1 ); @@ -315,21 +315,21 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getSupportedServ // XSingleServiceFactory uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstance() - throw(uno::Exception, uno::RuntimeException) + throw(uno::Exception, uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xRef( (::cppu::OWeakObject*)new SdXCustomPresentation() ); return xRef; } uno::Reference< uno::XInterface > SAL_CALL SdXCustomPresentationAccess::createInstanceWithArguments( const uno::Sequence< uno::Any >& ) - throw(uno::Exception, uno::RuntimeException) + 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) + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -383,7 +383,7 @@ void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName, } void SAL_CALL SdXCustomPresentationAccess::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -400,7 +400,7 @@ 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) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -408,7 +408,7 @@ 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) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -429,7 +429,7 @@ uno::Any SAL_CALL SdXCustomPresentationAccess::getByName( const OUString& aName } uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -452,7 +452,7 @@ uno::Sequence< OUString > SAL_CALL SdXCustomPresentationAccess::getElementNames( sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return getSdCustomShow(aName) != NULL; @@ -460,13 +460,13 @@ sal_Bool SAL_CALL SdXCustomPresentationAccess::hasByName( const OUString& aName // XElementAccess uno::Type SAL_CALL SdXCustomPresentationAccess::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<container::XIndexContainer>::get(); } sal_Bool SAL_CALL SdXCustomPresentationAccess::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 7e77cc2cfca1..a4b73081899e 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -65,33 +65,33 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdXCustomPresentation) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; @@ -121,29 +121,29 @@ public: ~SdXCustomPresentationAccess() throw(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XSingleServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); }; inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const throw() diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 1009ad341010..a0d18fc9c91c 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -151,19 +151,19 @@ UNO3_GETIMPLEMENTATION_IMPL( SdLayer ); // XServiceInfo OUString SAL_CALL SdLayer::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( OUString::createFromAscii(sUNO_SdLayer) ); } sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { OUString aServiceName( OUString::createFromAscii(sUNO_Service_DrawingLayer) ); uno::Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -172,14 +172,14 @@ uno::Sequence< OUString > SAL_CALL SdLayer::getSupportedServiceNames() // beans::XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SdLayer::getPropertySetInfo( ) - throw(uno::RuntimeException) + 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) + throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -254,7 +254,7 @@ 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) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -295,10 +295,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) {} -void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} +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) {} sal_Bool SdLayer::get( LayerAttribute what ) throw() { @@ -399,7 +399,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() // ::com::sun::star::container::XChild uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -412,25 +412,25 @@ uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) void SAL_CALL SdLayer::setParent (const uno::Reference<uno::XInterface >& ) throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { throw lang::NoSupportException (); } // XComponent -void SAL_CALL SdLayer::dispose( ) throw (uno::RuntimeException) +void SAL_CALL SdLayer::dispose( ) throw (uno::RuntimeException, std::exception) { pLayerManager = 0; mxLayerManager = 0; pLayer = 0; } -void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdLayer::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented!"); } -void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdLayer::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented!"); } @@ -453,7 +453,7 @@ SdLayerManager::~SdLayerManager() throw() UNO3_GETIMPLEMENTATION_IMPL( SdLayerManager ); // XComponent -void SAL_CALL SdLayerManager::dispose( ) throw (uno::RuntimeException) +void SAL_CALL SdLayerManager::dispose( ) throw (uno::RuntimeException, std::exception) { mpModel = 0; if( mpLayers ) @@ -465,31 +465,31 @@ void SAL_CALL SdLayerManager::dispose( ) throw (uno::RuntimeException) } } -void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdLayerManager::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented!"); } -void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdLayerManager::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented!"); } // XServiceInfo OUString SAL_CALL SdLayerManager::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( OUString::createFromAscii(sUNO_SdLayerManager) ); } sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { OUString aServiceName( OUString::createFromAscii(sUNO_Service_DrawingLayerManager) ); uno::Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -498,7 +498,7 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getSupportedServiceNames() // XLayerManager uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::insertNewByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -532,7 +532,7 @@ 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) + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -553,7 +553,7 @@ 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) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -574,7 +574,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) +uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( const uno::Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -599,7 +599,7 @@ uno::Reference< drawing::XLayer > SAL_CALL SdLayerManager::getLayerForShape( con // XIndexAccess sal_Int32 SAL_CALL SdLayerManager::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -616,7 +616,7 @@ sal_Int32 SAL_CALL SdLayerManager::getCount() } uno::Any SAL_CALL SdLayerManager::getByIndex( sal_Int32 nLayer ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -639,7 +639,7 @@ 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) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -655,7 +655,7 @@ uno::Any SAL_CALL SdLayerManager::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -680,7 +680,7 @@ uno::Sequence< OUString > SAL_CALL SdLayerManager::getElementNames() return aSeq; } -sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -694,12 +694,12 @@ sal_Bool SAL_CALL SdLayerManager::hasByName( const OUString& aName ) throw(uno:: // XElementAccess uno::Type SAL_CALL SdLayerManager::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XLayer>::get(); } -sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException) +sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException, std::exception) { return getCount() > 0; } diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 543df58793c7..575f002943e9 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -61,34 +61,34 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayer ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XChild /** Returns the layer manager that manages this layer. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); /** Not implemented. Always throws an exception. @raises NoSupportException. */ - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); private: SdLayerManager* pLayerManager; @@ -125,28 +125,28 @@ public: UNO3_GETIMPLEMENTATION_DECL( SdLayerManager ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XLayerManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL attachShapeToLayer( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL getLayerForShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL attachShapeToLayer( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer >& xLayer ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer > SAL_CALL getLayerForShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); /** Return the <type>XLayer</type> object that is associated with the given <type>SdrLayer</type> object. If the requested object does @@ -163,9 +163,9 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> GetLayer (SdrLayer* pLayer); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: SdXImpressDocument* mpModel; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index f36110e80c3f..4e6f3af4cf3c 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -249,7 +249,7 @@ SdXImpressDocument::~SdXImpressDocument() throw() } // XInterface -uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -324,7 +324,7 @@ SdXImpressDocument* SdXImpressDocument::getImplementation( const uno::Reference< return NULL; } -sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if( rIdentifier.getLength() == 16 ) { @@ -339,7 +339,7 @@ sal_Int64 SAL_CALL SdXImpressDocument::getSomething( const ::com::sun::star::uno } // XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno::RuntimeException) +uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -384,7 +384,7 @@ namespace class theSdXImpressDocumentImplementationId : public rtl::Static< UnoTunnelIdInit, theSdXImpressDocumentImplementationId > {}; } -uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId( ) throw(uno::RuntimeException) +uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId( ) throw(uno::RuntimeException, std::exception) { return theSdXImpressDocumentImplementationId::get().getSeq(); } @@ -560,7 +560,7 @@ void SdXImpressDocument::SetModified( sal_Bool bModified /* = sal_True */ ) thro // XModel void SAL_CALL SdXImpressDocument ::lockControllers( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -571,7 +571,7 @@ void SAL_CALL SdXImpressDocument ::lockControllers( ) } void SAL_CALL SdXImpressDocument::unlockControllers( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -585,7 +585,7 @@ void SAL_CALL SdXImpressDocument::unlockControllers( ) } sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -597,7 +597,7 @@ sal_Bool SAL_CALL SdXImpressDocument::hasControllersLocked( ) #include <comphelper/processfactory.hxx> -uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewData() throw( uno::RuntimeException ) +uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewData() throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -634,7 +634,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD return xRet; } -void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container::XIndexAccess >& xData ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -671,7 +671,7 @@ 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) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -700,7 +700,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( con // XDrawPagesSupplier uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -720,7 +720,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getDrawPages( // XMasterPagesSupplier uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPages() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -741,7 +741,7 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SdXImpressDocument::getMasterPage // XLayerManagerSupplier uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerManager( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -758,7 +758,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLayerMa // XCustomPresentationSupplier uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCustomPresentations() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -777,7 +777,7 @@ extern uno::Reference< presentation::XPresentation > createPresentation( SdXImpr // XPresentationSupplier uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPresentation() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -789,7 +789,7 @@ uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPr // XHandoutMasterSupplier uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::getHandoutMasterPage() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1078,7 +1078,7 @@ css::uno::Reference<css::uno::XInterface> SdXImpressDocument::create( } uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance( const OUString& aServiceSpecifier ) - throw(uno::Exception, uno::RuntimeException) + throw(uno::Exception, uno::RuntimeException, std::exception) { return create(aServiceSpecifier, ""); } @@ -1087,7 +1087,7 @@ 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) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { OUString arg; if ((ServiceSpecifier == "com.sun.star.drawing.GraphicObjectShape" @@ -1102,7 +1102,7 @@ SdXImpressDocument::createInstanceWithArguments( } uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1169,18 +1169,18 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames( // lang::XServiceInfo OUString SAL_CALL SdXImpressDocument::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdXImpressDocument" ); } sal_Bool SAL_CALL SdXImpressDocument::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames() throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1201,14 +1201,14 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getSupportedServiceNames( // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SdXImpressDocument::getPropertySetInfo( ) - throw(uno::RuntimeException) + 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) + throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1286,7 +1286,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam } uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1410,14 +1410,14 @@ 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) {} -void SAL_CALL SdXImpressDocument::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL SdXImpressDocument::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL SdXImpressDocument::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} +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) {} // XLinkTargetSupplier uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1432,7 +1432,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getLinks() // XStyleFamiliesSupplier uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFamilies( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1445,7 +1445,7 @@ uno::Reference< container::XNameAccess > SAL_CALL SdXImpressDocument::getStyleFa // XAnyCompareFactory uno::Reference< com::sun::star::ucb::XAnyCompare > SAL_CALL SdXImpressDocument::createAnyCompareByName( const OUString& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return SvxCreateNumRuleCompare(); } @@ -1453,7 +1453,7 @@ uno::Reference< com::sun::star::ucb::XAnyCompare > SAL_CALL SdXImpressDocument:: // XRenderable sal_Int32 SAL_CALL SdXImpressDocument::getRendererCount( const uno::Any& rSelection, const uno::Sequence< beans::PropertyValue >& ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; sal_Int32 nRet = 0; @@ -1484,7 +1484,7 @@ 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) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1842,7 +1842,7 @@ sal_Bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const } void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& rSelection, const uno::Sequence< beans::PropertyValue >& rxOptions ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2231,7 +2231,7 @@ void SdXImpressDocument::initializeDocument() } } -void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { if( !mbDisposed ) { @@ -2348,7 +2348,7 @@ SdDrawPagesAccess::~SdDrawPagesAccess() throw() // XIndexAccess sal_Int32 SAL_CALL SdDrawPagesAccess::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2359,7 +2359,7 @@ sal_Int32 SAL_CALL SdDrawPagesAccess::getCount() } uno::Any SAL_CALL SdDrawPagesAccess::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2382,7 +2382,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) +uno::Any SAL_CALL SdDrawPagesAccess::getByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2412,7 +2412,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) +uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2433,7 +2433,7 @@ uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getElementNames() throw(un return aNames; } -sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2457,13 +2457,13 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasByName( const OUString& aName ) throw(un // XElementAccess uno::Type SAL_CALL SdDrawPagesAccess::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SdDrawPagesAccess::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return getCount() > 0; } @@ -2475,7 +2475,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasElements() * @returns corresponding SdDrawPage */ uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2501,7 +2501,7 @@ 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) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2556,17 +2556,17 @@ void SAL_CALL SdDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPag // XServiceInfo const char pSdDrawPagesAccessService[] = "com.sun.star.drawing.DrawPages"; -OUString SAL_CALL SdDrawPagesAccess::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL SdDrawPagesAccess::getImplementationName( ) throw(uno::RuntimeException, std::exception) { return OUString( "SdDrawPagesAccess" ); } -sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) { OUString aService( pSdDrawPagesAccessService ); uno::Sequence< OUString > aSeq( &aService, 1 ); @@ -2574,17 +2574,17 @@ uno::Sequence< OUString > SAL_CALL SdDrawPagesAccess::getSupportedServiceNames( } // XComponent -void SAL_CALL SdDrawPagesAccess::dispose( ) throw (uno::RuntimeException) +void SAL_CALL SdDrawPagesAccess::dispose( ) throw (uno::RuntimeException, std::exception) { mpModel = NULL; } -void SAL_CALL SdDrawPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdDrawPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented!" ); } -void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdDrawPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented!" ); } @@ -2603,24 +2603,24 @@ SdMasterPagesAccess::~SdMasterPagesAccess() throw() } // XComponent -void SAL_CALL SdMasterPagesAccess::dispose( ) throw (uno::RuntimeException) +void SAL_CALL SdMasterPagesAccess::dispose( ) throw (uno::RuntimeException, std::exception) { mpModel = NULL; } -void SAL_CALL SdMasterPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdMasterPagesAccess::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented!" ); } -void SAL_CALL SdMasterPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdMasterPagesAccess::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented!" ); } // XIndexAccess sal_Int32 SAL_CALL SdMasterPagesAccess::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2635,7 +2635,7 @@ 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) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2659,13 +2659,13 @@ uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SdMasterPagesAccess::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SdMasterPagesAccess::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return getCount() > 0; } @@ -2768,7 +2768,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn * the model. */ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2824,17 +2824,17 @@ void SAL_CALL SdMasterPagesAccess::remove( const uno::Reference< drawing::XDrawP // XServiceInfo const char pSdMasterPagesAccessService[] = "com.sun.star.drawing.MasterPages"; -OUString SAL_CALL SdMasterPagesAccess::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL SdMasterPagesAccess::getImplementationName( ) throw(uno::RuntimeException, std::exception) { return OUString( "SdMasterPagesAccess" ); } -sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SdMasterPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) { OUString aService( pSdMasterPagesAccessService ); uno::Sequence< OUString > aSeq( &aService, 1 ); @@ -2855,24 +2855,24 @@ SdDocLinkTargets::~SdDocLinkTargets() throw() } // XComponent -void SAL_CALL SdDocLinkTargets::dispose( ) throw (uno::RuntimeException) +void SAL_CALL SdDocLinkTargets::dispose( ) throw (uno::RuntimeException, std::exception) { mpModel = NULL; } -void SAL_CALL SdDocLinkTargets::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdDocLinkTargets::addEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented!" ); } -void SAL_CALL SdDocLinkTargets::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException) +void SAL_CALL SdDocLinkTargets::removeEventListener( const uno::Reference< lang::XEventListener >& ) throw (uno::RuntimeException, std::exception) { OSL_FAIL( "not implemented!" ); } // XNameAccess uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2894,7 +2894,7 @@ uno::Any SAL_CALL SdDocLinkTargets::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2947,7 +2947,7 @@ uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getElementNames() } sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2959,13 +2959,13 @@ sal_Bool SAL_CALL SdDocLinkTargets::hasByName( const OUString& aName ) // container::XElementAccess uno::Type SAL_CALL SdDocLinkTargets::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool SAL_CALL SdDocLinkTargets::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3012,19 +3012,19 @@ SdPage* SdDocLinkTargets::FindPage( const OUString& rName ) const throw() // XServiceInfo OUString SAL_CALL SdDocLinkTargets::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdDocLinkTargets" ); } sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdDocLinkTargets::getSupportedServiceNames() - throw(uno::RuntimeException) + 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 abf56f2faa27..784381977cf3 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -85,20 +85,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 ) +void SAL_CALL SdUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs ) throw( uno::RuntimeException, std::exception ) { dispatchWithNotification(aURL, aArgs, uno::Reference< frame::XDispatchResultListener >()); } -void SAL_CALL SdUnoModule::addStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) throw( uno::RuntimeException ) +void SAL_CALL SdUnoModule::addStatusListener(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&) throw( uno::RuntimeException ) +void SAL_CALL SdUnoModule::removeStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) throw( uno::RuntimeException, std::exception ) { } -uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( uno::RuntimeException ) +uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = seqDescripts.getLength(); uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount ); @@ -129,17 +129,17 @@ uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const ut } // XServiceInfo -OUString SAL_CALL SdUnoModule::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL SdUnoModule::getImplementationName( ) throw(uno::RuntimeException, std::exception) { return SdUnoModule_getImplementationName(); } -sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } -uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) { return SdUnoModule_getSupportedServiceNames(); } diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx index 123656b6be98..ad85113dbde2 100644 --- a/sd/source/ui/unoidl/unomodule.hxx +++ b/sd/source/ui/unoidl/unomodule.hxx @@ -62,20 +62,20 @@ public: throw (css::uno::RuntimeException, std::exception); // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException ); + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ); // 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 ) ; + 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 ) ; 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); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception); }; #endif diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index b18e8d0d0cc4..75c997f5f23d 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -326,7 +326,7 @@ uno::Any SAL_CALL SdXShape::queryAggregation( const uno::Type & rType ) } uno::Any SAL_CALL SdXShape::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return mpShape->queryInterface( rType ); } @@ -1159,25 +1159,25 @@ public: SdUnoEventsAccess( SdXShape* pShape ) throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; // XEventsSupplier -uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) throw(::com::sun::star::uno::RuntimeException) +uno::Reference< container::XNameReplace > SAL_CALL SdXShape::getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return new SdUnoEventsAccess( this ); } @@ -1226,7 +1226,7 @@ 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) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpShape == NULL || aName != maStrOnClick ) throw container::NoSuchElementException(); @@ -1499,7 +1499,7 @@ 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) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpShape == NULL || aName != maStrOnClick ) throw container::NoSuchElementException(); @@ -1710,45 +1710,45 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SdUnoEventsAccess::getElementNames( ) - throw(uno::RuntimeException) + 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) + throw(uno::RuntimeException, std::exception) { return aName == maStrOnClick; } // XElementAccess uno::Type SAL_CALL SdUnoEventsAccess::getElementType( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return ::getCppuType((const uno::Sequence< beans::PropertyValue >*)0); } -sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( ) throw(uno::RuntimeException) +sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( ) throw(uno::RuntimeException, std::exception) { return sal_True; } // XServiceInfo OUString SAL_CALL SdUnoEventsAccess::getImplementationName( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdUnoEventsAccess" ); } sal_Bool SAL_CALL SdUnoEventsAccess::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL SdUnoEventsAccess::getSupportedServiceNames( ) - throw(uno::RuntimeException) + 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 521a1c1d7d3d..015c98f07fde 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -81,7 +81,7 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); @@ -112,7 +112,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XEventsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception); private: void setOldEffect( const com::sun::star::uno::Any& aValue ); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 81b0a8ad0cf6..2953e27a0c5b 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -328,7 +328,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SdGenericDrawPage::getUnoTun return theSdGenericDrawPageUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -517,7 +517,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap // XInterface Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { Any aAny; @@ -551,7 +551,7 @@ Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType ) // XPropertySet Reference< beans::XPropertySetInfo > SAL_CALL SdGenericDrawPage::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; throwIfDisposed(); @@ -973,7 +973,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1278,13 +1278,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) {} -void SAL_CALL SdGenericDrawPage::removePropertyChangeListener( const OUString& , const Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL SdGenericDrawPage::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL SdGenericDrawPage::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} +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) {} // XMultiPropertySet -void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException ) +void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception ) { if( aPropertyNames.getLength() != aValues.getLength() ) throw lang::IllegalArgumentException(); @@ -1306,7 +1306,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValues( const Sequence< OUString >& } } -Sequence< Any > SAL_CALL SdGenericDrawPage::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException) +Sequence< Any > SAL_CALL SdGenericDrawPage::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception) { const OUString* pNames = aPropertyNames.getConstArray(); sal_uInt32 nCount = aPropertyNames.getLength(); @@ -1329,15 +1329,15 @@ 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) +void SAL_CALL SdGenericDrawPage::addPropertiesChangeListener( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } -void SAL_CALL SdGenericDrawPage::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& ) throw (RuntimeException) +void SAL_CALL SdGenericDrawPage::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } -void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >& ) throw (RuntimeException) +void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUString >& , const Reference< beans::XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } @@ -1470,7 +1470,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj ) // XServiceInfo Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { Sequence< OUString > aSeq( SvxFmDrawPage::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.drawing.GenericDrawPage", @@ -1483,7 +1483,7 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames() // XLinkTargetSupplier Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return new SdPageLinkTargets( (SdGenericDrawPage*)this ); } @@ -1546,7 +1546,7 @@ void SdGenericDrawPage::setBookmarkURL( OUString& rURL ) Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Reference< drawing::XShapes >& xShapes ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -1583,7 +1583,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGroup ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -1602,7 +1602,7 @@ 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 ) + throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -1636,7 +1636,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -1850,7 +1850,7 @@ void SdGenericDrawPage::disposing() throw() } // XAnimationNodeSupplier -Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() throw (uno::RuntimeException) +Reference< XAnimationNode > SAL_CALL SdGenericDrawPage::getAnimationNode() throw (uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1876,13 +1876,13 @@ SdPageLinkTargets::~SdPageLinkTargets() throw() // XElementAccess uno::Type SAL_CALL SdPageLinkTargets::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool SAL_CALL SdPageLinkTargets::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1909,7 +1909,7 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasElements() // XNameAccess Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1928,7 +1928,7 @@ Any SAL_CALL SdPageLinkTargets::getByName( const OUString& aName ) } Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1970,7 +1970,7 @@ Sequence< OUString > SAL_CALL SdPageLinkTargets::getElementNames() } sal_Bool SAL_CALL SdPageLinkTargets::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2000,19 +2000,19 @@ SdrObject* SdPageLinkTargets::FindObject( const OUString& rName ) const throw() // XServiceInfo OUString SAL_CALL SdPageLinkTargets::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString( "SdPageLinkTargets" ); } sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } Sequence< OUString > SAL_CALL SdPageLinkTargets::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { const OUString aSN( "com.sun.star.document.LinkTargets" ); Sequence< OUString > aSeq( &aSN, 1); @@ -2032,7 +2032,7 @@ SdDrawPage::~SdDrawPage() throw() // XInterface Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( rType == cppu::UnoType<drawing::XMasterPageTarget>::get() ) { @@ -2067,7 +2067,7 @@ void SAL_CALL SdDrawPage::release() throw() UNO3_GETIMPLEMENTATION2_IMPL( SdDrawPage, SdGenericDrawPage ); // XTypeProvider -Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeException) +Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2120,7 +2120,7 @@ namespace class theSdDrawPageImplementationId : public rtl::Static< UnoTunnelIdInit, theSdDrawPageImplementationId > {}; } -Sequence< sal_Int8 > SAL_CALL SdDrawPage::getImplementationId() throw(uno::RuntimeException) +Sequence< sal_Int8 > SAL_CALL SdDrawPage::getImplementationId() throw(uno::RuntimeException, std::exception) { return theSdDrawPageImplementationId::get().getSeq(); } @@ -2220,12 +2220,12 @@ OUString SdDrawPage::getUiNameFromPageApiName( const OUString& rApiName ) } // XServiceInfo -OUString SAL_CALL SdDrawPage::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL SdDrawPage::getImplementationName() throw(uno::RuntimeException, std::exception) { return OUString( "SdDrawPage" ); } -Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno::RuntimeException) +Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2241,14 +2241,14 @@ Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames() throw(uno:: } sal_Bool SAL_CALL SdDrawPage::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::supportsService( ServiceName ); } // XNamed void SAL_CALL SdDrawPage::setName( const OUString& rName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2327,7 +2327,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) } OUString SAL_CALL SdDrawPage::getName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2338,7 +2338,7 @@ OUString SAL_CALL SdDrawPage::getName() // XMasterPageTarget Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2361,7 +2361,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( ) } void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& xMasterPage ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2400,7 +2400,7 @@ void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& // XPresentationPage Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2420,32 +2420,32 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getNotesPage() // XIndexAccess sal_Int32 SAL_CALL SdDrawPage::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::getCount(); } Any SAL_CALL SdDrawPage::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { return SdGenericDrawPage::getByIndex( Index ); } // XElementAccess uno::Type SAL_CALL SdDrawPage::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::getElementType(); } sal_Bool SAL_CALL SdDrawPage::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::hasElements(); } // XShapes -void SAL_CALL SdDrawPage::add( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException) +void SAL_CALL SdDrawPage::add( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception) { SdGenericDrawPage::add( xShape ); } @@ -2538,7 +2538,7 @@ void SdDrawPage::setBackground( const Any& rValue ) } // XAnnotationAccess: -Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation() throw (RuntimeException) +Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation() throw (RuntimeException, std::exception) { if( !GetPage() ) throw DisposedException(); @@ -2548,12 +2548,12 @@ Reference< XAnnotation > SAL_CALL SdGenericDrawPage::createAndInsertAnnotation() return xRet; } -void SAL_CALL SdGenericDrawPage::removeAnnotation(const Reference< XAnnotation > & annotation) throw (RuntimeException, IllegalArgumentException) +void SAL_CALL SdGenericDrawPage::removeAnnotation(const Reference< XAnnotation > & annotation) throw (RuntimeException, IllegalArgumentException, std::exception) { GetPage()->removeAnnotation(annotation); } -Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotationEnumeration() throw (RuntimeException) +Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotationEnumeration() throw (RuntimeException, std::exception) { return ::sd::createAnnotationEnumeration( GetPage()->getAnnotations() ); } @@ -2604,12 +2604,12 @@ public: SdNavigationOrderAccess( SdrPage* pPage ); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException); - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException); + virtual sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception); // XElementAccess - virtual Type SAL_CALL getElementType( ) throw (RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception); private: std::vector< Reference< XShape > > maShapes; @@ -2633,12 +2633,12 @@ SdNavigationOrderAccess::SdNavigationOrderAccess( SdrPage* pPage ) } // XIndexAccess -sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL SdNavigationOrderAccess::getCount( ) throw (RuntimeException, std::exception) { return static_cast< sal_Int32 >( maShapes.size() ); } -Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) +Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { if( (Index < 0) || (Index > getCount()) ) throw IndexOutOfBoundsException(); @@ -2647,12 +2647,12 @@ Any SAL_CALL SdNavigationOrderAccess::getByIndex( sal_Int32 Index ) throw (Index } // XElementAccess -Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException) +Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeException, std::exception) { return cppu::UnoType<XShape>::get(); } -sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException, std::exception) { return maShapes.empty() ? sal_False : sal_True; } @@ -2681,7 +2681,7 @@ SdMasterPage::~SdMasterPage() throw() // XInterface Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2718,7 +2718,7 @@ void SAL_CALL SdMasterPage::release() throw() UNO3_GETIMPLEMENTATION2_IMPL( SdMasterPage, SdGenericDrawPage ); // XTypeProvider -Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeException) +Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2770,18 +2770,18 @@ namespace class theSdMasterPageImplementationId : public rtl::Static< UnoTunnelIdInit, theSdMasterPageImplementationId > {}; } -Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() throw(uno::RuntimeException) +Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() throw(uno::RuntimeException, std::exception) { return theSdMasterPageImplementationId::get().getSeq(); } // XServiceInfo -OUString SAL_CALL SdMasterPage::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL SdMasterPage::getImplementationName() throw(uno::RuntimeException, std::exception) { return OUString( "SdMasterPage" ); } -Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno::RuntimeException) +Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2797,13 +2797,13 @@ Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames() throw(uno } sal_Bool SAL_CALL SdMasterPage::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::supportsService( ServiceName ); } // XElementAccess -sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException) +sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2816,14 +2816,14 @@ sal_Bool SAL_CALL SdMasterPage::hasElements() throw(uno::RuntimeException) } uno::Type SAL_CALL SdMasterPage::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return SdGenericDrawPage::getElementType(); } // XIndexAccess sal_Int32 SAL_CALL SdMasterPage::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -2833,7 +2833,7 @@ sal_Int32 SAL_CALL SdMasterPage::getCount() } Any SAL_CALL SdMasterPage::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3007,7 +3007,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw() // XNamed void SAL_CALL SdMasterPage::setName( const OUString& rName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3051,7 +3051,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& rName ) } OUString SAL_CALL SdMasterPage::getName( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3068,7 +3068,7 @@ OUString SAL_CALL SdMasterPage::getName( ) // XPresentationPage Reference< drawing::XDrawPage > SAL_CALL SdMasterPage::getNotesPage() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3087,7 +3087,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdMasterPage::getNotesPage() } // XShapes -void SAL_CALL SdMasterPage::add( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException) +void SAL_CALL SdMasterPage::add( const Reference< drawing::XShape >& xShape ) throw(uno::RuntimeException, std::exception) { SdGenericDrawPage::add( xShape ); } diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index c6742f6af75a..43d1eb06b5dc 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -101,7 +101,7 @@ public: SdXImpressDocument* GetModel() const; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); // this is called whenever a SdrObject must be created for a empty api shape wrapper virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) @@ -112,19 +112,19 @@ public: throw (std::exception); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL release() throw(); // XShapeCombiner - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL combine( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL split( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xGroup ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL combine( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL split( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xGroup ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XShapeBinder - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL bind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unbind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL bind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unbind( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -132,32 +132,32 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XAnimationNodeSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > SAL_CALL getAnimationNode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAnnotationAccess: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > SAL_CALL createAndInsertAnnotation() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeAnnotation(const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > & annotation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > SAL_CALL createAndInsertAnnotation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAnnotation(const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > & annotation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationEnumeration > SAL_CALL createAnnotationEnumeration() throw (::com::sun::star::uno::RuntimeException, std::exception); }; /*********************************************************************** @@ -185,40 +185,40 @@ public: static OUString getUiNameFromPageApiName( const OUString& rApiName ); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XMasterPageTarget - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMasterPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getMasterPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMasterPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPresentationPage - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -244,36 +244,36 @@ public: UNO3_GETIMPLEMENTATION_DECL(SdMasterPage) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPresentationPage - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getNotesPage( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception); @@ -300,18 +300,18 @@ public: SdrObject* FindObject( const OUString& rName ) const throw(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); }; #endif // INCLUDED_SD_SOURCE_UI_UNOIDL_UNOPAGE_HXX diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 734073025cf5..c78c7b1b0fa3 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -180,19 +180,19 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) // XServiceInfo OUString SAL_CALL SdUnoPageBackground::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString::createFromAscii( sUNO_SdUnoPageBackground ); } sal_Bool SAL_CALL SdUnoPageBackground::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNameSequence( 2 ); OUString* pStrings = aNameSequence.getArray(); @@ -205,13 +205,13 @@ uno::Sequence< OUString > SAL_CALL SdUnoPageBackground::getSupportedServiceNames // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SdUnoPageBackground::getPropertySetInfo() - throw(uno::RuntimeException) + 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) + throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -268,7 +268,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa } uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -320,14 +320,14 @@ 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) {} -void SAL_CALL SdUnoPageBackground::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL SdUnoPageBackground::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} -void SAL_CALL SdUnoPageBackground::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) {} +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) {} // XPropertyState beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException) + throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -374,7 +374,7 @@ 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) + throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -391,7 +391,7 @@ uno::Sequence< beans::PropertyState > SAL_CALL SdUnoPageBackground::getPropertyS } void SAL_CALL SdUnoPageBackground::setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException) + throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -415,7 +415,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyToDefault( const OUString& Propert } uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + 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 8ce5c153f3e5..d30aa07544ca 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(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 690c2f9b294a..538150dd128c 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -98,13 +98,13 @@ SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() throw() // util::XReplaceable uno::Reference< util::XReplaceDescriptor > SAL_CALL SdUnoSearchReplaceShape::createReplaceDescriptor() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return new SdUnoSearchReplaceDescriptor(sal_True); } sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< util::XSearchDescriptor >& xDesc ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc ); if( pDescr == NULL ) @@ -196,13 +196,13 @@ sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< ut // XSearchable uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL SdUnoSearchReplaceShape::createSearchDescriptor( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return new SdUnoSearchReplaceDescriptor(sal_False); } uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL SdUnoSearchReplaceShape::findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc ); if( pDescr == NULL ) @@ -309,7 +309,7 @@ uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL SdUnoSearch } uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findFirst( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference< text::XTextRange > xRange( GetCurrentShape(), uno::UNO_QUERY ); if( xRange.is() ) @@ -344,7 +344,7 @@ uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetCurrentShape() co } uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SdUnoSearchReplaceShape::findNext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { SdUnoSearchReplaceDescriptor* pDescr = SdUnoSearchReplaceDescriptor::getImplementation( xDesc ); @@ -723,40 +723,40 @@ SdUnoSearchReplaceDescriptor::~SdUnoSearchReplaceDescriptor() throw() // XSearchDescriptor OUString SAL_CALL SdUnoSearchReplaceDescriptor::getSearchString() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return maSearchStr; } void SAL_CALL SdUnoSearchReplaceDescriptor::setSearchString( const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { maSearchStr = aString; } // XReplaceDescriptor OUString SAL_CALL SdUnoSearchReplaceDescriptor::getReplaceString() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return maReplaceStr; } void SAL_CALL SdUnoSearchReplaceDescriptor::setReplaceString( const OUString& aReplaceString ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { maReplaceStr = aReplaceString; } // XPropertySet uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SdUnoSearchReplaceDescriptor::getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpPropSet->getPropertySetInfo(); } void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -784,7 +784,7 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aP } uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString& PropertyName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -810,10 +810,10 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString return aAny; } -void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} -void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addPropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removePropertyChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::addVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} +void SAL_CALL SdUnoSearchReplaceDescriptor::removeVetoableChangeListener( const OUString& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) {} /* ================================================================= */ @@ -829,26 +829,26 @@ SdUnoFindAllAccess::~SdUnoFindAllAccess() throw() // XElementAccess uno::Type SAL_CALL SdUnoFindAllAccess::getElementType() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextRange>::get(); } sal_Bool SAL_CALL SdUnoFindAllAccess::hasElements() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return maSequence.getLength() > 0; } // XIndexAccess sal_Int32 SAL_CALL SdUnoFindAllAccess::getCount() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return maSequence.getLength(); } uno::Any SAL_CALL SdUnoFindAllAccess::getByIndex( sal_Int32 Index ) - throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { uno::Any aAny; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 50afc78a77e1..2eaf443b6622 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2296,7 +2296,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)aSelection; mpImpl->ProcessProperties(rOptions); @@ -2310,7 +2310,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { (void)nRenderer; (void)rSelection; @@ -2325,7 +2325,7 @@ 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) + 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 ccb7fab2fcf8..3c5f728b54d9 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -278,7 +278,7 @@ void ViewTabBar::disposing (void) void SAL_CALL ViewTabBar::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Type.equals(FrameworkHelper::msResourceActivationEvent) && rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix) @@ -295,7 +295,7 @@ void SAL_CALL ViewTabBar::notifyConfigurationChange ( void SAL_CALL ViewTabBar::disposing( const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxConfigurationController) { @@ -312,7 +312,7 @@ void SAL_CALL ViewTabBar::disposing( void SAL_CALL ViewTabBar::addTabBarButtonAfter ( const TabBarButton& rButton, const TabBarButton& rAnchor) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; AddTabBarButton(rButton, rAnchor); @@ -322,7 +322,7 @@ void SAL_CALL ViewTabBar::addTabBarButtonAfter ( void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; AddTabBarButton(rButton); @@ -331,7 +331,7 @@ void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton) void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; RemoveTabBarButton(rButton); @@ -341,7 +341,7 @@ void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton) sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; return HasTabBarButton(rButton); @@ -351,7 +351,7 @@ sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; return GetTabBarButtons(); @@ -363,7 +363,7 @@ Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void) //----- XResource ------------------------------------------------------------- Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return mxViewTabBarId; } @@ -372,7 +372,7 @@ Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId (void) sal_Bool SAL_CALL ViewTabBar::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return false; } @@ -393,7 +393,7 @@ const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId (void) } sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) - throw (RuntimeException) + 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 5f0012ed50da..7fc0e65e5f1b 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -95,7 +95,7 @@ public: ~ScannerEventListener(); // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException); + virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception); void ParentDestroyed() { mpParent = NULL; } }; @@ -108,7 +108,7 @@ ScannerEventListener::~ScannerEventListener() -void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException) +void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException, std::exception) { if( mpParent ) mpParent->ScannerEvent( rEventObject ); |