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 /svx/source/accessibility | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'svx/source/accessibility')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 30 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleFrameSelector.cxx | 50 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleGraphicShape.cxx | 16 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleOLEShape.cxx | 18 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 108 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx | 4 | ||||
-rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.cxx | 6 | ||||
-rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.hxx | 6 | ||||
-rw-r--r-- | svx/source/accessibility/GraphCtlAccessibleContext.cxx | 68 | ||||
-rw-r--r-- | svx/source/accessibility/charmapacc.cxx | 106 | ||||
-rw-r--r-- | svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 114 | ||||
-rw-r--r-- | svx/source/accessibility/svxrectctaccessiblecontext.cxx | 134 |
12 files changed, 330 insertions, 330 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 5cfd48f0cebe..31a40ec6fafd 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -284,12 +284,12 @@ void AccessibleControlShape::Init() } } -Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext(void) throw (RuntimeException) +Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext(void) throw (RuntimeException, std::exception) { return AccessibleShape::getAccessibleContext (); } -void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) +void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException, std::exception) { if ( !m_xUnoControl.is() || !isAliveMode( m_xUnoControl ) ) { @@ -305,7 +305,7 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException) } } -OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException) +OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" ); } @@ -372,7 +372,7 @@ OUString IMPLEMENT_FORWARD_REFCOUNT( AccessibleControlShape, AccessibleShape ) IMPLEMENT_GET_IMPLEMENTATION_ID( AccessibleControlShape ) -void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) +void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -398,7 +398,7 @@ void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& #endif } -Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw (RuntimeException) +Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = AccessibleShape::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -410,7 +410,7 @@ Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw return aReturn; } -Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeException) +Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeException, std::exception) { Sequence< Type > aShapeTypes = AccessibleShape::getTypes(); Sequence< Type > aOwnTypes = AccessibleControlShape_Base::getTypes(); @@ -439,7 +439,7 @@ Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeExcep return aAllTypes; } -void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException) +void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException, std::exception) { if ( AccessibleEventId::STATE_CHANGED == _rEvent.EventId ) { @@ -474,7 +474,7 @@ void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& } } -void SAL_CALL AccessibleControlShape::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException) +void SAL_CALL AccessibleControlShape::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) { // did it come from our inner context (the real one, not it's proxy!)? OSL_TRACE ("AccessibleControlShape::modeChanged"); @@ -494,7 +494,7 @@ void SAL_CALL AccessibleControlShape::modeChanged( const ModeChangeEvent& _rSour #endif } -void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) throw (RuntimeException) +void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) throw (RuntimeException, std::exception) { AccessibleShape::disposing( _rSource ); } @@ -529,7 +529,7 @@ bool AccessibleControlShape::ensureListeningState( return _bNeedNewListening; } -sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(RuntimeException) +sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception) { if ( !m_xUnoControl.is() ) return 0; @@ -546,7 +546,7 @@ sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(Runt } } -Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XAccessible > xChild; if ( !m_xUnoControl.is() ) @@ -589,7 +589,7 @@ Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sa return xChild; } -Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; ensureControlModelAccess(); @@ -851,7 +851,7 @@ void AccessibleControlShape::initializeComposedState() } } -void SAL_CALL AccessibleControlShape::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleControlShape::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XContainer > xContainer( _rEvent.Source, UNO_QUERY ); Reference< XControl > xControl( _rEvent.Element, UNO_QUERY ); @@ -884,12 +884,12 @@ void SAL_CALL AccessibleControlShape::elementInserted( const ::com::sun::star::c } } -void SAL_CALL AccessibleControlShape::elementRemoved( const ::com::sun::star::container::ContainerEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleControlShape::elementRemoved( const ::com::sun::star::container::ContainerEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // not interested in } -void SAL_CALL AccessibleControlShape::elementReplaced( const ::com::sun::star::container::ContainerEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleControlShape::elementReplaced( const ::com::sun::star::container::ContainerEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // not interested in } diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 53ab184c03ab..b2dba0231ec8 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -109,14 +109,14 @@ void AccFrameSelector::RemoveFrameSelEventListener() Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return this; } -sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -126,7 +126,7 @@ sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException) Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -141,7 +141,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -156,7 +156,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -180,7 +180,7 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) -sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException, std::exception) { return meBorder == FRAMEBORDER_NONE ? AccessibleRole::OPTION_PANE : AccessibleRole::CHECK_BOX; } @@ -188,7 +188,7 @@ sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException) OUString AccFrameSelector::getAccessibleDescription( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -198,7 +198,7 @@ OUString AccFrameSelector::getAccessibleDescription( ) OUString AccFrameSelector::getAccessibleName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -208,7 +208,7 @@ OUString AccFrameSelector::getAccessibleName( ) Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -242,7 +242,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -288,7 +288,7 @@ Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) Locale AccFrameSelector::getLocale( ) - throw (IllegalAccessibleComponentStateException, RuntimeException) + throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { return Application::GetSettings().GetUILanguageTag().getLocale(); } @@ -313,7 +313,7 @@ void AccFrameSelector::removePropertyChangeListener( const Reference< XPropertyC sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -325,7 +325,7 @@ sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt ) Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( const AwtPoint& aPt ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -333,7 +333,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( return mpFrameSel->GetChildAccessible( Point( aPt.X, aPt.Y ) ); } -AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException) +AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -360,7 +360,7 @@ AwtRectangle AccFrameSelector::getBounds( ) throw (RuntimeException) -AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException) +AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -380,7 +380,7 @@ AwtPoint AccFrameSelector::getLocation( ) throw (RuntimeException) -AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException) +AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -401,7 +401,7 @@ AwtPoint AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException) -AwtSize AccFrameSelector::getSize( ) throw (RuntimeException) +AwtSize AccFrameSelector::getSize( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -462,7 +462,7 @@ void AccFrameSelector::removeFocusListener( const Reference< XFocusListener >& x -void AccFrameSelector::grabFocus( ) throw (RuntimeException) +void AccFrameSelector::grabFocus( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -508,7 +508,7 @@ Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException) sal_Int32 AccFrameSelector::getForeground( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -518,7 +518,7 @@ sal_Int32 AccFrameSelector::getForeground( ) sal_Int32 AccFrameSelector::getBackground( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -527,7 +527,7 @@ sal_Int32 AccFrameSelector::getBackground( ) -void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) +void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -543,7 +543,7 @@ void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleE -void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) +void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -560,19 +560,19 @@ void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessib } } -OUString AccFrameSelector::getImplementationName( ) throw (RuntimeException) +OUString AccFrameSelector::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString("AccFrameSelector"); } sal_Bool AccFrameSelector::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > AccFrameSelector::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index fc7cab68b39d..1407e2f50578 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -51,7 +51,7 @@ AccessibleGraphicShape::~AccessibleGraphicShape (void) //===== XAccessibleImage ==================================================== OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_pShape) return m_pShape->GetTitle(); @@ -62,7 +62,7 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Height; } @@ -71,7 +71,7 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight (void) sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Width; } @@ -83,7 +83,7 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth (void) com::sun::star::uno::Any SAL_CALL AccessibleGraphicShape::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 = AccessibleShape::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -117,7 +117,7 @@ void SAL_CALL OUString SAL_CALL AccessibleGraphicShape::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleGraphicShape"); } @@ -127,7 +127,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleGraphicShape::getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Get list of supported service names from base class... @@ -150,7 +150,7 @@ OUString SAL_CALL uno::Sequence<uno::Type> SAL_CALL AccessibleGraphicShape::getTypes (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... uno::Sequence<uno::Type> aTypeList (AccessibleShape::getTypes()); @@ -205,7 +205,7 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription (void) // Return this object's role. sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL ) return AccessibleRole::IMAGE_MAP; diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 14ed8946a27a..8fa575c4802c 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -50,7 +50,7 @@ AccessibleOLEShape::~AccessibleOLEShape (void) //===== XAccessibleAction =================================================== sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return 0; } @@ -59,7 +59,7 @@ sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount (void) sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } @@ -69,7 +69,7 @@ sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } @@ -79,7 +79,7 @@ OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActionKeyBinding (sal_Int32 /*nIndex*/) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } @@ -91,7 +91,7 @@ Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActio com::sun::star::uno::Any SAL_CALL AccessibleOLEShape::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 = AccessibleShape::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -125,7 +125,7 @@ void SAL_CALL OUString SAL_CALL AccessibleOLEShape::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleOLEShape"); } @@ -135,7 +135,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL AccessibleOLEShape::getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // Get list of supported service names from base class... @@ -158,7 +158,7 @@ OUString SAL_CALL uno::Sequence<uno::Type> SAL_CALL AccessibleOLEShape::getTypes (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... uno::Sequence<uno::Type> aTypeList (AccessibleShape::getTypes()); @@ -174,7 +174,7 @@ uno::Sequence<uno::Type> SAL_CALL //===== XAccessibleExtendedAttributes ======================================================== uno::Any SAL_CALL AccessibleOLEShape::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) { uno::Any strRet; ::rtl::OUString style; diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 2b9d971f8e96..1c96c06261ba 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -338,7 +338,7 @@ sal_Bool AccessibleShape::GetState (sal_Int16 aState) // OverWrite the parent's getAccessibleName method OUString SAL_CALL AccessibleShape::getAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (m_pShape && !m_pShape->GetTitle().isEmpty()) @@ -348,7 +348,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleName (void) } OUString SAL_CALL AccessibleShape::getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if( m_pShape && !m_pShape->GetDescription().isEmpty()) @@ -364,7 +364,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription (void) */ sal_Int32 SAL_CALL AccessibleShape::getAccessibleChildCount () - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nChildCount = 0; @@ -387,7 +387,7 @@ sal_Int32 SAL_CALL */ uno::Reference<XAccessible> SAL_CALL AccessibleShape::getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -418,7 +418,7 @@ uno::Reference<XAccessible> SAL_CALL uno::Reference<XAccessibleRelationSet> SAL_CALL AccessibleShape::getAccessibleRelationSet (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper; @@ -442,7 +442,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL */ uno::Reference<XAccessibleStateSet> SAL_CALL AccessibleShape::getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); Reference<XAccessibleStateSet> xStateSet; @@ -547,7 +547,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL uno::Reference<XAccessible > SAL_CALL AccessibleShape::getAccessibleAtPoint ( const awt::Point& aPoint) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -580,7 +580,7 @@ uno::Reference<XAccessible > SAL_CALL awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -695,7 +695,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) awt::Point SAL_CALL AccessibleShape::getLocation (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -706,7 +706,7 @@ awt::Point SAL_CALL AccessibleShape::getLocation (void) awt::Point SAL_CALL AccessibleShape::getLocationOnScreen (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -731,7 +731,7 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen (void) awt::Size SAL_CALL AccessibleShape::getSize (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -742,7 +742,7 @@ awt::Size SAL_CALL AccessibleShape::getSize (void) sal_Int32 SAL_CALL AccessibleShape::getForeground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -768,7 +768,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void) sal_Int32 SAL_CALL AccessibleShape::getBackground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0L); @@ -811,7 +811,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void) void SAL_CALL AccessibleShape::addAccessibleEventListener ( const Reference<XAccessibleEventListener >& rxListener) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -832,7 +832,7 @@ void SAL_CALL AccessibleShape::addAccessibleEventListener ( void SAL_CALL AccessibleShape::removeAccessibleEventListener ( const Reference<XAccessibleEventListener >& rxListener) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { AccessibleContextBase::removeAccessibleEventListener (rxListener); if (mpText != NULL) @@ -846,7 +846,7 @@ void SAL_CALL AccessibleShape::removeAccessibleEventListener ( com::sun::star::uno::Any SAL_CALL AccessibleShape::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 = AccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -889,14 +889,14 @@ void SAL_CALL void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int32 ) -throw ( IndexOutOfBoundsException, RuntimeException ) +throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { } sal_Bool SAL_CALL AccessibleShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, - RuntimeException ) + RuntimeException, std::exception ) { uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex ); uno::Reference<XAccessibleContext> xContext; @@ -938,19 +938,19 @@ throw ( IndexOutOfBoundsException, void SAL_CALL AccessibleShape::clearAccessibleSelection( ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { } void SAL_CALL AccessibleShape::selectAllAccessibleChildren( ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { } sal_Int32 SAL_CALL AccessibleShape::getSelectedAccessibleChildCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { sal_Int32 nCount = 0; sal_Int32 TotalCount = getAccessibleChildCount(); @@ -962,7 +962,7 @@ throw ( RuntimeException ) Reference<XAccessible> SAL_CALL AccessibleShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) -throw ( IndexOutOfBoundsException, RuntimeException) +throw ( IndexOutOfBoundsException, RuntimeException, std::exception) { if ( nSelectedChildIndex > getSelectedAccessibleChildCount() ) throw IndexOutOfBoundsException(); @@ -980,14 +980,14 @@ throw ( IndexOutOfBoundsException, RuntimeException) void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 ) throw ( IndexOutOfBoundsException, - RuntimeException ) + RuntimeException, std::exception ) { } //===== XAccessibleExtendedAttributes ======================================================== uno::Any SAL_CALL AccessibleShape::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) { uno::Any strRet; OUString style; @@ -1005,7 +1005,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() OUString SAL_CALL AccessibleShape::getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleShape"); } @@ -1015,7 +1015,7 @@ OUString SAL_CALL uno::Sequence<OUString> SAL_CALL AccessibleShape::getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Get list of supported service names from base class... @@ -1039,7 +1039,7 @@ uno::Sequence<OUString> SAL_CALL uno::Sequence<uno::Type> SAL_CALL AccessibleShape::getTypes (void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Get list of types from the context base implementation, ... @@ -1082,7 +1082,7 @@ uno::Sequence<uno::Type> SAL_CALL */ void SAL_CALL AccessibleShape::disposing (const lang::EventObject& aEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -1110,7 +1110,7 @@ void SAL_CALL void SAL_CALL AccessibleShape::notifyEvent (const document::EventObject& rEventObject) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { static const OUString sShapeModified ("ShapeModified"); @@ -1171,7 +1171,7 @@ AccessibleShape* sal_Int64 SAL_CALL AccessibleShape::getSomething( const uno::Sequence< sal_Int8 >& rIdentifier ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Int64 nReturn( 0 ); @@ -1376,7 +1376,7 @@ void AccessibleShape::disposing (void) sal_Int32 SAL_CALL AccessibleShape::getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Use a simple but slow solution for now. Optimize later. @@ -1424,7 +1424,7 @@ void AccessibleShape::UpdateNameAndDescription (void) // Return this object's role. sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nAccessibleRole = AccessibleRole::SHAPE ; switch (ShapeTypeHandler::Instance().GetTypeId (mxShape)) @@ -1477,7 +1477,7 @@ struct XShapePosCompareHelper //===== XAccessibleGroupPosition ========================================= uno::Sequence< sal_Int32 > SAL_CALL AccessibleShape::getGroupPosition( const uno::Any& ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { // we will return the: // [0] group level @@ -1571,7 +1571,7 @@ throw (uno::RuntimeException) } OUString AccessibleShape::getObjectLink( const uno::Any& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString aRet; @@ -1593,7 +1593,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& ) //===== XAccesibleHypertext ================================================== sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { // MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile. // Code need to be adapted.... @@ -1609,7 +1609,7 @@ sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount() } uno::Reference< XAccessibleHyperlink > SAL_CALL AccessibleShape::getHyperLink( sal_Int32 ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference< XAccessibleHyperlink > xRet; // MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile. @@ -1624,48 +1624,48 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL return xRet; } sal_Int32 SAL_CALL AccessibleShape::getHyperLinkIndex( sal_Int32 ) -throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nRet = 0; return nRet; } //===== XAccesibleText ================================================== -sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException){return 0;} -sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException){return 0;} -sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException){return 0;} -::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} +sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} +sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} +::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { uno::Sequence< ::com::sun::star::beans::PropertyValue > aValues(0); return aValues; } -::com::sun::star::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { return com::sun::star::awt::Rectangle(0, 0, 0, 0 ); } -sal_Int32 SAL_CALL AccessibleShape::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException){return 0;} -sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const ::com::sun::star::awt::Point& ) throw (::com::sun::star::uno::RuntimeException){return 0;} -OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException){return OUString();} -sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException){return 0;} -sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException){return 0;} -sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException){return sal_True;} -OUString SAL_CALL AccessibleShape::getText( ) throw (::com::sun::star::uno::RuntimeException){return OUString();} -OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException){return OUString();} -::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL AccessibleShape::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} +sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const ::com::sun::star::awt::Point& ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} +OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();} +sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} +sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} +sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;} +OUString SAL_CALL AccessibleShape::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();} +OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return OUString();} +::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::accessibility::TextSegment aResult; return aResult; } -::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::accessibility::TextSegment aResult; return aResult; } -::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::accessibility::TextSegment aResult; return aResult; } -sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException){return sal_True;} +sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;} } // end of namespace accessibility diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx index d900820c0ae7..1ac4aee7e039 100644 --- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx +++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx @@ -82,14 +82,14 @@ void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi // XServiceInfo -OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "VCLXAccessibleSvxFindReplaceDialog" ); } -Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = OUString( "VCLXAccessibleSvxFindReplaceDialog" ); diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index d53d6e08cc84..b1642a08eb0d 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -662,7 +662,7 @@ void ChildrenManagerImpl::SetInfo (const AccessibleShapeTreeInfo& rShapeTreeInfo void SAL_CALL ChildrenManagerImpl::disposing (const lang::EventObject& rEventObject) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if (rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster() || rEventObject.Source == maShapeTreeInfo.GetController()) @@ -698,7 +698,7 @@ void SAL_CALL void SAL_CALL ChildrenManagerImpl::notifyEvent ( const document::EventObject& rEventObject) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { static const OUString sShapeInserted ("ShapeInserted"); static const OUString sShapeRemoved ("ShapeRemoved"); @@ -718,7 +718,7 @@ void SAL_CALL void SAL_CALL ChildrenManagerImpl::selectionChanged (const lang::EventObject& /*rEvent*/) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { UpdateSelection (); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 865a7d5ffe02..e3ed8d5ddc05 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -246,21 +246,21 @@ public: virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== document::XEventListener ======================================== virtual void SAL_CALL notifyEvent (const ::com::sun::star::document::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== view::XSelectionChangeListener ================================== virtual void SAL_CALL selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== IAccessibleViewForwarderListener ================================ diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 7314cf18b002..c5951c5335a6 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -180,14 +180,14 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessible( //===== XAccessible ========================================================= -Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException ) +Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) { return this; } //===== XAccessibleComponent ================================================ -sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { // no guard -> done in getSize() awt::Size aSize (getSize()); @@ -199,7 +199,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -230,7 +230,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt -awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( RuntimeException ) +awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() Rectangle aCoreBounds( GetBoundingBox() ); @@ -244,7 +244,7 @@ awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( Runtim -awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeException ) +awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() Rectangle aRect( GetBoundingBox() ); @@ -253,7 +253,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeE -awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( RuntimeException ) +awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBoxOnScreen() Rectangle aRect( GetBoundingBoxOnScreen() ); @@ -262,7 +262,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( -awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeException ) +awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() Rectangle aRect( GetBoundingBox() ); @@ -272,7 +272,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -326,7 +326,7 @@ void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEve Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) - throw( RuntimeException, lang::IndexOutOfBoundsException ) + throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { ::SolarMutexGuard aGuard; @@ -335,14 +335,14 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; // Use a simple but slow solution for now. Optimize later. @@ -374,14 +374,14 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( vo -sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException ) +sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return msDescription; @@ -389,7 +389,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return msName; @@ -400,14 +400,14 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException ) +Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) { return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException ) +Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -432,7 +432,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce -lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException ) +lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -450,7 +450,7 @@ lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( Il //===== XAccessibleEventListener ============================================ void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -464,7 +464,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const R void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -515,7 +515,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Referenc -void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException ) +void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -538,7 +538,7 @@ Any SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleKeyBinding() throw( Run sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { svtools::ColorConfig aColorConfig; sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; @@ -549,7 +549,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); @@ -557,17 +557,17 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) //===== XServiceInfo ======================================================== -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" ); } -sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException ) +Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) { Sequence< OUString > aSNs( 3 ); @@ -579,7 +579,7 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService } //===== XTypeProvider ======================================================= -Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException ) +Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return getUniqueId(); @@ -587,14 +587,14 @@ Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( //===== XServiceName ======================================================== -OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeException ) +OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleContext" ); } //===== XAccessibleSelection ============================================= -void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) +void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -609,7 +609,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI -sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) +sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -621,7 +621,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_ -void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException ) +void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -633,7 +633,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R -void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException ) +void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -645,7 +645,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -659,7 +659,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) - throw( lang::IndexOutOfBoundsException, RuntimeException ) + throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -677,7 +677,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce -void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) +void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 18c68d275868..edccdedde759 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -74,7 +74,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent( m_pTable->fireEvent(_nEventId,_rOldValue,_rNewValue); } -sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -82,7 +82,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount( ) throw ( } uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -115,7 +115,7 @@ uno::Any SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleKeyBinding() } void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -124,7 +124,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus() -Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -143,7 +143,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( return m_xAcc; } -Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -176,29 +176,29 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( return aBounds; } -sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) throw (RuntimeException, std::exception) { return css::accessibility::AccessibleRole::SCROLL_PANE; } -OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) throw (RuntimeException) +OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION); } -OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) throw (RuntimeException) +OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC); } -Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleStateSet( ) throw (RuntimeException) +Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -356,7 +356,7 @@ void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bS } sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -366,7 +366,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -388,7 +388,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -398,7 +398,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return css::accessibility::AccessibleRole::TABLE; } @@ -406,7 +406,7 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION ); @@ -415,7 +415,7 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -425,7 +425,7 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetAcc::getAccessibleRelationSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< css::accessibility::XAccessibleRelationSet >(); } @@ -433,7 +433,7 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetAcc::getAccessibleStateSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -463,7 +463,7 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -484,7 +484,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge void SAL_CALL SvxShowCharSetAcc::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -499,47 +499,47 @@ uno::Any SAL_CALL SvxShowCharSetAcc::getAccessibleKeyBinding() return uno::Any(); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount( ) throw (RuntimeException, std::exception) { return ((getAccessibleChildCount()-1) / COLUMN_COUNT) + 1; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount( ) throw (RuntimeException, std::exception) { return COLUMN_COUNT; } -OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return OUString(); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return 1; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return 1; } -Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleRowHeaders( ) throw (RuntimeException) +Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleRowHeaders( ) throw (RuntimeException, std::exception) { return Reference< XAccessibleTable >(); } -Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleColumnHeaders( ) throw (RuntimeException) +Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleColumnHeaders( ) throw (RuntimeException, std::exception) { return Reference< XAccessibleTable >(); } -Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) throw (RuntimeException) +Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -548,7 +548,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) return aSel; } -Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( ) throw (RuntimeException) +Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -557,21 +557,21 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( return aSel; } -sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow; } -sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn; } -Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -582,36 +582,36 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In return pItem->GetAccessible(); } -Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCaption( ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCaption( ) throw (RuntimeException, std::exception) { return Reference< XAccessible >(); } -Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleSummary( ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleSummary( ) throw (RuntimeException, std::exception) { return Reference< XAccessible >(); } -sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetSelectIndexId() == getAccessibleIndex(nRow,nColumn); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return (nRow*COLUMN_COUNT) + nColumn; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -656,7 +656,7 @@ void SvxShowCharSetItemAcc::ParentDestroyed() sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return 0; } @@ -664,7 +664,7 @@ sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int32 /*i*/ ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } @@ -672,7 +672,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -682,7 +682,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return css::accessibility::AccessibleRole::TABLE_CELL; } @@ -690,7 +690,7 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -718,7 +718,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -738,7 +738,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleRelationSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< css::accessibility::XAccessibleRelationSet >(); } @@ -746,7 +746,7 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleStateSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -782,7 +782,7 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe void SAL_CALL SvxShowCharSetItemAcc::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing to do } @@ -817,12 +817,12 @@ awt::Rectangle SAL_CALL SvxShowCharSetItemAcc::implGetBounds( ) throw (RuntimeE } uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleAtPoint( const awt::Point& /*aPoint*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< css::accessibility::XAccessible >(); } -sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground( ) throw (RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -845,7 +845,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground( ) throw (RuntimeExc return nColor; } -sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground( ) throw (RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; @@ -860,7 +860,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground( ) throw (RuntimeExc return nColor; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground( ) throw (RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -870,7 +870,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground( ) throw (RuntimeException) return nColor; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 2893521fbea2..190fef55c8bf 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -72,12 +72,12 @@ SvxPixelCtlAccessible::~SvxPixelCtlAccessible() -----------------------------------------------------------------------*/ uno::Reference< XAccessibleContext > SvxPixelCtlAccessible::getAccessibleContext( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return this; } -sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount( ) throw (uno::RuntimeException) +sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetSquares(); @@ -86,7 +86,7 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount( ) throw (uno::Runtime -----------------------------------------------------------------------*/ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( i < 0 || i >= getAccessibleChildCount()) @@ -98,14 +98,14 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetParent()->GetAccessible( true ); } sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); sal_uInt16 nIdx = 0; @@ -119,13 +119,13 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent( ) /*-- 04.02.2002 14:11:57--------------------------------------------------- -----------------------------------------------------------------------*/ -sal_Int16 SvxPixelCtlAccessible::getAccessibleRole( ) throw (uno::RuntimeException) +sal_Int16 SvxPixelCtlAccessible::getAccessibleRole( ) throw (uno::RuntimeException, std::exception) { return AccessibleRole::LIST; } OUString SvxPixelCtlAccessible::getAccessibleDescription( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -133,7 +133,7 @@ OUString SvxPixelCtlAccessible::getAccessibleDescription( ) } OUString SvxPixelCtlAccessible::getAccessibleName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -141,7 +141,7 @@ OUString SvxPixelCtlAccessible::getAccessibleName( ) } uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRelationSet( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper; @@ -166,7 +166,7 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel uno::Reference< XAccessibleStateSet > SvxPixelCtlAccessible::getAccessibleStateSet( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -198,7 +198,7 @@ uno::Reference< XAccessibleStateSet > SvxPixelCtlAccessible::getAccessibleStateS com::sun::star::lang::Locale SvxPixelCtlAccessible::getLocale( ) - throw (IllegalAccessibleComponentStateException, uno::RuntimeException) + throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if( getAccessibleParent().is() ) @@ -215,7 +215,7 @@ com::sun::star::lang::Locale SvxPixelCtlAccessible::getLocale( ) sal_Bool SvxPixelCtlAccessible::containsPoint( const awt::Point& aPt ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); Point aPoint(aPt.X, aPt.Y); @@ -226,7 +226,7 @@ sal_Bool SvxPixelCtlAccessible::containsPoint( const awt::Point& aPt ) } uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoint ( const awt::Point& aPoint) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); ensureIsAlive(); @@ -241,7 +241,7 @@ uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoin return CreateChild(nIndex, mrPixelCtl.IndexToPoint(nIndex)); } -awt::Rectangle SvxPixelCtlAccessible::getBounds( ) throw (uno::RuntimeException) +awt::Rectangle SvxPixelCtlAccessible::getBounds( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); awt::Rectangle aRet; @@ -254,7 +254,7 @@ awt::Rectangle SvxPixelCtlAccessible::getBounds( ) throw (uno::RuntimeException return aRet; } -awt::Point SvxPixelCtlAccessible::getLocation( ) throw (uno::RuntimeException) +awt::Point SvxPixelCtlAccessible::getLocation( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); Point aPos; @@ -263,52 +263,52 @@ awt::Point SvxPixelCtlAccessible::getLocation( ) throw (uno::RuntimeException) return aRet; } -awt::Point SvxPixelCtlAccessible::getLocationOnScreen( ) throw (uno::RuntimeException) +awt::Point SvxPixelCtlAccessible::getLocationOnScreen( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); Rectangle rect = mrPixelCtl.GetWindowExtentsRelative(NULL); return awt::Point(rect.Left(),rect.Top() ); } -awt::Size SvxPixelCtlAccessible::getSize( ) throw (uno::RuntimeException) +awt::Size SvxPixelCtlAccessible::getSize( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); Size aSz = mrPixelCtl.GetSizePixel(); return awt::Size(aSz.Width(),aSz.Height()); } -void SvxPixelCtlAccessible::grabFocus( ) throw (uno::RuntimeException) +void SvxPixelCtlAccessible::grabFocus( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); mrPixelCtl.GrabFocus(); } sal_Int32 SvxPixelCtlAccessible::getForeground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetControlForeground().GetColor(); } sal_Int32 SvxPixelCtlAccessible::getBackground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetControlBackground().GetColor(); } -OUString SvxPixelCtlAccessible::getImplementationName( ) throw (uno::RuntimeException) +OUString SvxPixelCtlAccessible::getImplementationName( ) throw (uno::RuntimeException, std::exception) { return OUString("SvxPixelCtlAccessible"); } sal_Bool SvxPixelCtlAccessible::supportsService( const OUString& rServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -321,7 +321,7 @@ uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames( ) // XAccessibleSelection -void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException) +void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -332,27 +332,27 @@ void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildInde NotifyChild(nIndex,sal_True,sal_False); } -sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetFoucsPosIndex() == nChildIndex; } -void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection( ) throw (RuntimeException) +void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { } -void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren( ) throw (RuntimeException) +void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { } -sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { return 1; } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -367,7 +367,7 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessi return xChild; } -void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException) +void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { } @@ -380,7 +380,7 @@ void SvxPixelCtlAccessible::ensureIsAlive() const } //XAccessibleEventBroadcaster -void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -392,7 +392,7 @@ void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Refe } void SAL_CALL SvxPixelCtlAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -599,26 +599,26 @@ SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild() //===== XAccessible ========================================================= -uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext( void ) throw( RuntimeException ) +uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext( void ) throw( RuntimeException, std::exception ) { return this; } //===== XAccessibleComponent ================================================ -sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::containsPoint( const awt::Point& rPoint ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { // no guard -> done in getBounds() // return GetBoundingBox().IsInside( VCLPoint( rPoint ) ); return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleAtPoint( const awt::Point& ) throw( RuntimeException ) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleAtPoint( const awt::Point& ) throw( RuntimeException, std::exception ) { return uno::Reference< XAccessible >(); } -awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeException ) +awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeException, std::exception ) { // no guard -> done in getBoundingBox() //Modified by lq, 09/26 @@ -630,30 +630,30 @@ awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeEx // End } -awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocation() throw( RuntimeException ) +awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocation() throw( RuntimeException, std::exception ) { // no guard -> done in getBoundingBox() return AWTPoint( GetBoundingBox().TopLeft() ); } -awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocationOnScreen() throw( RuntimeException ) +awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocationOnScreen() throw( RuntimeException, std::exception ) { // no guard -> done in getBoundingBoxOnScreen() return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } -awt::Size SAL_CALL SvxPixelCtlAccessibleChild::getSize() throw( RuntimeException ) +awt::Size SAL_CALL SvxPixelCtlAccessibleChild::getSize() throw( RuntimeException, std::exception ) { // no guard -> done in getBoundingBox() return AWTSize( GetBoundingBox().GetSize() ); } -void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException ) +void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException, std::exception ) { } sal_Int32 SvxPixelCtlAccessibleChild::getForeground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { //::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -661,7 +661,7 @@ sal_Int32 SvxPixelCtlAccessibleChild::getForeground( ) return mrParentWindow.GetControlForeground().GetColor(); } sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { //::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -672,40 +672,40 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount( void ) throw( RuntimeException ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { return 0; } uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChild( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent( void ) throw( RuntimeException ) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent( void ) throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent( void ) throw( RuntimeException ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole( void ) throw( RuntimeException ) +sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole( void ) throw( RuntimeException, std::exception ) { return AccessibleRole::CHECK_BOX; } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription( void ) throw( RuntimeException ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); @@ -714,12 +714,12 @@ OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( R /** Return empty uno::Reference to indicate that the relation set is not supported. */ -uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet( void ) throw( RuntimeException ) +uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) { return uno::Reference< XAccessibleRelationSet >(); } -uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet( void ) throw( RuntimeException ) +uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -750,7 +750,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAc return pStateSetHelper; } -lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException ) +lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -766,7 +766,7 @@ lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale( void ) throw( Illeg } void SAL_CALL SvxPixelCtlAccessibleChild::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -781,7 +781,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::addAccessibleEventListener( const uno: void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -802,17 +802,17 @@ void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const u //===== XServiceInfo ======================================================== -OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName( void ) throw( RuntimeException, std::exception ) { return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxPixelCtlAccessibleChild" ) ); } -sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& rServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService( this, rServiceName ); } -Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames( void ) throw( RuntimeException ) +Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 4a716e26f8fb..62ebf702e329 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -189,21 +189,21 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext() //===== XAccessible ========================================================= -Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException ) +Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) { return this; } //===== XAccessibleComponent ================================================ -sal_Bool SAL_CALL SvxRectCtlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { // no guard -> done in getBounds() // return GetBoundingBox().IsInside( VCLPoint( rPoint ) ); return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } -Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException ) +Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -219,25 +219,25 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPo return xRet; } -awt::Rectangle SAL_CALL SvxRectCtlAccessibleContext::getBounds() throw( RuntimeException ) +awt::Rectangle SAL_CALL SvxRectCtlAccessibleContext::getBounds() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() return AWTRectangle( GetBoundingBox() ); } -awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocation() throw( RuntimeException ) +awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocation() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() return AWTPoint( GetBoundingBox().TopLeft() ); } -awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocationOnScreen() throw( RuntimeException ) +awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBoxOnScreen() return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } -awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize() throw( RuntimeException ) +awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() return AWTSize( GetBoundingBox().GetSize() ); @@ -264,7 +264,7 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isFocusTraversable() throw( Runti //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -274,7 +274,7 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void ) } Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) - throw( RuntimeException, lang::IndexOutOfBoundsException ) + throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { checkChildIndex( nIndex ); @@ -311,12 +311,12 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil return xChild; } -Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException ) +Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); // Use a simple but slow solution for now. Optimize later. @@ -342,18 +342,18 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void return -1; } -sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException ) +sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription + " Please use arrow key to selection."; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -362,7 +362,7 @@ OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException ) +Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) { //return Reference< XAccessibleRelationSet >(); utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; @@ -396,7 +396,7 @@ void SvxRectCtlAccessibleContext::FireAccessibleEvent (short nEventId, const ::c CommitChange( AccessibleEventObject( xSource, nEventId, rNew,rOld ) ); } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -421,7 +421,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException ) +lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -436,7 +436,7 @@ lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( Ille } void SAL_CALL SvxRectCtlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -448,7 +448,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::addAccessibleEventListener( const Ref } void SAL_CALL SvxRectCtlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -497,7 +497,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::removeFocusListener( const Reference< } } -void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException ) +void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -514,7 +514,7 @@ Any SAL_CALL SvxRectCtlAccessibleContext::getAccessibleKeyBinding() throw( Runti } sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -523,7 +523,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) return mpRepr->GetControlForeground().GetColor(); } sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -533,17 +533,17 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) } //===== XServiceInfo ======================================================== -OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); } -sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException ) +Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) { const OUString sServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &sServiceName, 1 ); @@ -551,14 +551,14 @@ Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNa //===== XTypeProvider ======================================================= -Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void ) throw( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) { return getUniqueId(); } //===== XAccessibleSelection ============================================= -void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) +void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aSolarGuard; @@ -577,7 +577,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nInd mpRepr->SetActualRP( pData->ePoint ); } -sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -586,19 +586,19 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_In return nIndex == mnSelectedChild; } -void SAL_CALL SvxRectCtlAccessibleContext::clearAccessibleSelection() throw( RuntimeException ) +void SAL_CALL SvxRectCtlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception ) { DBG_ASSERT( false, "SvxRectCtlAccessibleContext::clearAccessibleSelection() is not possible!" ); } -void SAL_CALL SvxRectCtlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException ) +void SAL_CALL SvxRectCtlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception ) { // guard in selectAccessibleChild()! selectAccessibleChild( 0 ); // default per definition } -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -606,7 +606,7 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount( } Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) - throw( lang::IndexOutOfBoundsException, RuntimeException ) + throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -615,7 +615,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccess return getAccessibleChild( mnSelectedChild ); } -void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*nIndex*/ ) throw( lang::IndexOutOfBoundsException, RuntimeException ) +void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*nIndex*/ ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { OUString aMessage( "deselectAccessibleChild is not possible in this context" ); @@ -833,43 +833,43 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext() //===== XAccessible ========================================================= -Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext( void ) throw( RuntimeException ) +Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) { return this; } //===== XAccessibleComponent ================================================ -sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { // no guard -> done in getBounds() return Rectangle( Point( 0, 0 ), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleAtPoint( const awt::Point& /*rPoint*/ ) throw( RuntimeException ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleAtPoint( const awt::Point& /*rPoint*/ ) throw( RuntimeException, std::exception ) { return Reference< XAccessible >(); } -awt::Rectangle SAL_CALL SvxRectCtlChildAccessibleContext::getBounds() throw( RuntimeException ) +awt::Rectangle SAL_CALL SvxRectCtlChildAccessibleContext::getBounds() throw( RuntimeException, std::exception ) { // no guard -> done in getBoundingBox() return AWTRectangle( GetBoundingBox() ); } -awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocation() throw( RuntimeException ) +awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocation() throw( RuntimeException, std::exception ) { // no guard -> done in getBoundingBox() return AWTPoint( GetBoundingBox().TopLeft() ); } -awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocationOnScreen() throw( RuntimeException ) +awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception ) { // no guard -> done in getBoundingBoxOnScreen() return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } -awt::Size SAL_CALL SvxRectCtlChildAccessibleContext::getSize() throw( RuntimeException ) +awt::Size SAL_CALL SvxRectCtlChildAccessibleContext::getSize() throw( RuntimeException, std::exception ) { // no guard -> done in getBoundingBox() return AWTSize( GetBoundingBox().GetSize() ); @@ -906,7 +906,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::removeFocusListener( const Refer OSL_FAIL( "SvxRectCtlChildAccessibleContext::removeFocusListener: not implemented" ); } -void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeException ) +void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) { } @@ -916,7 +916,7 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleKeyBinding() throw( return Any(); } sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( maMutex ); @@ -924,7 +924,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) return mrParentWindow.GetControlForeground().GetColor(); } sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( maMutex ); @@ -935,38 +935,38 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) { return 0; } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChild( sal_Int32 /*nIndex*/ ) throw ( RuntimeException, lang::IndexOutOfBoundsException ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChild( sal_Int32 /*nIndex*/ ) throw ( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { throw lang::IndexOutOfBoundsException(); } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent( void ) throw( RuntimeException ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole( void ) throw( RuntimeException ) +sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) { return AccessibleRole::RADIO_BUTTON; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); return msDescription; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); return msName; @@ -975,7 +975,7 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) th /** Return empty reference to indicate that the relation set is not supported. */ -Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException ) +Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; @@ -990,7 +990,7 @@ Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::get return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -1016,7 +1016,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getA return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException ) +lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); if( mxParent.is() ) @@ -1032,7 +1032,7 @@ lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw( } void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -1047,7 +1047,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( cons void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -1068,7 +1068,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( c //===== XAccessibleValue ================================================ -Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeException ) +Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeException, std::exception ) { ThrowExceptionIfNotAlive(); @@ -1077,19 +1077,19 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeE return aRet; } -sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::setCurrentValue( const Any& /*aNumber*/ ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::setCurrentValue( const Any& /*aNumber*/ ) throw( RuntimeException, std::exception ) { return sal_False; } -Any SAL_CALL SvxRectCtlChildAccessibleContext::getMaximumValue() throw( RuntimeException ) +Any SAL_CALL SvxRectCtlChildAccessibleContext::getMaximumValue() throw( RuntimeException, std::exception ) { Any aRet; aRet <<= 1.0; return aRet; } -Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeException ) +Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeException, std::exception ) { Any aRet; aRet <<= 0.0; @@ -1100,7 +1100,7 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeE // XAccessibleAction -sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (RuntimeException) +sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1109,7 +1109,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (R -sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1125,7 +1125,7 @@ sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex -OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1137,7 +1137,7 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_ -Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1148,24 +1148,24 @@ Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessib } //===== XServiceInfo ======================================================== -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void ) throw( RuntimeException ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ); } -sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException ) +Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) { const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext"); return Sequence< OUString >( &sServiceName, 1 ); } //===== XTypeProvider ======================================================= -Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId( void ) throw( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) { static OImplementationId* pId = 0; if( !pId ) |