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 /sc/source/ui/Accessibility | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sc/source/ui/Accessibility')
20 files changed, 380 insertions, 380 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index c164040817ec..5b3af7b1d353 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -128,13 +128,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( ScAccessibleCell, ScAccessibleCellBase, Access uno::Reference< XAccessible > SAL_CALL ScAccessibleCell::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleStaticTextBase::getAccessibleAtPoint(rPoint); } void SAL_CALL ScAccessibleCell::grabFocus( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -150,7 +150,7 @@ void SAL_CALL ScAccessibleCell::grabFocus( ) } Rectangle ScAccessibleCell::GetBoundingBoxOnScreen(void) const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) @@ -212,7 +212,7 @@ Rectangle ScAccessibleCell::GetBoundingBox() const sal_Int32 SAL_CALL ScAccessibleCell::getAccessibleChildCount(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleStaticTextBase::getAccessibleChildCount(); } @@ -220,14 +220,14 @@ sal_Int32 SAL_CALL uno::Reference< XAccessible > SAL_CALL ScAccessibleCell::getAccessibleChild(sal_Int32 nIndex) throw (uno::RuntimeException, - lang::IndexOutOfBoundsException) + lang::IndexOutOfBoundsException, std::exception) { return AccessibleStaticTextBase::getAccessibleChild(nIndex); } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleCell::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -300,14 +300,14 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleCell::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleCell"); } uno::Sequence< OUString> SAL_CALL ScAccessibleCell::getSupportedServiceNames(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -542,7 +542,7 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() } // cell has its own ParaIndent property, so when calling character attributes on cell, the ParaIndent should replace the ParaLeftMargin if its value is not zero. -uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +uno::Sequence< beans::PropertyValue > SAL_CALL ScAccessibleCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index b1a8ed8f13aa..9eb68d073578 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -91,7 +91,7 @@ sal_Bool SAL_CALL ScAccessibleCellBase::isVisible() } sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -131,7 +131,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getForeground() } sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -175,7 +175,7 @@ sal_Int32 SAL_CALL ScAccessibleCellBase::getBackground() //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessibleCellBase::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessibleCellBaseImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); @@ -197,7 +197,7 @@ void SAL_CALL ScAccessibleCellBase::release() sal_Int32 ScAccessibleCellBase::getAccessibleIndexInParent(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -215,7 +215,7 @@ OUString SAL_CALL OUString SAL_CALL ScAccessibleCellBase::createAccessibleName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // Document not needed, because only the cell address, but not the tablename is needed // always us OOO notation @@ -240,7 +240,7 @@ uno::Any SAL_CALL sal_Bool SAL_CALL ScAccessibleCellBase::setCurrentValue( const uno::Any& aNumber ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -265,7 +265,7 @@ sal_Bool SAL_CALL uno::Any SAL_CALL ScAccessibleCellBase::getMaximumValue( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= DBL_MAX; @@ -275,7 +275,7 @@ uno::Any SAL_CALL uno::Any SAL_CALL ScAccessibleCellBase::getMinimumValue( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= -DBL_MAX; @@ -286,7 +286,7 @@ uno::Any SAL_CALL //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleCellBase"); } @@ -294,7 +294,7 @@ OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) //===== XTypeProvider =================================================== uno::Sequence< uno::Type > SAL_CALL ScAccessibleCellBase::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessibleCellBaseImpl::getTypes(), ScAccessibleContextBase::getTypes()); } @@ -306,7 +306,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessibleCellBase::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessibleCellBaseImplementationId::get().getSeq(); } diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 9d46726ebccf..ea73791b6620 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -113,7 +113,7 @@ void SAL_CALL ScAccessibleContextBase::disposing() //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessibleContextBase::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessibleContextBaseWeakImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBaseImplEvent::queryInterface(rType); @@ -150,7 +150,7 @@ void ScAccessibleContextBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) uno::Reference< XAccessibleContext> SAL_CALL ScAccessibleContextBase::getAccessibleContext(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return this; } @@ -158,7 +158,7 @@ uno::Reference< XAccessibleContext> SAL_CALL //===== XAccessibleComponent ================================================ sal_Bool SAL_CALL ScAccessibleContextBase::containsPoint(const awt::Point& rPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -174,7 +174,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleContextBase::getAccessibleAtP } awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -182,7 +182,7 @@ awt::Rectangle SAL_CALL ScAccessibleContextBase::getBounds( ) } awt::Point SAL_CALL ScAccessibleContextBase::getLocation( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -190,7 +190,7 @@ awt::Point SAL_CALL ScAccessibleContextBase::getLocation( ) } awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -198,7 +198,7 @@ awt::Point SAL_CALL ScAccessibleContextBase::getLocationOnScreen( ) } awt::Size SAL_CALL ScAccessibleContextBase::getSize( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -231,19 +231,19 @@ sal_Bool SAL_CALL ScAccessibleContextBase::isVisible() } void SAL_CALL ScAccessibleContextBase::grabFocus( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } sal_Int32 SAL_CALL ScAccessibleContextBase::getForeground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return COL_WHITE; } @@ -268,14 +268,14 @@ uno::Reference<XAccessible> SAL_CALL uno::Reference<XAccessible> SAL_CALL ScAccessibleContextBase::getAccessibleParent(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return mxParent; } sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleIndexInParent(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -309,14 +309,14 @@ sal_Int32 SAL_CALL sal_Int16 SAL_CALL ScAccessibleContextBase::getAccessibleRole(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return maRole; } OUString SAL_CALL ScAccessibleContextBase::getAccessibleDescription(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -342,7 +342,7 @@ OUString SAL_CALL OUString SAL_CALL ScAccessibleContextBase::getAccessibleName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -376,7 +376,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleContextBase::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference<XAccessibleStateSet>(); } @@ -384,7 +384,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL lang::Locale SAL_CALL ScAccessibleContextBase::getLocale(void) throw (IllegalAccessibleComponentStateException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -406,7 +406,7 @@ lang::Locale SAL_CALL void SAL_CALL ScAccessibleContextBase::addAccessibleEventListener( const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -424,7 +424,7 @@ void SAL_CALL void SAL_CALL ScAccessibleContextBase::removeAccessibleEventListener( const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -449,7 +449,7 @@ void SAL_CALL void SAL_CALL ScAccessibleContextBase::disposing( const lang::EventObject& rSource ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (rSource.Source == mxParent) @@ -458,26 +458,26 @@ void SAL_CALL ScAccessibleContextBase::disposing( void SAL_CALL ScAccessibleContextBase::notifyEvent( const AccessibleEventObject& /* aEvent */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } //===== XServiceInfo ======================================================== OUString SAL_CALL ScAccessibleContextBase::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleContextBase"); } sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServiceName) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } uno::Sequence< OUString> SAL_CALL ScAccessibleContextBase::getSupportedServiceNames(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence<OUString> aServiceNames(2); OUString* pServiceNames = aServiceNames.getArray(); @@ -493,7 +493,7 @@ uno::Sequence< OUString> SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence< uno::Type > SAL_CALL ScAccessibleContextBase::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessibleContextBaseWeakImpl::getTypes(), ScAccessibleContextBaseImplEvent::getTypes()); } @@ -505,7 +505,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessibleContextBase::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessibleContextBaseImplementationId::get().getSeq(); } diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 0435444f6d48..73432cce6f9e 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -112,20 +112,20 @@ void SAL_CALL ScAccessibleCsvControl::disposing() // XAccessibleComponent ------------------------------------------------------- Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const AwtPoint& /* rPoint */ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ensureAlive(); return NULL; } -sal_Bool SAL_CALL ScAccessibleCsvControl::isVisible() throw( RuntimeException ) +sal_Bool SAL_CALL ScAccessibleCsvControl::isVisible() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); return implGetControl().IsVisible(); } -void SAL_CALL ScAccessibleCsvControl::grabFocus() throw( RuntimeException ) +void SAL_CALL ScAccessibleCsvControl::grabFocus() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -182,14 +182,14 @@ void ScAccessibleCsvControl::SendRemoveColumnEvent( sal_uInt32 /* nFirstColumn * // helpers -------------------------------------------------------------------- -Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const throw( RuntimeException ) +Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); return implGetControl().GetWindowExtentsRelative( NULL ); } -Rectangle ScAccessibleCsvControl::GetBoundingBox() const throw( RuntimeException ) +Rectangle ScAccessibleCsvControl::GetBoundingBox() const throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -361,7 +361,7 @@ ScAccessibleCsvRuler::~ScAccessibleCsvRuler() // XAccessibleComponent ----------------------------------------------------- sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -369,7 +369,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getForeground( ) } sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -378,21 +378,21 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground( ) // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() throw( RuntimeException, std::exception ) { ensureAlive(); return 0; } Reference< XAccessible > SAL_CALL ScAccessibleCsvRuler::getAccessibleChild( sal_Int32 /* nIndex */ ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); throw IndexOutOfBoundsException(); } Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleRelationSet() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -408,7 +408,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvRuler::getAccessible } Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleStateSet() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; AccessibleStateSetHelper* pStateSet = implCreateStateSet(); @@ -425,7 +425,7 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleSta // XAccessibleText ------------------------------------------------------------ -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -433,7 +433,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeExcept } sal_Bool SAL_CALL ScAccessibleCsvRuler::setCaretPosition( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -445,7 +445,7 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::setCaretPosition( sal_Int32 nIndex ) } sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -455,7 +455,7 @@ sal_Unicode SAL_CALL ScAccessibleCsvRuler::getCharacter( sal_Int32 nIndex ) Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& /* aRequestedAttributes */ ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -466,7 +466,7 @@ Sequence< PropertyValue > SAL_CALL ScAccessibleCsvRuler::getCharacterAttributes( } ScAccessibleCsvRuler::AwtRectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBounds( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -483,7 +483,7 @@ ScAccessibleCsvRuler::AwtRectangle SAL_CALL ScAccessibleCsvRuler::getCharacterBo return aRect; } -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -491,7 +491,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCharacterCount() throw( RuntimeExcep } sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const AwtPoint& rPoint ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -500,32 +500,32 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getIndexAtPoint( const AwtPoint& rPoint return lcl_GetApiPos( ::std::min( ::std::max( rRuler.GetPosFromX( rPoint.X ), static_cast<sal_Int32>(0) ), rRuler.GetPosCount() ) ); } -OUString SAL_CALL ScAccessibleCsvRuler::getSelectedText() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvRuler::getSelectedText() throw( RuntimeException, std::exception ) { ensureAlive(); return OUString(); } -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionStart() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionStart() throw( RuntimeException, std::exception ) { ensureAlive(); return -1; } -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionEnd() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvRuler::getSelectionEnd() throw( RuntimeException, std::exception ) { ensureAlive(); return -1; } sal_Bool SAL_CALL ScAccessibleCsvRuler::setSelection( sal_Int32 /* nStartIndex */, sal_Int32 /* nEndIndex */ ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); return false; } -OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -533,7 +533,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getText() throw( RuntimeException ) } OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -542,7 +542,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal } TextSegment SAL_CALL ScAccessibleCsvRuler::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType ) - throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException ) + throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -607,7 +607,7 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextAtIndex( sal_Int32 nIndex, sal } TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType ) - throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException ) + throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -660,7 +660,7 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBeforeIndex( sal_Int32 nIndex, } TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType ) - throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException ) + throw( IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -714,7 +714,7 @@ TextSegment SAL_CALL ScAccessibleCsvRuler::getTextBehindIndex( sal_Int32 nIndex, } sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, sal_Int32 /* nEndIndex */ ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); return false; @@ -724,7 +724,7 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, s // XInterface ----------------------------------------------------------------- Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aAny( ScAccessibleCsvRulerImpl::queryInterface( rType ) ); return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface( rType ); @@ -743,7 +743,7 @@ void SAL_CALL ScAccessibleCsvRuler::release() throw () // XServiceInfo --------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( RULER_IMPL_NAME ); } @@ -751,7 +751,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeEx // XTypeProvider -------------------------------------------------------------- -Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException ) +Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) { Sequence< ::com::sun::star::uno::Type > aSeq( 1 ); aSeq[ 0 ] = getCppuType( static_cast< const Reference< XAccessibleText >* >( NULL ) ); @@ -763,7 +763,7 @@ namespace class theScAccessibleCsvRulerImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleCsvRulerImplementationId > {}; } -Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() throw( RuntimeException, std::exception ) { return theScAccessibleCsvRulerImplementationId::get().getSeq(); } @@ -787,7 +787,7 @@ void ScAccessibleCsvRuler::SendCaretEvent() // helpers -------------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() throw( RuntimeException, std::exception ) { return OUString( ScResId( STR_ACC_CSVRULER_NAME ) ); } @@ -907,7 +907,7 @@ ScAccessibleCsvGrid::~ScAccessibleCsvGrid() // XAccessibleComponent ------------------------------------------------------- Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const AwtPoint& rPoint ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XAccessible > xRet; if( containsPoint( rPoint ) ) @@ -927,7 +927,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( con } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getForeground( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -935,7 +935,7 @@ throw (RuntimeException) } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getBackground( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -944,7 +944,7 @@ throw (RuntimeException) // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -952,7 +952,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() throw( Runtime } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -961,7 +961,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_I } Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleRelationSet() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -977,7 +977,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleR } Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStateSet() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; AccessibleStateSetHelper* pStateSet = implCreateStateSet(); @@ -997,14 +997,14 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStat // XAccessibleTable ----------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); return implGetRowCount(); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1012,7 +1012,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnCount() throw( Runtim } OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleRowDescription( sal_Int32 nRow ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1021,7 +1021,7 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleRowDescription( sal_Int32 nR } OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1030,7 +1030,7 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnDescription( sal_Int32 } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); ensureValidPosition( nRow, nColumn ); @@ -1038,7 +1038,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowExtentAt( sal_Int32 nRow } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); ensureValidPosition( nRow, nColumn ); @@ -1046,28 +1046,28 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnExtentAt( sal_Int32 n } Reference< XAccessibleTable > SAL_CALL ScAccessibleCsvGrid::getAccessibleRowHeaders() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ensureAlive(); return NULL; } Reference< XAccessibleTable > SAL_CALL ScAccessibleCsvGrid::getAccessibleColumnHeaders() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ensureAlive(); return NULL; } Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleRows() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ensureAlive(); return Sequence< sal_Int32 >(); } Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleColumns() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1085,14 +1085,14 @@ Sequence< sal_Int32 > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleColumns } sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleRowSelected( sal_Int32 /* nRow */ ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { ensureAlive(); return false; } sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1101,7 +1101,7 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleColumnSelected( sal_Int32 nCo } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1110,27 +1110,27 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCellAt( sal_ } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleCaption() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ensureAlive(); return NULL; } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleSummary() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ensureAlive(); return NULL; } sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleSelected( sal_Int32 /* nRow */, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { return isAccessibleColumnSelected( nColumn ); } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1139,7 +1139,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_ } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1148,7 +1148,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex } sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1160,7 +1160,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildInd // XAccessibleSelection ------------------------------------------------------- void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1173,7 +1173,7 @@ void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex } sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1182,19 +1182,19 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChi return implIsColumnSelected( nColumn ); } -void SAL_CALL ScAccessibleCsvGrid::clearAccessibleSelection() throw( RuntimeException ) +void SAL_CALL ScAccessibleCsvGrid::clearAccessibleSelection() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); implGetGrid().SelectAll( false ); } -void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren() throw( RuntimeException ) +void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren() throw( RuntimeException, std::exception ) { selectAccessibleChild( 0 ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1202,7 +1202,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() throw( } Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1216,7 +1216,7 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChil } void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1234,7 +1234,7 @@ void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedC // XInterface ----------------------------------------------------------------- Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aAny( ScAccessibleCsvGridImpl::queryInterface( rType ) ); return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface( rType ); @@ -1253,7 +1253,7 @@ void SAL_CALL ScAccessibleCsvGrid::release() throw () // XServiceInfo --------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( GRID_IMPL_NAME ); } @@ -1261,7 +1261,7 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeExc // XTypeProvider -------------------------------------------------------------- -Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException ) +Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) { Sequence< ::com::sun::star::uno::Type > aSeq( 2 ); aSeq[ 0 ] = getCppuType( static_cast< const Reference< XAccessibleTable >* >( NULL ) ); @@ -1274,7 +1274,7 @@ namespace class theScAccessibleCsvGridImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleCsvGridImplementationId > {}; } -Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() throw( RuntimeException, std::exception ) { return theScAccessibleCsvGridImplementationId::get().getSeq(); } @@ -1342,7 +1342,7 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uI // helpers -------------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() throw( RuntimeException, std::exception ) { return OUString( ScResId( STR_ACC_CSVGRID_NAME ) ); } @@ -1469,7 +1469,7 @@ void SAL_CALL ScAccessibleCsvCell::disposing() // XAccessibleComponent ------------------------------------------------------- -void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException ) +void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1478,7 +1478,7 @@ void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException ) } sal_Int32 SAL_CALL ScAccessibleCsvCell::getForeground( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -1486,7 +1486,7 @@ throw (RuntimeException) } sal_Int32 SAL_CALL ScAccessibleCsvCell::getBackground( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ensureAlive(); @@ -1495,18 +1495,18 @@ throw (RuntimeException) // XAccessibleContext ----------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() throw( RuntimeException, std::exception ) { return AccessibleStaticTextBase::getAccessibleChildCount(); } Reference< XAccessible > SAL_CALL ScAccessibleCsvCell::getAccessibleChild( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException, RuntimeException ) + throw( IndexOutOfBoundsException, RuntimeException, std::exception ) { return AccessibleStaticTextBase::getAccessibleChild( nIndex ); } -sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( RuntimeException ) +sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1514,7 +1514,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() throw( Runt } Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleRelationSet() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1522,7 +1522,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ScAccessibleCsvCell::getAccessibleR } Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvCell::getAccessibleStateSet() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; AccessibleStateSetHelper* pStateSet = implCreateStateSet(); @@ -1550,14 +1550,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ScAccessibleCsvControl, A // XServiceInfo --------------------------------------------------------------- -OUString SAL_CALL ScAccessibleCsvCell::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvCell::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( CELL_IMPL_NAME ); } // helpers -------------------------------------------------------------------- -Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeException ) +Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1566,14 +1566,14 @@ Rectangle ScAccessibleCsvCell::GetBoundingBoxOnScreen() const throw( RuntimeExce return aRect; } -Rectangle ScAccessibleCsvCell::GetBoundingBox() const throw( RuntimeException ) +Rectangle ScAccessibleCsvCell::GetBoundingBox() const throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; ensureAlive(); return implGetBoundingBox(); } -OUString SAL_CALL ScAccessibleCsvCell::createAccessibleName() throw( RuntimeException ) +OUString SAL_CALL ScAccessibleCsvCell::createAccessibleName() throw( RuntimeException, std::exception ) { return maCellText; } diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index 92c20abb5e2a..6272dadfce61 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -65,14 +65,14 @@ protected: virtual ~ScAccessibleDataPilotButton(void); public: // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); ///===== XAccessibleComponent ============================================ @@ -80,51 +80,51 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isVisible( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); 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); ///===== 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 NULL if index is invalid. 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); /// 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 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); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > - SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); + SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); ///===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); ///===== XTypeProvider =================================================== @@ -132,7 +132,7 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: /// Return this object's description. @@ -143,15 +143,15 @@ protected: /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ScDPFieldControlBase* mpFieldWindow; @@ -382,7 +382,7 @@ void ScAccessibleDataPilotControl::LostFocus() uno::Reference< XAccessible > SAL_CALL ScAccessibleDataPilotControl::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xAcc; if (containsPoint(rPoint)) @@ -403,13 +403,13 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDataPilotControl::getAccessib } sal_Bool SAL_CALL ScAccessibleDataPilotControl::isVisible( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return sal_True; } void SAL_CALL ScAccessibleDataPilotControl::grabFocus( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -418,7 +418,7 @@ void SAL_CALL ScAccessibleDataPilotControl::grabFocus( ) } sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getForeground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -431,7 +431,7 @@ sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getForeground( ) } sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getBackground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -447,7 +447,7 @@ sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getBackground( ) ///===== XAccessibleContext ============================================== sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getAccessibleChildCount(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -455,7 +455,7 @@ sal_Int32 SAL_CALL ScAccessibleDataPilotControl::getAccessibleChildCount(void) } uno::Reference< XAccessible> SAL_CALL ScAccessibleDataPilotControl::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -486,7 +486,7 @@ uno::Reference< XAccessible> SAL_CALL ScAccessibleDataPilotControl::getAccessibl } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -511,7 +511,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotControl::getAc ///===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDataPilotControl"); } @@ -524,7 +524,7 @@ namespace } uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessibleDataPilotControlImplementationId::get().getSeq(); } @@ -543,7 +543,7 @@ OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleDescription(void } OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -554,7 +554,7 @@ OUString SAL_CALL ScAccessibleDataPilotControl::createAccessibleName(void) } Rectangle ScAccessibleDataPilotControl::GetBoundingBoxOnScreen(void) const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (mpFieldWindow) return mpFieldWindow->GetWindowExtentsRelative(NULL); @@ -563,7 +563,7 @@ Rectangle ScAccessibleDataPilotControl::GetBoundingBoxOnScreen(void) const } Rectangle ScAccessibleDataPilotControl::GetBoundingBox(void) const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (mpFieldWindow) return mpFieldWindow->GetWindowExtentsRelative(mpFieldWindow->GetAccessibleParentWindow()); @@ -622,19 +622,19 @@ void ScAccessibleDataPilotButton::ResetFocused() uno::Reference< XAccessible > SAL_CALL ScAccessibleDataPilotButton::getAccessibleAtPoint( const ::com::sun::star::awt::Point& /* rPoint */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return NULL; } sal_Bool SAL_CALL ScAccessibleDataPilotButton::isVisible( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return sal_True; } void SAL_CALL ScAccessibleDataPilotButton::grabFocus( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -645,7 +645,7 @@ void SAL_CALL ScAccessibleDataPilotButton::grabFocus( ) } sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getForeground( ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -658,7 +658,7 @@ throw (uno::RuntimeException) } sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getBackground( ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -673,20 +673,20 @@ throw (uno::RuntimeException) ///===== XAccessibleContext ============================================== sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getAccessibleChildCount(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return 0; } uno::Reference< XAccessible> SAL_CALL ScAccessibleDataPilotButton::getAccessibleChild(sal_Int32 /* nIndex */) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException) + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) { throw lang::IndexOutOfBoundsException(); } sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getAccessibleIndexInParent(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -694,7 +694,7 @@ sal_Int32 SAL_CALL ScAccessibleDataPilotButton::getAccessibleIndexInParent(void) } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -720,7 +720,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAcc } ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > - SAL_CALL ScAccessibleDataPilotButton::getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException) + SAL_CALL ScAccessibleDataPilotButton::getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -741,7 +741,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDataPilotButton::getAcc ///===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("ScAccessibleDataPilotButton"); } @@ -754,7 +754,7 @@ namespace } uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return theScAccessibleDataPilotButtonImplementationId::get().getSeq(); } @@ -770,7 +770,7 @@ OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleDescription(void) } OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -781,7 +781,7 @@ OUString SAL_CALL ScAccessibleDataPilotButton::createAccessibleName(void) } Rectangle ScAccessibleDataPilotButton::GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { Rectangle aRect(GetBoundingBox()); @@ -795,7 +795,7 @@ Rectangle ScAccessibleDataPilotButton::GetBoundingBoxOnScreen(void) const } Rectangle ScAccessibleDataPilotButton::GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if (mpFieldWindow) return Rectangle (mpFieldWindow->GetFieldPosition(const_cast<ScAccessibleDataPilotButton*> (this)->getAccessibleIndexInParent()), mpFieldWindow->GetFieldSize()); @@ -806,26 +806,26 @@ Rectangle ScAccessibleDataPilotButton::GetBoundingBox(void) const // XAccessibleAction -sal_Int32 ScAccessibleDataPilotButton::getAccessibleActionCount( ) throw (uno::RuntimeException) +sal_Int32 ScAccessibleDataPilotButton::getAccessibleActionCount( ) throw (uno::RuntimeException, std::exception) { return 1; } -sal_Bool ScAccessibleDataPilotButton::doAccessibleAction ( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +sal_Bool ScAccessibleDataPilotButton::doAccessibleAction ( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw lang::IndexOutOfBoundsException(); return sal_True; } -OUString ScAccessibleDataPilotButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) +OUString ScAccessibleDataPilotButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw lang::IndexOutOfBoundsException(); return OUString("press"); } -::com::sun::star::uno::Reference< XAccessibleKeyBinding > ScAccessibleDataPilotButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< XAccessibleKeyBinding > ScAccessibleDataPilotButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -845,7 +845,7 @@ OUString ScAccessibleDataPilotButton::getAccessibleActionDescription ( sal_Int32 } uno::Any SAL_CALL ScAccessibleDataPilotButton::queryInterface( uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessibleContextBase::queryInterface(rType)); if(!aAny.hasValue()) diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 0c0ec2583b5a..b5ab757d6b23 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1475,7 +1475,7 @@ void SAL_CALL ScAccessibleDocument::disposing() } void SAL_CALL ScAccessibleDocument::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { disposing(); } @@ -1663,7 +1663,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bSelectionChanged(false); if (mpAccessibleSpreadsheet) @@ -1697,7 +1697,7 @@ void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& / //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aAnyTmp; if(rType == ::getCppuType((com::sun::star::uno::Reference<XAccessibleGetAccFlowTo> *)NULL) ) @@ -1726,7 +1726,7 @@ void SAL_CALL ScAccessibleDocument::release() uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xAccessible = NULL; if (containsPoint(rPoint)) @@ -1756,7 +1756,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocument::getAccessibleAtPoin } void SAL_CALL ScAccessibleDocument::grabFocus( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1782,7 +1782,7 @@ void SAL_CALL ScAccessibleDocument::grabFocus( ) /// Return the number of currently visible children. sal_Int32 SAL_CALL ScAccessibleDocument::getAccessibleChildCount(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1800,7 +1800,7 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible> SAL_CALL ScAccessibleDocument::getAccessibleChild(sal_Int32 nIndex) throw (uno::RuntimeException, - lang::IndexOutOfBoundsException) + lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1831,7 +1831,7 @@ uno::Reference<XAccessible> SAL_CALL /// Return the set of current states. uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocument::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -1859,7 +1859,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL OUString SAL_CALL ScAccessibleDocument::getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1896,7 +1896,7 @@ OUString SAL_CALL void SAL_CALL ScAccessibleDocument::selectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1930,7 +1930,7 @@ void SAL_CALL sal_Bool SAL_CALL ScAccessibleDocument::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1963,7 +1963,7 @@ sal_Bool SAL_CALL void SAL_CALL ScAccessibleDocument::clearAccessibleSelection( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1974,7 +1974,7 @@ void SAL_CALL void SAL_CALL ScAccessibleDocument::selectAllAccessibleChildren( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1991,7 +1991,7 @@ void SAL_CALL sal_Int32 SAL_CALL ScAccessibleDocument::getSelectedAccessibleChildCount( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -2011,7 +2011,7 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible > SAL_CALL ScAccessibleDocument::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -2039,7 +2039,7 @@ uno::Reference<XAccessible > SAL_CALL void SAL_CALL ScAccessibleDocument::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -2072,14 +2072,14 @@ void SAL_CALL OUString SAL_CALL ScAccessibleDocument::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDocument"); } uno::Sequence< OUString> SAL_CALL ScAccessibleDocument::getSupportedServiceNames(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -2093,7 +2093,7 @@ uno::Sequence< OUString> SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence< uno::Type > SAL_CALL ScAccessibleDocument::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessibleDocumentImpl::getTypes(), ScAccessibleContextBase::getTypes()); } @@ -2105,7 +2105,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDocument::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessibleDocumentImplementationId::get().getSeq(); } @@ -2212,7 +2212,7 @@ OUString SAL_CALL OUString SAL_CALL ScAccessibleDocument::createAccessibleName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -2223,7 +2223,7 @@ OUString SAL_CALL } Rectangle ScAccessibleDocument::GetBoundingBoxOnScreen() const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -2236,7 +2236,7 @@ Rectangle ScAccessibleDocument::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleDocument::GetBoundingBox() const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -2372,7 +2372,7 @@ ScAddress ScAccessibleDocument::GetCurCellAddress() const } uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -2449,7 +2449,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any > ScAccessibleDocument:: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL ScAccessibleDocument::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; @@ -2553,13 +2553,13 @@ void ScAccessibleDocument::SwitchViewFireFocus() } sal_Int32 SAL_CALL ScAccessibleDocument::getForeground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL ScAccessibleDocument::getBackground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index e911c8902dac..496806294feb 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1463,7 +1463,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces return xAccessible; } -void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeException) +void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1563,7 +1563,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi /// Return the set of current states. uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -1591,13 +1591,13 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDocumentPagePreview"); } uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -1617,7 +1617,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDocumentPagePreview::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessibleDocumentPagePreviewImplementationId::get().getSeq(); } @@ -1632,13 +1632,13 @@ OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(v } OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString sName = OUString(ScResId(STR_ACC_PREVIEWDOC_NAME)); return sName; } -Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) +Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -1650,7 +1650,7 @@ Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw return aRect; } -Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const throw (uno::RuntimeException) +Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -1696,7 +1696,7 @@ ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren() } OUString ScAccessibleDocumentPagePreview::getAccessibleName(void) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 2eb67e2f6e47..248a857d2f12 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -124,7 +124,7 @@ void ScAccessibleEditObject::GotFocus() com::sun::star::uno::Any SAL_CALL ScAccessibleEditObject::queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aReturn = ScAccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -149,7 +149,7 @@ void SAL_CALL uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(rPoint)) @@ -167,7 +167,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPo } Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen(void) const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Rectangle aScreenBounds; @@ -196,7 +196,7 @@ Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen(void) const } Rectangle ScAccessibleEditObject::GetBoundingBox(void) const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Rectangle aBounds( GetBoundingBoxOnScreen() ); @@ -231,7 +231,7 @@ Rectangle ScAccessibleEditObject::GetBoundingBox(void) const sal_Int32 SAL_CALL ScAccessibleEditObject::getAccessibleChildCount(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -243,7 +243,7 @@ sal_Int32 SAL_CALL uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleChild(sal_Int32 nIndex) throw (uno::RuntimeException, - lang::IndexOutOfBoundsException) + lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -254,7 +254,7 @@ uno::Reference< XAccessible > SAL_CALL uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleEditObject::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -290,7 +290,7 @@ OUString SAL_CALL OUString SAL_CALL ScAccessibleEditObject::createAccessibleName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("Should never be called, because is set in the constructor."); return OUString(); @@ -300,7 +300,7 @@ OUString SAL_CALL void SAL_CALL ScAccessibleEditObject::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (!mpTextHelper) CreateTextHelper(); @@ -312,7 +312,7 @@ void SAL_CALL void SAL_CALL ScAccessibleEditObject::removeAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (!mpTextHelper) CreateTextHelper(); @@ -325,7 +325,7 @@ void SAL_CALL //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleEditObject"); } @@ -339,7 +339,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessibleEditObject::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessibleEditObjectImplementationId::get().getSeq(); } @@ -393,13 +393,13 @@ void ScAccessibleEditObject::CreateTextHelper() } sal_Int32 SAL_CALL ScAccessibleEditObject::getForeground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return GetFgBgColor(OUString(SC_UNONAME_CCOLOR)); } sal_Int32 SAL_CALL ScAccessibleEditObject::getBackground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return GetFgBgColor(OUString(SC_UNONAME_CELLBACK)); } @@ -444,13 +444,13 @@ sal_Int32 ScAccessibleEditObject::GetFgBgColor( const OUString &strPropColor) //===== XAccessibleSelection ============================================ void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int32 ) -throw ( IndexOutOfBoundsException, RuntimeException ) +throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { } sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, - RuntimeException ) + RuntimeException, std::exception ) { uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex ); uno::Reference<XAccessibleContext> xContext; @@ -472,17 +472,17 @@ throw ( IndexOutOfBoundsException, } void SAL_CALL ScAccessibleEditObject::clearAccessibleSelection( ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { } void SAL_CALL ScAccessibleEditObject::selectAllAccessibleChildren( ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { } sal_Int32 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { sal_Int32 nCount = 0; sal_Int32 TotalCount = getAccessibleChildCount(); @@ -492,7 +492,7 @@ throw ( RuntimeException ) } uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) -throw ( IndexOutOfBoundsException, RuntimeException) +throw ( IndexOutOfBoundsException, RuntimeException, std::exception) { if ( nSelectedChildIndex > getSelectedAccessibleChildCount() ) throw IndexOutOfBoundsException(); @@ -510,12 +510,12 @@ throw ( IndexOutOfBoundsException, RuntimeException) void SAL_CALL ScAccessibleEditObject::deselectAccessibleChild( sal_Int32 ) throw ( IndexOutOfBoundsException, - RuntimeException ) + RuntimeException, std::exception ) { } uno::Reference< XAccessibleRelationSet > ScAccessibleEditObject::getAccessibleRelationSet( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Window* pWindow = mpWindow; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index 637b5d589ee7..5d64347d9155 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -100,48 +100,48 @@ ScAccessibleFilterMenu::~ScAccessibleFilterMenu() // XAccessibleComponent Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleAtPoint( const ::com::sun::star::awt::Point& /*rPoint*/ ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return this; } -sal_Bool ScAccessibleFilterMenu::isVisible() throw (RuntimeException) +sal_Bool ScAccessibleFilterMenu::isVisible() throw (RuntimeException, std::exception) { return mpWindow->IsVisible(); } void ScAccessibleFilterMenu::grabFocus() - throw (RuntimeException) + throw (RuntimeException, std::exception) { } sal_Int32 ScAccessibleFilterMenu::getForeground() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 0; } sal_Int32 ScAccessibleFilterMenu::getBackground() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 0; } // XAccessibleContext -OUString ScAccessibleFilterMenu::getAccessibleName() throw (RuntimeException) +OUString ScAccessibleFilterMenu::getAccessibleName() throw (RuntimeException, std::exception) { return ScAccessibleContextBase::getAccessibleName(); } sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getMenuItemCount(); } Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex) - throw (RuntimeException, IndexOutOfBoundsException) + throw (RuntimeException, IndexOutOfBoundsException, std::exception) { if (maMenuItems.size() <= static_cast<size_t>(nIndex)) throw IndexOutOfBoundsException(); @@ -150,14 +150,14 @@ Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nInd } Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet() - throw (RuntimeException) + throw (RuntimeException, std::exception) { updateStates(); return mxStateSet; } OUString ScAccessibleFilterMenu::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString("ScAccessibleFilterMenu"); } @@ -167,7 +167,7 @@ OUString ScAccessibleFilterMenu::getImplementationName() void ScAccessibleFilterMenu::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) { ScAccessibleContextBase::addAccessibleEventListener(xListener); for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, true)); @@ -176,7 +176,7 @@ void ScAccessibleFilterMenu::addAccessibleEventListener( void ScAccessibleFilterMenu::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) { ScAccessibleContextBase::removeAccessibleEventListener(xListener); for_each(maMenuItems.begin(), maMenuItems.end(), AddRemoveEventListener(xListener, false)); @@ -185,7 +185,7 @@ void ScAccessibleFilterMenu::removeAccessibleEventListener( // XAccessibleSelection void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) throw IndexOutOfBoundsException(); @@ -194,7 +194,7 @@ void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex) } sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) throw IndexOutOfBoundsException(); @@ -202,24 +202,24 @@ sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex return mpWindow->isMenuItemSelected(static_cast<size_t>(nChildIndex)); } -void ScAccessibleFilterMenu::clearAccessibleSelection() throw (RuntimeException) +void ScAccessibleFilterMenu::clearAccessibleSelection() throw (RuntimeException, std::exception) { mpWindow->clearSelectedMenuItem(); } -void ScAccessibleFilterMenu::selectAllAccessibleChildren() throw (RuntimeException) +void ScAccessibleFilterMenu::selectAllAccessibleChildren() throw (RuntimeException, std::exception) { // not suported - this is a menu, you can't select all menu items. } -sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() throw (RuntimeException) +sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() throw (RuntimeException, std::exception) { // Since this is a menu, either one menu item is selected, or none at all. return mpWindow->getSelectedMenuItem() == ScMenuFloatingWindow::MENU_NOT_SELECTED ? 0 : 1; } Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) throw IndexOutOfBoundsException(); @@ -227,7 +227,7 @@ Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_In return maMenuItems[nChildIndex]; } -void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException) +void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if (static_cast<size_t>(nChildIndex) >= maMenuItems.size()) throw IndexOutOfBoundsException(); @@ -238,7 +238,7 @@ void ScAccessibleFilterMenu::deselectAccessibleChild(sal_Int32 nChildIndex) thro // XInterface uno::Any SAL_CALL ScAccessibleFilterMenu::queryInterface( uno::Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Any any = ScAccessibleContextBase::queryInterface(rType); if (any.hasValue()) @@ -260,14 +260,14 @@ void SAL_CALL ScAccessibleFilterMenu::release() throw () // XTypeProvider Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Sequence<sal_Int8> aId(16); return aId; } Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED) return Rectangle(); @@ -290,7 +290,7 @@ Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleFilterMenu::GetBoundingBox() const - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED) return Rectangle(); diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index 2104515fccb3..be6e36117580 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -57,58 +57,58 @@ ScAccessibleFilterMenuItem::~ScAccessibleFilterMenuItem() } sal_Int32 ScAccessibleFilterMenuItem::getAccessibleChildCount() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 0; } Reference<XAccessible> ScAccessibleFilterMenuItem::getAccessibleChild(sal_Int32 /*nIndex*/) - throw (RuntimeException, IndexOutOfBoundsException) + throw (RuntimeException, IndexOutOfBoundsException, std::exception) { throw IndexOutOfBoundsException(); } Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet() - throw (RuntimeException) + throw (RuntimeException, std::exception) { updateStateSet(); return mxStateSet; } OUString ScAccessibleFilterMenuItem::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString("ScAccessibleFilterMenuItem"); } // XAccessibleAction -sal_Int32 ScAccessibleFilterMenuItem::getAccessibleActionCount() throw (RuntimeException) +sal_Int32 ScAccessibleFilterMenuItem::getAccessibleActionCount() throw (RuntimeException, std::exception) { return 1; } sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { mpWindow->executeMenuItem(mnMenuPos); return true; } OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return OUString("click"); } Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding( - sal_Int32 /*nIndex*/) throw (IndexOutOfBoundsException, RuntimeException) + sal_Int32 /*nIndex*/) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return Reference<XAccessibleKeyBinding>(); } Any SAL_CALL ScAccessibleFilterMenuItem::queryInterface( uno::Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Any any = ScAccessibleContextBase::queryInterface(rType); if (any.hasValue()) @@ -143,7 +143,7 @@ void ScAccessibleFilterMenuItem::setEnabled(bool bEnabled) } Rectangle ScAccessibleFilterMenuItem::GetBoundingBoxOnScreen() const - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (!mpWindow->IsVisible()) return Rectangle(); @@ -157,7 +157,7 @@ Rectangle ScAccessibleFilterMenuItem::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleFilterMenuItem::GetBoundingBox() const - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (!mpWindow->IsVisible()) return Rectangle(); diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index fda7ef5b5208..69208b601dad 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -43,14 +43,14 @@ ScAccessibleFilterTopWindow::~ScAccessibleFilterTopWindow() // XAccessibleContext -sal_Int32 ScAccessibleFilterTopWindow::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 ScAccessibleFilterTopWindow::getAccessibleChildCount() throw (RuntimeException, std::exception) { sal_Int32 nMenuCount = getMenuItemCount(); return nMenuCount + 6; } Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild( - sal_Int32 nIndex) throw (RuntimeException, IndexOutOfBoundsException) + sal_Int32 nIndex) throw (RuntimeException, IndexOutOfBoundsException, std::exception) { if (nIndex >= getAccessibleChildCount()) throw IndexOutOfBoundsException(); @@ -81,7 +81,7 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild( return Reference<XAccessible>(); } -OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException) +OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException, std::exception) { return OUString("ScAccessibleFilterTopWindow"); } diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx index 0c1e622c45bc..69c91d22f285 100644 --- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx +++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx @@ -35,19 +35,19 @@ ScAccessibleStateSet::~ScAccessibleStateSet() // XAccessibleStateSet -sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() throw (RuntimeException) +sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() throw (RuntimeException, std::exception) { return maStates.empty(); } sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return maStates.count(nState) != 0; } sal_Bool SAL_CALL ScAccessibleStateSet::containsAll( - const Sequence<sal_Int16>& aStateSet) throw (RuntimeException) + const Sequence<sal_Int16>& aStateSet) throw (RuntimeException, std::exception) { sal_Int32 n = aStateSet.getLength(); for (sal_Int32 i = 0; i < n; ++i) @@ -61,7 +61,7 @@ sal_Bool SAL_CALL ScAccessibleStateSet::containsAll( } Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Sequence<sal_Int16> aSeq(0); set<sal_Int16>::const_iterator itr = maStates.begin(), itrEnd = maStates.end(); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index d49469d98430..a8f88fbdea21 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -177,7 +177,7 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; @@ -205,7 +205,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPo return xRet; } -void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException) +void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -219,7 +219,7 @@ void SAL_CALL ScAccessiblePageHeader::grabFocus() throw (uno::RuntimeException) //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -253,7 +253,7 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno: } uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChild( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -284,13 +284,13 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChil return xRet; } -sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { return mnIndex; } uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccessibleStateSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -316,13 +316,13 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePageHeader::getAccess //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePageHeader::getImplementationName() throw(uno::RuntimeException, std::exception) { return OUString("ScAccessiblePageHeader"); } uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -343,13 +343,13 @@ OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) } OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString sName(SC_RESSTR(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME)); return sName.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN)); } -Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) +Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) { Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) @@ -365,7 +365,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::Run return aCellRect; } -Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeException) +Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 0b2d10bd36b2..66bc786ad466 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -111,7 +111,7 @@ void ScAccessiblePageHeaderArea::Notify( SfxBroadcaster& rBC, const SfxHint& rHi uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(rPoint)) @@ -132,7 +132,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessible sal_Int32 SAL_CALL ScAccessiblePageHeaderArea::getAccessibleChildCount(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -144,7 +144,7 @@ sal_Int32 SAL_CALL uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessibleChild(sal_Int32 nIndex) throw (uno::RuntimeException, - lang::IndexOutOfBoundsException) + lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -155,7 +155,7 @@ uno::Reference< XAccessible > SAL_CALL uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePageHeaderArea::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -183,14 +183,14 @@ uno::Reference<XAccessibleStateSet> SAL_CALL OUString SAL_CALL ScAccessiblePageHeaderArea::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessiblePageHeaderArea"); } uno::Sequence< OUString> SAL_CALL ScAccessiblePageHeaderArea::getSupportedServiceNames(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -210,7 +210,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePageHeaderArea::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessiblePageHeaderAreaImplementationId::get().getSeq(); } @@ -239,7 +239,7 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) } OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString sName; switch (meAdjust) @@ -261,7 +261,7 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) } Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(void) const - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { Rectangle aRect; if (mxParent.is()) @@ -278,7 +278,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(void) const } Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { Rectangle aRect; if (mxParent.is()) diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 75ea2ac05529..9e456b6845f4 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -97,7 +97,7 @@ void ScAccessiblePreviewCell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(rPoint)) @@ -114,7 +114,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleAtP return xRet; } -void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException) +void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -128,7 +128,7 @@ void SAL_CALL ScAccessiblePreviewCell::grabFocus() throw (uno::RuntimeException) //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno::RuntimeException) +sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -138,7 +138,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() throw(uno: } uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -148,7 +148,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChi } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessibleStateSet() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -180,13 +180,13 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewCell::getAccessi //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewCell::getImplementationName() throw(uno::RuntimeException, std::exception) { return OUString("ScAccessiblePreviewCell"); } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -206,7 +206,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewCell::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessiblePreviewCellImplementationId::get().getSeq(); } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 6ec1a625d46a..90cdb99bd2c5 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -138,7 +138,7 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint& //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessiblePreviewHeaderCellImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); @@ -158,7 +158,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::release() //===== XAccessibleValue ================================================ -uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::RuntimeException) +uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -175,13 +175,13 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::R } sal_Bool SAL_CALL ScAccessiblePreviewHeaderCell::setCurrentValue( const uno::Any& /* aNumber */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // it is not possible to set a value return false; } -uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::RuntimeException) +uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -196,7 +196,7 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMaximumValue() throw (uno::R return aAny; } -uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() throw (uno::RuntimeException) +uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() throw (uno::RuntimeException, std::exception) { double fValue(0.0); uno::Any aAny; @@ -207,7 +207,7 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getMinimumValue() throw (uno::R //===== XAccessibleComponent ============================================ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleAtPoint( const awt::Point& rPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference<XAccessible> xRet; if (containsPoint(rPoint)) @@ -224,7 +224,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi return xRet; } -void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeException) +void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -238,7 +238,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() throw (uno::RuntimeExce //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() throw(uno::RuntimeException) +sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -248,7 +248,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() thro } uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChild(sal_Int32 nIndex) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -257,13 +257,13 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi return mpTextHelper->GetChild(nIndex); } -sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { return mnIndex; } uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleStateSet() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -291,13 +291,13 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessiblePreviewHeaderCell::getA //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationName() throw(uno::RuntimeException, std::exception) { return OUString("ScAccessiblePreviewHeaderCell"); } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -311,7 +311,7 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewHeaderCell::getSupportedServ //===== XTypeProvider ======================================================= uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewHeaderCell::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessiblePreviewHeaderCellImpl::getTypes(), ScAccessibleContextBase::getTypes()); } @@ -323,7 +323,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewHeaderCell::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessiblePreviewHeaderCellImplementationId::get().getSeq(); } @@ -390,7 +390,7 @@ OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleDescription() t return sDescription; } -OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(uno::RuntimeException, std::exception) { OUString sName = OUString(ScResId(STR_ACC_HEADERCELL_NAME)); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index e64807c14e71..9a9e677d5929 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -113,7 +113,7 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessiblePreviewTable::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aAny (ScAccessiblePreviewTableImpl::queryInterface(rType)); return aAny.hasValue() ? aAny : ScAccessibleContextBase::queryInterface(rType); @@ -251,25 +251,25 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnExtentAt( sal_In return nColumns; } -uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleRowHeaders() throw (uno::RuntimeException) +uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleRowHeaders() throw (uno::RuntimeException, std::exception) { //! missing return NULL; } -uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnHeaders() throw (uno::RuntimeException) +uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnHeaders() throw (uno::RuntimeException, std::exception) { //! missing return NULL; } -uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleRows() throw (uno::RuntimeException) +uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleRows() throw (uno::RuntimeException, std::exception) { // in the page preview, there is no selection return uno::Sequence<sal_Int32>(0); } -uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleColumns() throw (uno::RuntimeException) +uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleColumns() throw (uno::RuntimeException, std::exception) { // in the page preview, there is no selection return uno::Sequence<sal_Int32>(0); @@ -340,13 +340,13 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCe return xRet; } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCaption() throw (uno::RuntimeException) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCaption() throw (uno::RuntimeException, std::exception) { //! missing return NULL; } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleSummary() throw (uno::RuntimeException) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleSummary() throw (uno::RuntimeException, std::exception) { //! missing return NULL; @@ -480,7 +480,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleAt return xRet; } -void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException) +void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -536,13 +536,13 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCh return xRet; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() throw (uno::RuntimeException) +sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { return mnIndex; } uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAccessibleStateSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -569,13 +569,13 @@ uno::Reference< XAccessibleStateSet > SAL_CALL ScAccessiblePreviewTable::getAcce //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ScAccessiblePreviewTable::getImplementationName() throw(uno::RuntimeException, std::exception) { return OUString("ScAccessiblePreviewTable"); } uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -589,7 +589,7 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewTable::getSupportedServiceNa //===== XTypeProvider =================================================== uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewTable::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessiblePreviewTableImpl::getTypes(), ScAccessibleContextBase::getTypes()); } @@ -600,7 +600,7 @@ namespace } uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return theScAccessiblePreviewTableImplementationId::get().getSeq(); } @@ -634,7 +634,7 @@ OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleName() return sName; } -Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::RuntimeException) +Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) { Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index 9c1a09335029..1a4589cc1596 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -774,7 +774,7 @@ bool ScAccessibleSpreadsheet::IsSameMarkCell() //===== XAccessibleTable ================================================ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleRowHeaders( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -793,7 +793,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessib } uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessibleColumnHeaders( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -812,7 +812,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleSpreadsheet::getAccessib } uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleRows( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -843,7 +843,7 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessib } uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleColumns( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -874,7 +874,7 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessib } sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nRow ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -896,7 +896,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nR } sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -943,7 +943,7 @@ rtl::Reference<ScAccessibleCell> ScAccessibleSpreadsheet::GetAccessibleCellAt(sa } uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -960,7 +960,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleCel } sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw (uno::RuntimeException, lang::IndexOutOfBoundsException) + throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1011,7 +1011,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleSpreadsheet::getAccessibleAtP } void SAL_CALL ScAccessibleSpreadsheet::grabFocus( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (getAccessibleParent().is()) { @@ -1022,13 +1022,13 @@ void SAL_CALL ScAccessibleSpreadsheet::grabFocus( ) } sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getForeground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return COL_BLACK; } sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1038,7 +1038,7 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) //===== XAccessibleContext ============================================== uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet(void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { utl::AccessibleRelationSetHelper* pRelationSet = NULL; if(mpAccDoc) @@ -1050,7 +1050,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAcce uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<XAccessibleStateSet> xParentStates; @@ -1105,7 +1105,7 @@ void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int32 nChildIn void SAL_CALL ScAccessibleSpreadsheet::clearAccessibleSelection( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1138,7 +1138,7 @@ void SAL_CALL ScAccessibleSpreadsheet::selectAllAccessibleChildren( ) sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleChildCount( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1167,7 +1167,7 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible > SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1307,14 +1307,14 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleSpreadsheet"); } uno::Sequence< OUString> SAL_CALL ScAccessibleSpreadsheet::getSupportedServiceNames (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); sal_Int32 nOldSize(aSequence.getLength()); @@ -1334,7 +1334,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessibleSpreadsheet::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessibleSpreadsheetImplementationId::get().getSeq(); } @@ -1342,7 +1342,7 @@ uno::Sequence<sal_Int8> SAL_CALL ///===== XAccessibleEventBroadcaster ===================================== void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1353,7 +1353,7 @@ void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Ref //==== internal ========================================================= Rectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) @@ -1366,7 +1366,7 @@ Rectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const } Rectangle ScAccessibleSpreadsheet::GetBoundingBox() const - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Rectangle aRect; if (mpViewShell) diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index b22b35ecb176..9edf44b4ed62 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -63,7 +63,7 @@ void SAL_CALL ScAccessibleTableBase::disposing() //===== XInterface ===================================================== uno::Any SAL_CALL ScAccessibleTableBase::queryInterface( uno::Type const & rType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if ( rType == ::getCppuType((uno::Reference<XAccessibleTableSelection> *)0) ) { @@ -199,7 +199,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32 } uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessibleRowHeaders( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< XAccessibleTable > xAccessibleTable; OSL_FAIL("Here should be a implementation to fill the row headers"); @@ -209,7 +209,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible } uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessibleColumnHeaders( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< XAccessibleTable > xAccessibleTable; OSL_FAIL("Here should be a implementation to fill the column headers"); @@ -219,7 +219,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible } uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleRows( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); uno::Sequence< sal_Int32 > aSequence; @@ -227,7 +227,7 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessible } uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleColumns( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); uno::Sequence< sal_Int32 > aSequence; @@ -257,7 +257,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCellA } uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCaption( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); uno::Reference< XAccessible > xAccessible; @@ -265,7 +265,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCapti } uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleSummary( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); uno::Reference< XAccessible > xAccessible; @@ -384,7 +384,7 @@ OUString SAL_CALL ScAccessibleTableBase::createAccessibleName() uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleTableBase::getAccessibleRelationSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); return uno::Reference<XAccessibleRelationSet>(); @@ -392,7 +392,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleTableBase::getAccessibleStateSet(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); uno::Reference< XAccessibleStateSet > xAccessibleStateSet; @@ -418,7 +418,7 @@ sal_Bool SAL_CALL void SAL_CALL ScAccessibleTableBase::clearAccessibleSelection( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -429,7 +429,7 @@ void SAL_CALL ScAccessibleTableBase::selectAllAccessibleChildren() sal_Int32 SAL_CALL ScAccessibleTableBase::getSelectedAccessibleChildCount( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nResult(0); return nResult; @@ -437,7 +437,7 @@ sal_Int32 SAL_CALL uno::Reference<XAccessible > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleChild( sal_Int32 /* nSelectedChildIndex */ ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { uno::Reference < XAccessible > xAccessible; return xAccessible; @@ -451,7 +451,7 @@ void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int32 /* nSele //===== XServiceInfo ==================================================== OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleTableBase"); } @@ -459,7 +459,7 @@ OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) //===== XTypeProvider =================================================== uno::Sequence< uno::Type > SAL_CALL ScAccessibleTableBase::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return comphelper::concatSequences(ScAccessibleTableBaseImpl::getTypes(), ScAccessibleContextBase::getTypes()); } @@ -471,7 +471,7 @@ namespace uno::Sequence<sal_Int8> SAL_CALL ScAccessibleTableBase::getImplementationId(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theScAccessibleTableBaseImplementationId::get().getSeq(); } diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx index 0d7bcf50f821..56c028b17ba2 100644 --- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx +++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx @@ -40,13 +40,13 @@ ScDrawModelBroadcaster::~ScDrawModelBroadcaster() } void SAL_CALL ScDrawModelBroadcaster::addEventListener( const uno::Reference< document::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { maEventListeners.addInterface( xListener ); } void SAL_CALL ScDrawModelBroadcaster::removeEventListener( const uno::Reference< document::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { maEventListeners.removeInterface( xListener ); } |