diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
| commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
| tree | bcce66b27261553c308779f3e8663a269ed3a671 /svx/source | |
| parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) | |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source')
148 files changed, 2489 insertions, 3205 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index faa18daad23b..dd17bbdf44b5 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -273,7 +273,7 @@ void AccessibleControlShape::Init() } } -void SAL_CALL AccessibleControlShape::grabFocus() throw (RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::grabFocus() { if ( !m_xUnoControl.is() || !isAliveMode( m_xUnoControl ) ) { @@ -289,12 +289,12 @@ void SAL_CALL AccessibleControlShape::grabFocus() throw (RuntimeException, std: } } -OUString SAL_CALL AccessibleControlShape::getImplementationName() throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleControlShape::getImplementationName() { return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" ); } -OUString AccessibleControlShape::CreateAccessibleBaseName() throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleBaseName() { OUString sName; @@ -316,7 +316,6 @@ OUString AccessibleControlShape::CreateAccessibleBaseName() throw (RuntimeExcept OUString AccessibleControlShape::CreateAccessibleDescription() - throw (RuntimeException, std::exception) { DescriptionGenerator aDG (mxShape); ShapeTypeId nShapeType = ShapeTypeHandler::Instance().GetTypeId (mxShape); @@ -353,7 +352,7 @@ OUString IMPLEMENT_FORWARD_REFCOUNT( AccessibleControlShape, AccessibleShape ) IMPLEMENT_GET_IMPLEMENTATION_ID( AccessibleControlShape ) -void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& _rEvent ) { ::osl::MutexGuard aGuard( maMutex ); @@ -379,7 +378,7 @@ void SAL_CALL AccessibleControlShape::propertyChange( const PropertyChangeEvent& #endif } -Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) { Any aReturn = AccessibleShape::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -391,7 +390,7 @@ Any SAL_CALL AccessibleControlShape::queryInterface( const Type& _rType ) throw return aReturn; } -Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() { Sequence< Type > aShapeTypes = AccessibleShape::getTypes(); Sequence< Type > aOwnTypes = AccessibleControlShape_Base::getTypes(); @@ -420,7 +419,7 @@ Sequence< Type > SAL_CALL AccessibleControlShape::getTypes() throw (RuntimeExcep return aAllTypes; } -void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& _rEvent ) { if ( AccessibleEventId::STATE_CHANGED == _rEvent.EventId ) { @@ -455,7 +454,7 @@ void SAL_CALL AccessibleControlShape::notifyEvent( const AccessibleEventObject& } } -void SAL_CALL AccessibleControlShape::modeChanged(const ModeChangeEvent& rSource) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::modeChanged(const ModeChangeEvent& rSource) { // did it come from our inner context (the real one, not it's proxy!)? SAL_INFO("sw.uno", "AccessibleControlShape::modeChanged"); @@ -475,7 +474,7 @@ void SAL_CALL AccessibleControlShape::modeChanged(const ModeChangeEvent& rSource SAL_WARN_IF(!bReplaced, "sw.uno", "AccessibleControlShape::modeChanged: replacing ourselves away did fail"); } -void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::disposing (const EventObject& _rSource) { AccessibleShape::disposing( _rSource ); } @@ -510,7 +509,7 @@ bool AccessibleControlShape::ensureListeningState( return _bNeedNewListening; } -sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) { if ( !m_xUnoControl.is() ) return 0; @@ -527,7 +526,7 @@ sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) throw(Runt } } -Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i ) { Reference< XAccessible > xChild; if ( !m_xUnoControl.is() ) @@ -570,7 +569,7 @@ Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sa return xChild; } -Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessibleRelationSet( ) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; ensureControlModelAccess(); @@ -593,7 +592,7 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessib return xSet; } -OUString AccessibleControlShape::CreateAccessibleName() throw (RuntimeException, std::exception) +OUString AccessibleControlShape::CreateAccessibleName() { ensureControlModelAccess(); @@ -831,7 +830,7 @@ void AccessibleControlShape::initializeComposedState() } } -void SAL_CALL AccessibleControlShape::elementInserted( const css::container::ContainerEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::elementInserted( const css::container::ContainerEvent& _rEvent ) { Reference< XContainer > xContainer( _rEvent.Source, UNO_QUERY ); Reference< XControl > xControl( _rEvent.Element, UNO_QUERY ); @@ -864,12 +863,12 @@ void SAL_CALL AccessibleControlShape::elementInserted( const css::container::Con } } -void SAL_CALL AccessibleControlShape::elementRemoved( const css::container::ContainerEvent& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::elementRemoved( const css::container::ContainerEvent& ) { // not interested in } -void SAL_CALL AccessibleControlShape::elementReplaced( const css::container::ContainerEvent& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::elementReplaced( const css::container::ContainerEvent& ) { // not interested in } diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 20808a9a7bce..02c3aedb571e 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -86,13 +86,12 @@ void AccFrameSelector::RemoveFrameSelEventListener() Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) - throw (RuntimeException, std::exception) { return this; } -sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 AccFrameSelector::getAccessibleChildCount( ) { SolarMutexGuard aGuard; IsValid(); @@ -100,7 +99,6 @@ sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException, } Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -113,7 +111,6 @@ Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) } Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -126,7 +123,6 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent( ) } sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -148,13 +144,12 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) return nIdx; } -sal_Int16 AccFrameSelector::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 AccFrameSelector::getAccessibleRole( ) { return meBorder == FrameBorderType::NONE ? AccessibleRole::OPTION_PANE : AccessibleRole::CHECK_BOX; } OUString AccFrameSelector::getAccessibleDescription( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -162,7 +157,6 @@ OUString AccFrameSelector::getAccessibleDescription( ) } OUString AccFrameSelector::getAccessibleName( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -170,7 +164,6 @@ OUString AccFrameSelector::getAccessibleName( ) } Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -202,7 +195,6 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( } Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -246,13 +238,11 @@ Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet( ) } Locale AccFrameSelector::getLocale( ) - throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { return Application::GetSettings().GetUILanguageTag().getLocale(); } sal_Bool AccFrameSelector::containsPoint( const css::awt::Point& aPt ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -262,7 +252,6 @@ sal_Bool AccFrameSelector::containsPoint( const css::awt::Point& aPt ) Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( const css::awt::Point& aPt ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -270,7 +259,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint( return mpFrameSel->GetChildAccessible( Point( aPt.X, aPt.Y ) ); } -css::awt::Rectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std::exception) +css::awt::Rectangle AccFrameSelector::getBounds( ) { SolarMutexGuard aGuard; IsValid(); @@ -296,7 +285,7 @@ css::awt::Rectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std } -css::awt::Point AccFrameSelector::getLocation( ) throw (RuntimeException, std::exception) +css::awt::Point AccFrameSelector::getLocation( ) { SolarMutexGuard aGuard; IsValid(); @@ -315,7 +304,7 @@ css::awt::Point AccFrameSelector::getLocation( ) throw (RuntimeException, std:: } -css::awt::Point AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException, std::exception) +css::awt::Point AccFrameSelector::getLocationOnScreen( ) { SolarMutexGuard aGuard; IsValid(); @@ -335,7 +324,7 @@ css::awt::Point AccFrameSelector::getLocationOnScreen( ) throw (RuntimeExceptio } -css::awt::Size AccFrameSelector::getSize( ) throw (RuntimeException, std::exception) +css::awt::Size AccFrameSelector::getSize( ) { SolarMutexGuard aGuard; IsValid(); @@ -353,7 +342,7 @@ css::awt::Size AccFrameSelector::getSize( ) throw (RuntimeException, std::excep return aRet; } -void AccFrameSelector::grabFocus( ) throw (RuntimeException, std::exception) +void AccFrameSelector::grabFocus( ) { SolarMutexGuard aGuard; IsValid(); @@ -361,7 +350,6 @@ void AccFrameSelector::grabFocus( ) throw (RuntimeException, std::exception) } sal_Int32 AccFrameSelector::getForeground( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); @@ -369,14 +357,13 @@ sal_Int32 AccFrameSelector::getForeground( ) } sal_Int32 AccFrameSelector::getBackground( ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; IsValid(); return mpFrameSel->GetControlBackground().GetColor(); } -void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) +void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) { SolarMutexGuard aGuard; @@ -390,7 +377,7 @@ void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleE } } -void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) +void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) { SolarMutexGuard aGuard; @@ -407,19 +394,17 @@ void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessib } } -OUString AccFrameSelector::getImplementationName( ) throw (RuntimeException, std::exception) +OUString AccFrameSelector::getImplementationName( ) { return OUString("AccFrameSelector"); } sal_Bool AccFrameSelector::supportsService( const OUString& rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > AccFrameSelector::getSupportedServiceNames( ) - throw (RuntimeException, std::exception) { Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); @@ -429,7 +414,7 @@ Sequence< OUString > AccFrameSelector::getSupportedServiceNames( ) return aRet; } -void AccFrameSelector::IsValid() throw (RuntimeException) +void AccFrameSelector::IsValid() { if(!mpFrameSel) throw RuntimeException(); diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 49cdd0e21ddd..0d65b418349e 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -45,7 +45,6 @@ AccessibleGraphicShape::~AccessibleGraphicShape() // XAccessibleImage OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription() - throw (css::uno::RuntimeException, std::exception) { if (m_pShape) return m_pShape->GetTitle(); @@ -54,14 +53,12 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription() sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight() - throw (css::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Height; } sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth() - throw (css::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Width; } @@ -69,7 +66,6 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth() // XInterface css::uno::Any SAL_CALL AccessibleGraphicShape::queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any aReturn = AccessibleShape::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -97,7 +93,6 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL AccessibleGraphicShape::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleGraphicShape"); } @@ -105,7 +100,6 @@ OUString SAL_CALL css::uno::Sequence< OUString> SAL_CALL AccessibleGraphicShape::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Get list of supported service names from base class... @@ -123,7 +117,6 @@ css::uno::Sequence< OUString> SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleGraphicShape::getTypes() - throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... uno::Sequence<uno::Type> aTypeList (AccessibleShape::getTypes()); @@ -141,7 +134,6 @@ uno::Sequence<uno::Type> SAL_CALL /// Create the base name of this object, i.e. the name without appended number. OUString AccessibleGraphicShape::CreateAccessibleBaseName() - throw (css::uno::RuntimeException) { OUString sName; @@ -163,7 +155,6 @@ OUString } OUString AccessibleGraphicShape::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { //Don't use the same information for accessible name and accessible description. OUString sDesc; @@ -176,7 +167,6 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription() // Return this object's role. sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) { if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != nullptr ) return AccessibleRole::IMAGE_MAP; diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index e41fa8f1af61..8376fac02cbc 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -45,30 +45,24 @@ AccessibleOLEShape::~AccessibleOLEShape() // XAccessibleAction sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount() - throw (css::uno::RuntimeException, std::exception) { return 0; } sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActionKeyBinding (sal_Int32 /*nIndex*/) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } @@ -76,7 +70,6 @@ Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActio // XInterface css::uno::Any SAL_CALL AccessibleOLEShape::queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any aReturn = AccessibleShape::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -104,7 +97,6 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL AccessibleOLEShape::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleOLEShape"); } @@ -112,7 +104,6 @@ OUString SAL_CALL css::uno::Sequence< OUString> SAL_CALL AccessibleOLEShape::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // Get list of supported service names from base class... @@ -130,7 +121,6 @@ css::uno::Sequence< OUString> SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleOLEShape::getTypes() - throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... uno::Sequence<uno::Type> aTypeList (AccessibleShape::getTypes()); @@ -146,7 +136,6 @@ uno::Sequence<uno::Type> SAL_CALL // XAccessibleExtendedAttributes uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { uno::Any strRet; ::rtl::OUString style; @@ -162,7 +151,6 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() /// Set this object's name if is different to the current name. OUString AccessibleOLEShape::CreateAccessibleBaseName() - throw (css::uno::RuntimeException) { OUString sName; @@ -194,7 +182,6 @@ OUString OUString AccessibleOLEShape::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { return CreateAccessibleName (); } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 8df4e044dff2..455423730c7f 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -299,7 +299,6 @@ bool AccessibleShape::GetState (sal_Int16 aState) // OverWrite the parent's getAccessibleName method OUString SAL_CALL AccessibleShape::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if (m_pShape && !m_pShape->GetTitle().isEmpty()) @@ -309,7 +308,6 @@ OUString SAL_CALL AccessibleShape::getAccessibleName() } OUString SAL_CALL AccessibleShape::getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); if( m_pShape && !m_pShape->GetDescription().isEmpty()) @@ -324,7 +322,6 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription() */ sal_Int32 SAL_CALL AccessibleShape::getAccessibleChildCount () - throw (css::uno::RuntimeException, std::exception) { if (IsDisposed()) { @@ -349,7 +346,6 @@ sal_Int32 SAL_CALL */ uno::Reference<XAccessible> SAL_CALL AccessibleShape::getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -379,7 +375,6 @@ uno::Reference<XAccessible> SAL_CALL uno::Reference<XAccessibleRelationSet> SAL_CALL AccessibleShape::getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); if (mpParent == nullptr) @@ -405,7 +400,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL */ uno::Reference<XAccessibleStateSet> SAL_CALL AccessibleShape::getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); Reference<XAccessibleStateSet> xStateSet; @@ -482,7 +476,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL uno::Reference<XAccessible > SAL_CALL AccessibleShape::getAccessibleAtPoint ( const awt::Point& aPoint) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -513,7 +506,6 @@ uno::Reference<XAccessible > SAL_CALL awt::Rectangle SAL_CALL AccessibleShape::getBounds() - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -626,7 +618,6 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds() awt::Point SAL_CALL AccessibleShape::getLocation() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -635,7 +626,6 @@ awt::Point SAL_CALL AccessibleShape::getLocation() awt::Point SAL_CALL AccessibleShape::getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -658,7 +648,6 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen() awt::Size SAL_CALL AccessibleShape::getSize() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -667,7 +656,6 @@ awt::Size SAL_CALL AccessibleShape::getSize() sal_Int32 SAL_CALL AccessibleShape::getForeground() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -691,7 +679,6 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground() sal_Int32 SAL_CALL AccessibleShape::getBackground() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0L); @@ -730,7 +717,6 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground() // XAccessibleEventBroadcaster void SAL_CALL AccessibleShape::addAccessibleEventListener ( const Reference<XAccessibleEventListener >& rxListener) - throw (uno::RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -749,7 +735,6 @@ void SAL_CALL AccessibleShape::addAccessibleEventListener ( void SAL_CALL AccessibleShape::removeAccessibleEventListener ( const Reference<XAccessibleEventListener >& rxListener) - throw (uno::RuntimeException, std::exception) { AccessibleContextBase::removeAccessibleEventListener (rxListener); if (mpText != nullptr) @@ -759,7 +744,6 @@ void SAL_CALL AccessibleShape::removeAccessibleEventListener ( // XInterface css::uno::Any SAL_CALL AccessibleShape::queryInterface (const css::uno::Type & rType) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any aReturn = AccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) @@ -795,14 +779,11 @@ void SAL_CALL // XAccessibleSelection void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int32 ) -throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { } sal_Bool SAL_CALL AccessibleShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) -throw ( IndexOutOfBoundsException, - RuntimeException, std::exception ) { uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex ); uno::Reference<XAccessibleContext> xContext; @@ -844,19 +825,16 @@ throw ( IndexOutOfBoundsException, void SAL_CALL AccessibleShape::clearAccessibleSelection( ) -throw ( RuntimeException, std::exception ) { } void SAL_CALL AccessibleShape::selectAllAccessibleChildren( ) -throw ( RuntimeException, std::exception ) { } sal_Int32 SAL_CALL AccessibleShape::getSelectedAccessibleChildCount() -throw ( RuntimeException, std::exception ) { sal_Int32 nCount = 0; sal_Int32 TotalCount = getAccessibleChildCount(); @@ -868,7 +846,6 @@ throw ( RuntimeException, std::exception ) Reference<XAccessible> SAL_CALL AccessibleShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) -throw ( IndexOutOfBoundsException, RuntimeException, std::exception) { if ( nSelectedChildIndex > getSelectedAccessibleChildCount() ) throw IndexOutOfBoundsException(); @@ -885,15 +862,12 @@ throw ( IndexOutOfBoundsException, RuntimeException, std::exception) void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 ) - throw ( IndexOutOfBoundsException, - RuntimeException, std::exception ) { } // XAccessibleExtendedAttributes uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { uno::Any strRet; OUString style; @@ -910,7 +884,6 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() // XServiceInfo OUString SAL_CALL AccessibleShape::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleShape"); } @@ -918,7 +891,6 @@ OUString SAL_CALL uno::Sequence<OUString> SAL_CALL AccessibleShape::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Get list of supported service names from base class... @@ -936,7 +908,6 @@ uno::Sequence<OUString> SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL AccessibleShape::getTypes() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Get list of types from the context base implementation, ... @@ -975,7 +946,6 @@ uno::Sequence<uno::Type> SAL_CALL */ void SAL_CALL AccessibleShape::disposing (const lang::EventObject& aEvent) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -999,7 +969,6 @@ void SAL_CALL // document::XEventListener void SAL_CALL AccessibleShape::notifyEvent (const document::EventObject& rEventObject) - throw (uno::RuntimeException, std::exception) { // First check if the event is for us. uno::Reference<drawing::XShape> xShape ( @@ -1057,7 +1026,6 @@ AccessibleShape* sal_Int64 SAL_CALL AccessibleShape::getSomething( const uno::Sequence< sal_Int8 >& rIdentifier ) - throw(uno::RuntimeException, std::exception) { sal_Int64 nReturn( 0 ); @@ -1088,20 +1056,17 @@ void AccessibleShape::ViewForwarderChanged() // protected internal // Set this object's name if is different to the current name. OUString AccessibleShape::CreateAccessibleBaseName() - throw (css::uno::RuntimeException, std::exception) { return ShapeTypeHandler::CreateAccessibleBaseName( mxShape ); } OUString AccessibleShape::CreateAccessibleName() - throw (css::uno::RuntimeException, std::exception) { return GetFullAccessibleName(this); } OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape) - throw (css::uno::RuntimeException, std::exception) { OUString sName (shape->CreateAccessibleBaseName()); // Append the shape's index to the name to disambiguate between shapes @@ -1138,7 +1103,6 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape) OUString AccessibleShape::CreateAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { DescriptionGenerator aDG (mxShape); aDG.Initialize (CreateAccessibleBaseName()); @@ -1248,7 +1212,6 @@ void AccessibleShape::disposing() sal_Int32 SAL_CALL AccessibleShape::getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Use a simple but slow solution for now. Optimize later. @@ -1294,7 +1257,6 @@ void AccessibleShape::UpdateNameAndDescription() // Return this object's role. sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) { sal_Int16 nAccessibleRole = AccessibleRole::SHAPE ; switch (ShapeTypeHandler::Instance().GetTypeId (mxShape)) @@ -1332,7 +1294,6 @@ struct XShapePosCompareHelper // XAccessibleGroupPosition uno::Sequence< sal_Int32 > SAL_CALL AccessibleShape::getGroupPosition( const uno::Any& ) -throw (uno::RuntimeException, std::exception) { // we will return the: // [0] group level @@ -1425,7 +1386,6 @@ throw (uno::RuntimeException, std::exception) } OUString AccessibleShape::getObjectLink( const uno::Any& ) - throw (uno::RuntimeException, std::exception) { OUString aRet; @@ -1447,7 +1407,6 @@ OUString AccessibleShape::getObjectLink( const uno::Any& ) // XAccesibleHypertext sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount() - throw (css::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.... @@ -1463,7 +1422,6 @@ sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount() } uno::Reference< XAccessibleHyperlink > SAL_CALL AccessibleShape::getHyperLink( sal_Int32 ) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { uno::Reference< XAccessibleHyperlink > xRet; // MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile. @@ -1478,48 +1436,47 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL return xRet; } sal_Int32 SAL_CALL AccessibleShape::getHyperLinkIndex( sal_Int32 ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { sal_Int32 nRet = 0; return nRet; } // XAccesibleText -sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return false;} -sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;} -css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ){return 0;} +sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ){return false;} +sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ){return 0;} +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const css::uno::Sequence< OUString >& ) { uno::Sequence< css::beans::PropertyValue > aValues(0); return aValues; } -css::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) { return css::awt::Rectangle(0, 0, 0, 0 ); } -sal_Int32 SAL_CALL AccessibleShape::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception){return 0;} -OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} -sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;} -OUString SAL_CALL AccessibleShape::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} -OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();} -css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleShape::getCharacterCount( ){return 0;} +sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const css::awt::Point& ){return 0;} +OUString SAL_CALL AccessibleShape::getSelectedText( ){return OUString();} +sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ){return 0;} +sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ){return 0;} +sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ){return true;} +OUString SAL_CALL AccessibleShape::getText( ){return OUString();} +OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ){return OUString();} +css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) { css::accessibility::TextSegment aResult; return aResult; } -css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) { css::accessibility::TextSegment aResult; return aResult; } -css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) { css::accessibility::TextSegment aResult; return aResult; } -sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;} +sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ){return true;} } // end of namespace accessibility diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx index 2430b5420b7b..01fb333104c0 100644 --- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx +++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx @@ -80,13 +80,13 @@ void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi // XServiceInfo -OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() { return OUString( "VCLXAccessibleSvxFindReplaceDialog" ); } -Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() { Sequence< OUString > aNames { "VCLXAccessibleSvxFindReplaceDialog" }; return aNames; diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index d1a7acde0f07..972228117db5 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -55,21 +55,16 @@ long ChildrenManager::GetChildCount() const throw () } css::uno::Reference<XAccessible> ChildrenManager::GetChild (long nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException) { return mpImpl->GetChild (nIndex); } Reference<XAccessible> ChildrenManager::GetChild (const Reference<drawing::XShape>& xShape) - throw (css::uno::RuntimeException) { return mpImpl->GetChild (xShape); } css::uno::Reference<css::drawing::XShape> ChildrenManager::GetChildShape(long nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException) { return mpImpl->GetChildShape(nIndex); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 74fb7e481c4e..b3674b56f1d9 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -106,8 +106,6 @@ long ChildrenManagerImpl::GetChildCount() const throw () css::uno::Reference<css::drawing::XShape> ChildrenManagerImpl::GetChildShape(long nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException) { uno::Reference<XAccessible> xAcc = GetChild(nIndex); ChildDescriptorListType::const_iterator aEnd = maVisibleChildren.end(); @@ -124,8 +122,6 @@ css::uno::Reference<css::drawing::XShape> ChildrenManagerImpl::GetChildShape(lon */ uno::Reference<XAccessible> ChildrenManagerImpl::GetChild (long nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException) { // Check whether the given index is valid. if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size()) @@ -142,7 +138,6 @@ uno::Reference<XAccessible> */ uno::Reference<XAccessible> ChildrenManagerImpl::GetChild (ChildDescriptor& rChildDescriptor,sal_Int32 _nIndex) - throw (css::uno::RuntimeException) { if ( ! rChildDescriptor.mxAccessibleShape.is()) { @@ -178,7 +173,6 @@ uno::Reference<XAccessible> uno::Reference<XAccessible> ChildrenManagerImpl::GetChild (const uno::Reference<drawing::XShape>& xShape) - throw (uno::RuntimeException) { ChildDescriptorListType::const_iterator aEnd = maVisibleChildren.end(); for (ChildDescriptorListType::iterator I = maVisibleChildren.begin(); I != aEnd; ++I) @@ -623,7 +617,6 @@ void ChildrenManagerImpl::SetInfo (const AccessibleShapeTreeInfo& rShapeTreeInfo // lang::XEventListener void SAL_CALL ChildrenManagerImpl::disposing (const lang::EventObject& rEventObject) - throw (uno::RuntimeException, std::exception) { if (rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster() || rEventObject.Source == maShapeTreeInfo.GetController()) @@ -655,7 +648,6 @@ void SAL_CALL void SAL_CALL ChildrenManagerImpl::notifyEvent ( const document::EventObject& rEventObject) - throw (uno::RuntimeException, std::exception) { if (rEventObject.EventName == "ShapeInserted") AddShape (Reference<drawing::XShape>(rEventObject.Source, uno::UNO_QUERY)); @@ -667,7 +659,6 @@ void SAL_CALL // view::XSelectionChangeListener void SAL_CALL ChildrenManagerImpl::selectionChanged (const lang::EventObject& /*rEvent*/) - throw (uno::RuntimeException, std::exception) { UpdateSelection (); } @@ -734,7 +725,6 @@ bool ChildrenManagerImpl::ReplaceChild ( const css::uno::Reference< css::drawing::XShape >& _rxShape, const long /*_nIndex*/, const AccessibleShapeTreeInfo& _rShapeTreeInfo) - throw (uno::RuntimeException) { AccessibleShapeInfo aShapeInfo( _rxShape, pCurrentChild->getAccessibleParent(), this ); // create the new child @@ -783,7 +773,7 @@ bool ChildrenManagerImpl::ReplaceChild ( } // Add the impl method for IAccessibleParent interface -AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException) +AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) { sal_Int32 count = GetChildCount(); for (sal_Int32 index=0;index<count;index++) @@ -800,7 +790,6 @@ AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::b } uno::Reference<XAccessible> ChildrenManagerImpl::GetAccessibleCaption (const uno::Reference<drawing::XShape>& xShape) - throw (uno::RuntimeException) { ChildDescriptorListType::const_iterator aEnd = maVisibleChildren.end(); for (ChildDescriptorListType::iterator I = maVisibleChildren.begin(); I != aEnd; ++I) diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 27d73b74034c..8bd8f6ee0da5 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -120,9 +120,7 @@ public: /// @throws css::uno::RuntimeException /// @throws css::lang::IndexOutOfBoundsException - css::uno::Reference<css::drawing::XShape> GetChildShape(long nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException); + css::uno::Reference<css::drawing::XShape> GetChildShape(long nIndex); /** Return the requested accessible child or throw and IndexOutOfBoundsException if the given index is invalid. @param nIndex @@ -137,9 +135,7 @@ public: Throws an IndexOutOfBoundsException if the index is not valid. */ css::uno::Reference<css::accessibility::XAccessible> - GetChild (long nIndex) - throw (css::uno::RuntimeException, - css::lang::IndexOutOfBoundsException); + GetChild (long nIndex); /** Return the requested accessible child. @param aChildDescriptor @@ -154,8 +150,7 @@ public: @throws css::uno::RuntimeException */ css::uno::Reference<css::accessibility::XAccessible> - GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex) - throw (css::uno::RuntimeException); + GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex); /** Return the requested accessible child given a shape. This method searches the list of descriptors for the one that holds the @@ -171,8 +166,7 @@ public: @throws css::uno::RuntimeException */ css::uno::Reference<css::accessibility::XAccessible> - GetChild (const css::uno::Reference<css::drawing::XShape>& xShape) - throw (css::uno::RuntimeException); + GetChild (const css::uno::Reference<css::drawing::XShape>& xShape); /** Update the child manager. Take care of a modified set of children and modified visible area. This method can optimize the update @@ -241,18 +235,15 @@ public: // lang::XEventListener virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; // document::XEventListener virtual void SAL_CALL - notifyEvent (const css::document::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + notifyEvent (const css::document::EventObject& rEventObject) override; // view::XSelectionChangeListener virtual void SAL_CALL - selectionChanged (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + selectionChanged (const css::lang::EventObject& rEvent) override; // IAccessibleViewForwarderListener /** Informs this children manager and its children about a change of one @@ -283,15 +274,13 @@ public: const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (css::uno::RuntimeException) override; + ) override; // Add the impl method for IAccessibleParent interface virtual AccessibleControlShape* GetAccControlShapeFromModel - (css::beans::XPropertySet* pSet) - throw (css::uno::RuntimeException) override; + (css::beans::XPropertySet* pSet) override; virtual css::uno::Reference<css::accessibility::XAccessible> - GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape) - throw (css::uno::RuntimeException) override; + GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape) override; protected: /** This list holds the descriptors of all currently visible shapes and associated accessible object. diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 6f7e27cf8a13..768b58b94e9d 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -153,13 +153,13 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessible( } // XAccessible -Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) +Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext() { return this; } // XAccessibleComponent -sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point& rPoint ) { // no guard -> done in getSize() awt::Size aSize (getSize()); @@ -170,7 +170,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point } -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -200,7 +200,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt } -awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( RuntimeException, std::exception ) +awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() { // no guard -> done in GetBoundingBox() Rectangle aCoreBounds( GetBoundingBox() ); @@ -213,7 +213,7 @@ awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( Runtim } -awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() { // no guard -> done in GetBoundingBox() Rectangle aRect( GetBoundingBox() ); @@ -221,7 +221,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeE } -awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() { // no guard -> done in GetBoundingBoxOnScreen() Rectangle aRect( GetBoundingBoxOnScreen() ); @@ -229,7 +229,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( } -awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeException, std::exception ) +awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() { // no guard -> done in GetBoundingBox() Rectangle aRect( GetBoundingBox() ); @@ -237,7 +237,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept } // XAccessibleContext -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() { ::SolarMutexGuard aGuard; @@ -250,7 +250,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() thro /** returns the SdrObject at index nIndex from the model of this graph */ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) - throw( RuntimeException, lang::IndexOutOfBoundsException ) { ::SolarMutexGuard aGuard; @@ -281,7 +280,6 @@ void SvxGraphCtrlAccessibleContext::CommitChange ( } Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) - throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { ::SolarMutexGuard aGuard; @@ -289,13 +287,13 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh } -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent() { return mxParent; } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() { ::SolarMutexGuard aGuard; // Use a simple but slow solution for now. Optimize later. @@ -326,20 +324,20 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() t } -sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole() { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() { ::SolarMutexGuard aGuard; return msDescription; } -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() { ::SolarMutexGuard aGuard; return msName; @@ -349,13 +347,13 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( Runt /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) +Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet() { return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet() { ::SolarMutexGuard aGuard; @@ -379,7 +377,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce } -lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() { ::SolarMutexGuard aGuard; @@ -396,7 +394,6 @@ lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalA // XAccessibleEventListener void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -409,7 +406,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const R void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -428,7 +424,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( cons } } -void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) +void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() { ::SolarMutexGuard aGuard; @@ -439,7 +435,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException } sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground() - throw (css::uno::RuntimeException, std::exception) { svtools::ColorConfig aColorConfig; sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; @@ -447,24 +442,23 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground() } sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground() - throw (css::uno::RuntimeException, std::exception) { sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } // XServiceInfo -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName() { return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" ); } -sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames() { Sequence< OUString > aSNs( 3 ); @@ -476,19 +470,19 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService } // XTypeProvider -Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) +Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XServiceName -OUString SvxGraphCtrlAccessibleContext::getServiceName() throw( RuntimeException, std::exception ) +OUString SvxGraphCtrlAccessibleContext::getServiceName() { return OUString( "com.sun.star.accessibility.AccessibleContext" ); } // XAccessibleSelection -void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) +void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) { ::SolarMutexGuard aGuard; @@ -502,7 +496,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI } -sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) { ::SolarMutexGuard aGuard; @@ -513,7 +507,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_ } -void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception ) +void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() { ::SolarMutexGuard aGuard; @@ -524,7 +518,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R } -void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception ) +void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() { ::SolarMutexGuard aGuard; @@ -535,7 +529,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() { ::SolarMutexGuard aGuard; @@ -548,7 +542,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) - throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -565,7 +558,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce } -void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) +void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) { ::SolarMutexGuard aGuard; @@ -594,7 +587,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 } // internals -void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) throw( lang::IndexOutOfBoundsException ) +void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) { if( nIndex < 0 || nIndex >= getSelectedAccessibleChildCount() ) throw lang::IndexOutOfBoundsException(); @@ -667,7 +660,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() } -Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) +Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() { ::SolarMutexGuard aGuard; @@ -685,7 +678,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( Runtime between the absolute coordinates of the bounding boxes of this control and its parent in the accessibility tree. */ -Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() throw( RuntimeException ) +Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() { ::SolarMutexGuard aGuard; diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 0febf58709a0..0fbeac31e756 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -200,7 +200,6 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape /// get the accessible base name for an object OUString ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& rxShape) - throw (css::uno::RuntimeException, std::exception) { sal_Int32 nResourceId; OUString sName; diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 3d801af3f847..74da070ffba9 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -70,7 +70,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent( m_xTable->fireEvent(_nEventId,_rOldValue,_rNewValue); } -sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -78,7 +78,6 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount( ) throw ( } uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -105,14 +104,13 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtual } void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); mpParent->GrabFocus(); } -Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -130,7 +128,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( return m_xTable.get(); } -Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -143,7 +141,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( return xRet; } -css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeException) +css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds( ) { css::awt::Rectangle aBounds ( 0, 0, 0, 0 ); vcl::Window* pWindow = mpParent; @@ -163,29 +161,29 @@ css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeEx return aBounds; } -sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole( ) { return css::accessibility::AccessibleRole::SCROLL_PANE; } -OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION); } -OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName( ) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC); } -Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet( ) { return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -282,7 +280,7 @@ void SAL_CALL SvxShowCharSetAcc::disposing() IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base ) -bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException) +bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) { return m_pParent && m_pParent->getCharSetControl()->IsSelected( sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex)); @@ -290,7 +288,6 @@ bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) void SvxShowCharSetAcc::implSelect(sal_Int32 nAccessibleChildIndex, bool bSelect) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if ( m_pParent ) { @@ -301,7 +298,7 @@ void SvxShowCharSetAcc::implSelect(sal_Int32 nAccessibleChildIndex, bool bSelect } } -css::awt::Rectangle SvxShowCharSetAcc::implGetBounds( ) throw (RuntimeException) +css::awt::Rectangle SvxShowCharSetAcc::implGetBounds( ) { const Point aOutPos;//( m_pParent->getCharSetControl()->GetPosPixel() ); Size aOutSize( m_pParent->getCharSetControl()->GetOutputSizePixel()); @@ -322,7 +319,6 @@ css::awt::Rectangle SvxShowCharSetAcc::implGetBounds( ) throw (RuntimeException } sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -331,7 +327,6 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -352,7 +347,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -361,14 +355,12 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { return css::accessibility::AccessibleRole::TABLE; } OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION ); @@ -376,7 +368,6 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -385,14 +376,12 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetAcc::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { return uno::Reference< css::accessibility::XAccessibleRelationSet >(); } uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetAcc::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -422,7 +411,6 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -440,54 +428,53 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge } void SAL_CALL SvxShowCharSetAcc::grabFocus() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); m_pParent->getCharSetControl()->GrabFocus(); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount( ) { return ((getAccessibleChildCount()-1) / COLUMN_COUNT) + 1; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount( ) { return COLUMN_COUNT; } -OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) { return OUString(); } -OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) { return OUString(); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) { return 1; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) { return 1; } -Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleRowHeaders( ) throw (RuntimeException, std::exception) +Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleRowHeaders( ) { return Reference< XAccessibleTable >(); } -Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleColumnHeaders( ) throw (RuntimeException, std::exception) +Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleColumnHeaders( ) { return Reference< XAccessibleTable >(); } -Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) throw (RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -496,7 +483,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) return aSel; } -Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( ) throw (RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( ) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -505,21 +492,21 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( return aSel; } -sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) { OExternalLockGuard aGuard( this ); ensureAlive(); return SvxShowCharSet::GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow; } -sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) { OExternalLockGuard aGuard( this ); ensureAlive(); return SvxShowCharSet::GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn; } -Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -530,36 +517,36 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In return pItem->GetAccessible(); } -Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCaption( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCaption( ) { return Reference< XAccessible >(); } -Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleSummary( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleSummary( ) { return Reference< XAccessible >(); } -sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) { 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, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { return (nRow*COLUMN_COUNT) + nColumn; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); ensureAlive(); return SvxShowCharSet::GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -597,21 +584,18 @@ void SvxShowCharSetItemAcc::ParentDestroyed() sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { return 0; } uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int32 /*i*/ ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -620,14 +604,12 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { return css::accessibility::AccessibleRole::TABLE_CELL; } OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -657,7 +639,6 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -676,14 +657,12 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { return uno::Reference< css::accessibility::XAccessibleRelationSet >(); } uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); @@ -718,13 +697,13 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe } -sal_Int32 SvxShowCharSetItemAcc::getAccessibleActionCount() throw (RuntimeException, std::exception) +sal_Int32 SvxShowCharSetItemAcc::getAccessibleActionCount() { return 1; } -sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -737,7 +716,7 @@ sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) throw (I } -OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex ) { if( nIndex == 0 ) return OUString( "press" ); @@ -745,7 +724,7 @@ OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nInde } -Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) +Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { if( nIndex == 0 ) return Reference< css::accessibility::XAccessibleKeyBinding >(); @@ -754,12 +733,11 @@ Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::ge void SAL_CALL SvxShowCharSetItemAcc::grabFocus() - throw (uno::RuntimeException, std::exception) { // nothing to do } -awt::Rectangle SvxShowCharSetItemAcc::implGetBounds( ) throw (RuntimeException) +awt::Rectangle SvxShowCharSetItemAcc::implGetBounds( ) { awt::Rectangle aRet; @@ -781,12 +759,11 @@ awt::Rectangle SvxShowCharSetItemAcc::implGetBounds( ) throw (RuntimeException) } uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleAtPoint( const awt::Point& /*aPoint*/ ) - throw (uno::RuntimeException, std::exception) { return uno::Reference< css::accessibility::XAccessible >(); } -sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -809,7 +786,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground( ) throw (RuntimeExc return nColor; } -sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground( ) { OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; @@ -824,7 +801,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground( ) throw (RuntimeExc return nColor; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -834,7 +811,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground( ) throw (RuntimeException, return nColor; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) { OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 83dd81b2242f..162264f88aa6 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -68,18 +68,16 @@ SvxPixelCtlAccessible::~SvxPixelCtlAccessible() } } uno::Reference< XAccessibleContext > SvxPixelCtlAccessible::getAccessibleContext( ) - throw (uno::RuntimeException, std::exception) { return this; } -sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount( ) throw (uno::RuntimeException, std::exception) +sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetSquares(); } uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( i < 0 || i >= getAccessibleChildCount()) @@ -89,7 +87,6 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int } uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent( ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); vcl::Window *pTabPage = getNonLayoutParent(&mrPixelCtl); @@ -100,7 +97,6 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent( ) } sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent( ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); sal_uInt16 nIdx = 0; @@ -114,13 +110,12 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent( ) return nIdx; } -sal_Int16 SvxPixelCtlAccessible::getAccessibleRole( ) throw (uno::RuntimeException, std::exception) +sal_Int16 SvxPixelCtlAccessible::getAccessibleRole( ) { return AccessibleRole::LIST; } OUString SvxPixelCtlAccessible::getAccessibleDescription( ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -128,7 +123,6 @@ OUString SvxPixelCtlAccessible::getAccessibleDescription( ) } OUString SvxPixelCtlAccessible::getAccessibleName( ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -136,7 +130,6 @@ OUString SvxPixelCtlAccessible::getAccessibleName( ) } uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRelationSet( ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper; @@ -159,7 +152,6 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel uno::Reference< XAccessibleStateSet > SvxPixelCtlAccessible::getAccessibleStateSet( ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -191,7 +183,6 @@ uno::Reference< XAccessibleStateSet > SvxPixelCtlAccessible::getAccessibleStateS css::lang::Locale SvxPixelCtlAccessible::getLocale( ) - throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if( getAccessibleParent().is() ) @@ -208,7 +199,6 @@ css::lang::Locale SvxPixelCtlAccessible::getLocale( ) sal_Bool SvxPixelCtlAccessible::containsPoint( const awt::Point& aPt ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); Point aPoint(aPt.X, aPt.Y); @@ -219,7 +209,6 @@ sal_Bool SvxPixelCtlAccessible::containsPoint( const awt::Point& aPt ) } uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoint ( const awt::Point& aPoint) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if( !IsAlive() ) @@ -235,7 +224,7 @@ uno::Reference<XAccessible > SAL_CALL SvxPixelCtlAccessible::getAccessibleAtPoin return CreateChild(nIndex, mrPixelCtl.IndexToPoint(nIndex)); } -awt::Rectangle SvxPixelCtlAccessible::getBounds( ) throw (uno::RuntimeException, std::exception) +awt::Rectangle SvxPixelCtlAccessible::getBounds( ) { ::osl::MutexGuard aGuard( m_aMutex ); awt::Rectangle aRet; @@ -248,7 +237,7 @@ awt::Rectangle SvxPixelCtlAccessible::getBounds( ) throw (uno::RuntimeException return aRet; } -awt::Point SvxPixelCtlAccessible::getLocation( ) throw (uno::RuntimeException, std::exception) +awt::Point SvxPixelCtlAccessible::getLocation( ) { ::osl::MutexGuard aGuard( m_aMutex ); Point aPos; @@ -257,52 +246,48 @@ awt::Point SvxPixelCtlAccessible::getLocation( ) throw (uno::RuntimeException, return aRet; } -awt::Point SvxPixelCtlAccessible::getLocationOnScreen( ) throw (uno::RuntimeException, std::exception) +awt::Point SvxPixelCtlAccessible::getLocationOnScreen( ) { ::osl::MutexGuard aGuard( m_aMutex ); Rectangle rect = mrPixelCtl.GetWindowExtentsRelative(nullptr); return awt::Point(rect.Left(),rect.Top() ); } -awt::Size SvxPixelCtlAccessible::getSize( ) throw (uno::RuntimeException, std::exception) +awt::Size SvxPixelCtlAccessible::getSize( ) { ::osl::MutexGuard aGuard( m_aMutex ); Size aSz = mrPixelCtl.GetSizePixel(); return awt::Size(aSz.Width(),aSz.Height()); } -void SvxPixelCtlAccessible::grabFocus( ) throw (uno::RuntimeException, std::exception) +void SvxPixelCtlAccessible::grabFocus( ) { ::osl::MutexGuard aGuard( m_aMutex ); mrPixelCtl.GrabFocus(); } sal_Int32 SvxPixelCtlAccessible::getForeground( ) - throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetControlForeground().GetColor(); } sal_Int32 SvxPixelCtlAccessible::getBackground( ) - throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetControlBackground().GetColor(); } -OUString SvxPixelCtlAccessible::getImplementationName( ) throw (uno::RuntimeException, std::exception) +OUString SvxPixelCtlAccessible::getImplementationName( ) { return OUString("SvxPixelCtlAccessible"); } sal_Bool SvxPixelCtlAccessible::supportsService( const OUString& rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -315,7 +300,7 @@ uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames( ) // XAccessibleSelection -void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -326,27 +311,27 @@ void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildInde NotifyChild(nIndex,true,false); } -sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetFocusPosIndex() == nChildIndex; } -void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection( ) throw (RuntimeException, std::exception) +void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection( ) { } -void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) +void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren( ) { } -sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount( ) { return 1; } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -361,12 +346,12 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessi return xChild; } -void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) { } //XAccessibleEventBroadcaster -void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { if (xListener.is()) { @@ -378,7 +363,6 @@ void SAL_CALL SvxPixelCtlAccessible::addAccessibleEventListener( const uno::Refe } void SAL_CALL SvxPixelCtlAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -563,25 +547,25 @@ SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild() } // XAccessible -uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext() throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext() { return this; } // XAccessibleComponent -sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::containsPoint( const awt::Point& rPoint ) { // 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, std::exception ) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleAtPoint( const awt::Point& ) { return uno::Reference< XAccessible >(); } -awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeException, std::exception ) +awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() { // no guard -> done in getBoundingBox() //Modified by lq, 09/26 @@ -593,37 +577,35 @@ awt::Rectangle SAL_CALL SvxPixelCtlAccessibleChild::getBounds() throw( RuntimeEx // End } -awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocation() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocation() { // no guard -> done in getBoundingBox() return AWTPoint( GetBoundingBox().TopLeft() ); } -awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocationOnScreen() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvxPixelCtlAccessibleChild::getLocationOnScreen() { // no guard -> done in getBoundingBoxOnScreen() return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } -awt::Size SAL_CALL SvxPixelCtlAccessibleChild::getSize() throw( RuntimeException, std::exception ) +awt::Size SAL_CALL SvxPixelCtlAccessibleChild::getSize() { // no guard -> done in getBoundingBox() return AWTSize( GetBoundingBox().GetSize() ); } -void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException, std::exception ) +void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() { } sal_Int32 SvxPixelCtlAccessibleChild::getForeground( ) - throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); return mrParentWindow.GetControlForeground().GetColor(); } sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) - throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -632,40 +614,39 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount() { return 0; } uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChild( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent() throw( RuntimeException, std::exception ) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent() { return mxParent; } -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent() { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole() { return AccessibleRole::CHECK_BOX; } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription() { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName() { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); @@ -674,12 +655,12 @@ OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName() throw( Runtime /** Return empty uno::Reference to indicate that the relation set is not supported. */ -uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet() throw( RuntimeException, std::exception ) +uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet() { return uno::Reference< XAccessibleRelationSet >(); } -uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet() throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet() { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -710,7 +691,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAc return pStateSetHelper; } -lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale() { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -726,7 +707,6 @@ lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale() throw( IllegalAcce } void SAL_CALL SvxPixelCtlAccessibleChild::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -738,7 +718,6 @@ void SAL_CALL SvxPixelCtlAccessibleChild::addAccessibleEventListener( const uno: } void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -758,17 +737,17 @@ void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const u } // XServiceInfo -OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName() { return OUString( "SvxPixelCtlAccessibleChild" ); } -sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& rServiceName ) { return cppu::supportsService( this, rServiceName ); } -Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames() { uno::Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); @@ -797,13 +776,13 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing() } } -void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) +void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive() { if( rBHelper.bDisposed || rBHelper.bInDispose ) throw lang::DisposedException(); } -Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() throw( RuntimeException ) +Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -813,7 +792,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() throw( RuntimeExc return Rectangle( mrParentWindow.OutputToAbsoluteScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle const & SvxPixelCtlAccessibleChild::GetBoundingBox() throw( RuntimeException ) +Rectangle const & SvxPixelCtlAccessibleChild::GetBoundingBox() { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 4da503193230..6076049d90bf 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -168,20 +168,20 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext() } // XAccessible -Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) +Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext() { return this; } // XAccessibleComponent -sal_Bool SAL_CALL SvxRectCtlAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxRectCtlAccessibleContext::containsPoint( const awt::Point& rPoint ) { // 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, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -197,31 +197,31 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPo return xRet; } -awt::Rectangle SAL_CALL SvxRectCtlAccessibleContext::getBounds() throw( RuntimeException, std::exception ) +awt::Rectangle SAL_CALL SvxRectCtlAccessibleContext::getBounds() { // no guard -> done in GetBoundingBox() return AWTRectangle( GetBoundingBox() ); } -awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocation() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocation() { // no guard -> done in GetBoundingBox() return AWTPoint( GetBoundingBox().TopLeft() ); } -awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvxRectCtlAccessibleContext::getLocationOnScreen() { // no guard -> done in GetBoundingBoxOnScreen() return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } -awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize() throw( RuntimeException, std::exception ) +awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize() { // no guard -> done in GetBoundingBox() return AWTSize( GetBoundingBox().GetSize() ); } -bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException ) +bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -231,7 +231,7 @@ bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -241,7 +241,6 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() throw( } Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) - throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { checkChildIndex( nIndex ); @@ -278,12 +277,12 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil return xChild; } -Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent() { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent() { ::osl::MutexGuard aGuard( m_aMutex ); // Use a simple but slow solution for now. Optimize later. @@ -309,18 +308,18 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent() thr return -1; } -sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole() { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription() { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription + " Please use arrow key to selection."; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName() { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -329,7 +328,7 @@ OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName() throw( Runtim /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) +Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet() { //return Reference< XAccessibleRelationSet >(); utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; @@ -354,7 +353,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet() { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -378,7 +377,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale() { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -393,7 +392,6 @@ lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale() throw( IllegalAcc } void SAL_CALL SvxRectCtlAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -405,7 +403,6 @@ void SAL_CALL SvxRectCtlAccessibleContext::addAccessibleEventListener( const Ref } void SAL_CALL SvxRectCtlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -424,7 +421,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::removeAccessibleEventListener( const } } -void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) +void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -435,7 +432,6 @@ void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException, } sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) - throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -444,7 +440,6 @@ sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) return mpRepr->GetControlForeground().GetColor(); } sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) - throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -454,30 +449,30 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) } // XServiceInfo -OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName() { return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); } -sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames() { const OUString sServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &sServiceName, 1 ); } // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XAccessibleSelection -void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) +void SAL_CALL SvxRectCtlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) { ::SolarMutexGuard aSolarGuard; @@ -496,7 +491,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, std::exception ) +sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -505,19 +500,19 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_In return nIndex == mnSelectedChild; } -void SAL_CALL SvxRectCtlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception ) +void SAL_CALL SvxRectCtlAccessibleContext::clearAccessibleSelection() { SAL_WARN( "svx", "SvxRectCtlAccessibleContext::clearAccessibleSelection() is not possible!" ); } -void SAL_CALL SvxRectCtlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception ) +void SAL_CALL SvxRectCtlAccessibleContext::selectAllAccessibleChildren() { // guard in selectAccessibleChild()! selectAccessibleChild( 0 ); // default per definition } -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -525,7 +520,6 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChildCount( } Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) - throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -536,7 +530,7 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getSelectedAccess return getAccessibleChild( mnSelectedChild ); } -void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*nIndex*/ ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) +void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*nIndex*/ ) { OUString aMessage( "deselectAccessibleChild is not possible in this context" ); @@ -546,7 +540,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /* } // internals -void SvxRectCtlAccessibleContext::checkChildIndex( long nIndex ) throw( lang::IndexOutOfBoundsException ) +void SvxRectCtlAccessibleContext::checkChildIndex( long nIndex ) { if( nIndex < 0 || nIndex >= getAccessibleChildCount() ) throw lang::IndexOutOfBoundsException(); @@ -659,7 +653,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing() } } -Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) +Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen() { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -669,7 +663,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeEx return Rectangle( mpRepr->GetParent()->OutputToScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() ); } -Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() throw( RuntimeException ) +Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -679,7 +673,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() throw( RuntimeException return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() ); } -void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) +void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() { if( rBHelper.bDisposed || rBHelper.bInDispose ) throw lang::DisposedException(); @@ -718,53 +712,52 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext() } // XAccessible -Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) +Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext() { return this; } // XAccessibleComponent -sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::containsPoint( const awt::Point& rPoint ) { // 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, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleAtPoint( const awt::Point& /*rPoint*/ ) { return Reference< XAccessible >(); } -awt::Rectangle SAL_CALL SvxRectCtlChildAccessibleContext::getBounds() throw( RuntimeException, std::exception ) +awt::Rectangle SAL_CALL SvxRectCtlChildAccessibleContext::getBounds() { // no guard -> done in getBoundingBox() return AWTRectangle( GetBoundingBox() ); } -awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocation() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocation() { // no guard -> done in getBoundingBox() return AWTPoint( GetBoundingBox().TopLeft() ); } -awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvxRectCtlChildAccessibleContext::getLocationOnScreen() { // no guard -> done in getBoundingBoxOnScreen() return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } -awt::Size SAL_CALL SvxRectCtlChildAccessibleContext::getSize() throw( RuntimeException, std::exception ) +awt::Size SAL_CALL SvxRectCtlChildAccessibleContext::getSize() { // no guard -> done in getBoundingBox() return AWTSize( GetBoundingBox().GetSize() ); } -void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeException, std::exception ) +void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() { } sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) - throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( maMutex ); @@ -772,7 +765,6 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) return mrParentWindow.GetControlForeground().GetColor(); } sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) - throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( maMutex ); @@ -782,38 +774,38 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount() { return 0; } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChild( sal_Int32 /*nIndex*/ ) throw ( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChild( sal_Int32 /*nIndex*/ ) { throw lang::IndexOutOfBoundsException(); } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent() { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent() { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole() { return AccessibleRole::RADIO_BUTTON; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription() { ::osl::MutexGuard aGuard( maMutex ); return msDescription; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName() { ::osl::MutexGuard aGuard( maMutex ); return msName; @@ -822,7 +814,7 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName() throw( R /** Return empty reference to indicate that the relation set is not supported. */ -Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) +Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet() { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; @@ -836,7 +828,7 @@ Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::get return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet() { ::osl::MutexGuard aGuard( maMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -862,7 +854,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getA return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale() { ::osl::MutexGuard aGuard( maMutex ); if( mxParent.is() ) @@ -878,7 +870,6 @@ lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale() throw( Illeg } void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -891,7 +882,6 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( cons void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -911,7 +901,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( c } // XAccessibleValue -Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeException, std::exception ) +Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() { ThrowExceptionIfNotAlive(); @@ -920,19 +910,19 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getCurrentValue() throw( RuntimeE return aRet; } -sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::setCurrentValue( const Any& /*aNumber*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::setCurrentValue( const Any& /*aNumber*/ ) { return false; } -Any SAL_CALL SvxRectCtlChildAccessibleContext::getMaximumValue() throw( RuntimeException, std::exception ) +Any SAL_CALL SvxRectCtlChildAccessibleContext::getMaximumValue() { Any aRet; aRet <<= 1.0; return aRet; } -Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeException, std::exception ) +Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() { Any aRet; aRet <<= 0.0; @@ -943,13 +933,13 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeE // XAccessibleAction -sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (RuntimeException, std::exception) +sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) { return 1; } -sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) { ::osl::MutexGuard aGuard( maMutex ); @@ -964,7 +954,7 @@ sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex } -OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) { ::osl::MutexGuard aGuard( maMutex ); @@ -975,7 +965,7 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_ } -Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { ::osl::MutexGuard aGuard( maMutex ); @@ -986,24 +976,24 @@ Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessib } // XServiceInfo -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName() { return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ); } -sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames() { const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext"); return Sequence< OUString >( &sServiceName, 1 ); } // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -1033,13 +1023,13 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::disposing() } } -void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) +void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive() { if( rBHelper.bDisposed || rBHelper.bInDispose ) throw lang::DisposedException(); } -Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) +Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() { ::osl::MutexGuard aGuard( maMutex ); @@ -1049,7 +1039,7 @@ Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() throw( Runt return Rectangle( mrParentWindow.OutputToScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle const & SvxRectCtlChildAccessibleContext::GetBoundingBox() throw( RuntimeException ) +Rectangle const & SvxRectCtlChildAccessibleContext::GetBoundingBox() { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index b2f5beeb98ba..b5a600816bae 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -82,26 +82,18 @@ public: virtual void SAL_CALL release() throw() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XCustomShapeEngine - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::awt::Rectangle SAL_CALL getTextBounds() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL render() override; + virtual css::awt::Rectangle SAL_CALL getTextBounds() override; + virtual css::drawing::PolyPolygonBezierCoords SAL_CALL getLineGeometry() override; + virtual css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > SAL_CALL getInteraction() override; }; EnhancedCustomShapeEngine::EnhancedCustomShapeEngine() : @@ -121,7 +113,6 @@ void SAL_CALL EnhancedCustomShapeEngine::release() throw() // XInitialization void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArguments ) - throw ( Exception, RuntimeException, std::exception ) { sal_Int32 i; Sequence< beans::PropertyValue > aParameter; @@ -142,17 +133,14 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArg // XServiceInfo OUString SAL_CALL EnhancedCustomShapeEngine::getImplementationName() - throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" ); } sal_Bool SAL_CALL EnhancedCustomShapeEngine::supportsService( const OUString& rServiceName ) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL EnhancedCustomShapeEngine::getSupportedServiceNames() - throw ( RuntimeException, std::exception ) { Sequence<OUString> aRet { "com.sun.star.drawing.CustomShapeEngine" }; return aRet; @@ -264,7 +252,6 @@ void SetTemporary( uno::Reference< drawing::XShape >& xShape ) } Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() - throw ( RuntimeException, std::exception ) { Reference< drawing::XShape > xShape; SdrObject* pSdrObjCustomShape( dynamic_cast<SdrObjCustomShape*>( GetSdrObjectFromXShape( mxShape ) ) ); @@ -362,7 +349,6 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() } awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds() - throw ( RuntimeException, std::exception ) { awt::Rectangle aTextRect; SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) ); @@ -383,7 +369,6 @@ awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTextBounds() } drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeometry() - throw ( RuntimeException, std::exception ) { drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords; SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) ); @@ -464,7 +449,6 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom } Sequence< Reference< drawing::XCustomShapeHandle > > SAL_CALL EnhancedCustomShapeEngine::getInteraction() - throw ( RuntimeException, std::exception ) { sal_uInt32 i, nHdlCount = 0; SdrObject* pSdrObjCustomShape = GetSdrObjectFromXShape( mxShape ); diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index 230f489f8062..ab4e0d93b460 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -47,7 +47,6 @@ void SAL_CALL EnhancedCustomShapeHandle::release() throw() // XCustomShapeHandle css::awt::Point SAL_CALL EnhancedCustomShapeHandle::getPosition() - throw ( css::uno::RuntimeException, std::exception ) { SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxCustomShape ) ); if ( !pSdrObjCustomShape ) @@ -61,7 +60,6 @@ css::awt::Point SAL_CALL EnhancedCustomShapeHandle::getPosition() } void SAL_CALL EnhancedCustomShapeHandle::setControllerPosition( const css::awt::Point& aPnt ) - throw ( css::uno::RuntimeException, std::exception ) { SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxCustomShape ) ); if ( !pSdrObjCustomShape ) @@ -74,7 +72,6 @@ void SAL_CALL EnhancedCustomShapeHandle::setControllerPosition( const css::awt:: // XInitialization void SAL_CALL EnhancedCustomShapeHandle::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { } diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx index 15525d50fb6d..eca3a8c045ff 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx @@ -48,14 +48,11 @@ public: virtual void SAL_CALL release() throw() override; // XCustomShapeHandle - virtual css::awt::Point SAL_CALL getPosition() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setControllerPosition( const css::awt::Point& ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setControllerPosition( const css::awt::Point& ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; }; #endif diff --git a/svx/source/dialog/SafeModeUI.cxx b/svx/source/dialog/SafeModeUI.cxx index 024d17b5861a..b01cded95639 100644 --- a/svx/source/dialog/SafeModeUI.cxx +++ b/svx/source/dialog/SafeModeUI.cxx @@ -27,19 +27,15 @@ public: SafeModeUI(); // css.lang.XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL, - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; }; SafeModeUI::SafeModeUI() @@ -47,19 +43,16 @@ SafeModeUI::SafeModeUI() } OUString SAL_CALL SafeModeUI::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.svx.SafeModeUI"); } sal_Bool SAL_CALL SafeModeUI::supportsService(const OUString& sServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL SafeModeUI::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > lServiceNames { "com.sun.star.dialog.SafeModeUI" }; return lServiceNames; @@ -67,7 +60,6 @@ css::uno::Sequence< OUString > SAL_CALL SafeModeUI::getSupportedServiceNames() css::uno::Any SAL_CALL SafeModeUI::dispatchWithReturnValue(const css::util::URL&, const css::uno::Sequence< css::beans::PropertyValue >& ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; css::uno::Any aRet; diff --git a/svx/source/dialog/crashreportui.cxx b/svx/source/dialog/crashreportui.cxx index 62e5edd80efd..a589fa09a456 100644 --- a/svx/source/dialog/crashreportui.cxx +++ b/svx/source/dialog/crashreportui.cxx @@ -28,19 +28,15 @@ public: // css.lang.XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL, - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; private: css::uno::Reference< css::uno::XComponentContext > mxContext; @@ -53,19 +49,16 @@ CrashReportUI::CrashReportUI(const css::uno::Reference<css::uno::XComponentConte } OUString SAL_CALL CrashReportUI::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.svx.CrashReportUI"); } sal_Bool SAL_CALL CrashReportUI::supportsService(const OUString& sServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL CrashReportUI::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > lServiceNames { "com.sun.star.dialog.CrashReportUI" }; return lServiceNames; @@ -73,7 +66,6 @@ css::uno::Sequence< OUString > SAL_CALL CrashReportUI::getSupportedServiceNames( css::uno::Any SAL_CALL CrashReportUI::dispatchWithReturnValue(const css::util::URL&, const css::uno::Sequence< css::beans::PropertyValue >& ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; css::uno::Any aRet; diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index f257c3c1bf82..d03e228f51f2 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -371,7 +371,6 @@ ERecoveryState RecoveryCore::mapDocState2RecoverState(sal_Int32 eDocState) void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& aEvent) - throw(css::uno::RuntimeException, std::exception) { // a) special notification about start/stop async dispatch! // FeatureDescriptor = "start" || "stop" @@ -467,7 +466,6 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a void SAL_CALL RecoveryCore::disposing(const css::lang::EventObject& /*aEvent*/) - throw(css::uno::RuntimeException, std::exception) { m_xRealCore.clear(); } @@ -564,7 +562,6 @@ PluginProgress::~PluginProgress() void SAL_CALL PluginProgress::dispose() - throw(css::uno::RuntimeException, std::exception) { // m_pPluginProgressWindow was deleted ... // So the internal pointer of this progress @@ -574,20 +571,17 @@ void SAL_CALL PluginProgress::dispose() void SAL_CALL PluginProgress::addEventListener(const css::uno::Reference< css::lang::XEventListener >& ) - throw(css::uno::RuntimeException, std::exception) { } void SAL_CALL PluginProgress::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) - throw(css::uno::RuntimeException, std::exception) { } void SAL_CALL PluginProgress::start(const OUString&, sal_Int32 nRange) - throw(css::uno::RuntimeException, std::exception) { if (m_xProgress.is()) m_xProgress->start(OUString(), nRange); @@ -595,7 +589,6 @@ void SAL_CALL PluginProgress::start(const OUString&, void SAL_CALL PluginProgress::end() - throw(css::uno::RuntimeException, std::exception) { if (m_xProgress.is()) m_xProgress->end(); @@ -603,7 +596,6 @@ void SAL_CALL PluginProgress::end() void SAL_CALL PluginProgress::setText(const OUString& sText) - throw(css::uno::RuntimeException, std::exception) { if (m_xProgress.is()) m_xProgress->setText(sText); @@ -611,7 +603,6 @@ void SAL_CALL PluginProgress::setText(const OUString& sText) void SAL_CALL PluginProgress::setValue(sal_Int32 nValue) - throw(css::uno::RuntimeException, std::exception) { if (m_xProgress.is()) m_xProgress->setValue(nValue); @@ -619,7 +610,6 @@ void SAL_CALL PluginProgress::setValue(sal_Int32 nValue) void SAL_CALL PluginProgress::reset() - throw(css::uno::RuntimeException, std::exception) { if (m_xProgress.is()) m_xProgress->reset(); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index a38df223f934..9ef4e9558f06 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -127,10 +127,8 @@ public: } void AssertOneEntry(); - virtual void SAL_CALL selectionChanged(const css::lang::EventObject& aEvent) - throw (RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source) - throw (RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged(const css::lang::EventObject& aEvent) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source) override; }; @@ -165,12 +163,12 @@ void SvxRubyData_Impl::SetController(const Reference<XController>& xCtrl) } } -void SvxRubyData_Impl::selectionChanged(const EventObject& ) throw (RuntimeException, std::exception) +void SvxRubyData_Impl::selectionChanged(const EventObject& ) { bHasSelectionChanged = true; } -void SvxRubyData_Impl::disposing(const EventObject&) throw (RuntimeException, std::exception) +void SvxRubyData_Impl::disposing(const EventObject&) { try { diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index eb80bbadf41b..33af56e75e49 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -128,7 +128,7 @@ FmXModifyMultiplexer::FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl: } -Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) { Any aReturn; aReturn = ::cppu::queryInterface(_rType, @@ -143,12 +143,12 @@ Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (Run } -void FmXModifyMultiplexer::disposing(const EventObject& ) throw( RuntimeException, std::exception ) +void FmXModifyMultiplexer::disposing(const EventObject& ) { } -void FmXModifyMultiplexer::modified(const EventObject& e) throw( RuntimeException, std::exception ) +void FmXModifyMultiplexer::modified(const EventObject& e) { EventObject aMulti( e); aMulti.Source = &m_rParent; @@ -162,7 +162,7 @@ FmXUpdateMultiplexer::FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl: } -Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) { Any aReturn; aReturn = ::cppu::queryInterface(_rType, @@ -177,12 +177,12 @@ Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) throw (Run } -void FmXUpdateMultiplexer::disposing(const EventObject& ) throw( RuntimeException, std::exception ) +void FmXUpdateMultiplexer::disposing(const EventObject& ) { } -sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( RuntimeException, std::exception ) +sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) { EventObject aMulti( e ); aMulti.Source = &m_rParent; @@ -199,7 +199,7 @@ sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( Runtim } -void FmXUpdateMultiplexer::updated(const EventObject &e) throw( RuntimeException, std::exception ) +void FmXUpdateMultiplexer::updated(const EventObject &e) { EventObject aMulti( e ); aMulti.Source = &m_rParent; @@ -213,7 +213,7 @@ FmXSelectionMultiplexer::FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, } -Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) { Any aReturn; aReturn = ::cppu::queryInterface(_rType, @@ -228,12 +228,12 @@ Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) throw ( } -void FmXSelectionMultiplexer::disposing(const EventObject& ) throw( RuntimeException, std::exception ) +void FmXSelectionMultiplexer::disposing(const EventObject& ) { } -void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEvent ) { EventObject aMulti(_rEvent); aMulti.Source = &m_rParent; @@ -247,7 +247,7 @@ FmXContainerMultiplexer::FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, } -Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) { Any aReturn; aReturn = ::cppu::queryInterface(_rType, @@ -262,11 +262,11 @@ Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) throw ( } -void FmXContainerMultiplexer::disposing(const EventObject& ) throw( RuntimeException, std::exception ) +void FmXContainerMultiplexer::disposing(const EventObject& ) { } -void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) throw( RuntimeException, std::exception ) +void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) { ContainerEvent aMulti( e ); aMulti.Source = &m_rParent; @@ -274,7 +274,7 @@ void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) throw( Ru } -void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( RuntimeException, std::exception ) +void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) { ContainerEvent aMulti( e ); aMulti.Source = &m_rParent; @@ -282,7 +282,7 @@ void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( Run } -void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( RuntimeException, std::exception ) +void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) { ContainerEvent aMulti( e ); aMulti.Source = &m_rParent; @@ -296,7 +296,7 @@ FmXGridControlMultiplexer::FmXGridControlMultiplexer( ::cppu::OWeakObject& rSour } -Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) { Any aReturn; aReturn = ::cppu::queryInterface( _rType, @@ -310,12 +310,12 @@ Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) throw } -void FmXGridControlMultiplexer::disposing( const EventObject& ) throw( RuntimeException, std::exception ) +void FmXGridControlMultiplexer::disposing( const EventObject& ) { } -void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _event ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _event ) { EventObject aForwardedEvent( _event ); aForwardedEvent.Source = &m_rParent; @@ -327,7 +327,6 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) - throw (css::uno::Exception) { return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) )); } @@ -350,7 +349,7 @@ FmXGridControl::~FmXGridControl() } -Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) { Any aReturn = FmXGridControl_BASE::queryInterface(_rType); @@ -360,29 +359,29 @@ Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) throw (Runtime } -Sequence< Type> SAL_CALL FmXGridControl::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type> SAL_CALL FmXGridControl::getTypes( ) { return comphelper::concatSequences(UnoControl::getTypes(),FmXGridControl_BASE::getTypes()); } -Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId( ) throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName) throw(std::exception) +sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL FmXGridControl::getImplementationName() throw(std::exception) +OUString SAL_CALL FmXGridControl::getImplementationName() { return OUString("com.sun.star.form.FmXGridControl"); } -css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames() { Sequence< OUString > aServiceNames(2); aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL; @@ -391,7 +390,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames() } -void SAL_CALL FmXGridControl::dispose() throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::dispose() { SolarMutexGuard aGuard; @@ -412,7 +411,7 @@ OUString FmXGridControl::GetComponentServiceName() } -sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< css::awt::XControlModel >& rModel) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< css::awt::XControlModel >& rModel) { SolarMutexGuard aGuard; @@ -454,7 +453,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(vcl::Window* pParent) } -void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& /*rToolkit*/, const Reference< css::awt::XWindowPeer >& rParentPeer) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& /*rToolkit*/, const Reference< css::awt::XWindowPeer >& rParentPeer) { if ( !mxModel.is() ) throw DisposedException( OUString(), *this ); @@ -611,7 +610,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& } -void FmXGridControl::addModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception ) +void FmXGridControl::addModifyListener(const Reference< css::util::XModifyListener >& l) { m_aModifyListeners.addInterface( l ); if( getPeer().is() && m_aModifyListeners.getLength() == 1 ) @@ -622,7 +621,7 @@ void FmXGridControl::addModifyListener(const Reference< css::util::XModifyListen } -sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) { SolarMutexGuard aGuard; Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY); @@ -630,7 +629,7 @@ sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (Illega } -Any SAL_CALL FmXGridControl::getSelection( ) throw (RuntimeException, std::exception) +Any SAL_CALL FmXGridControl::getSelection( ) { SolarMutexGuard aGuard; Reference< XSelectionSupplier > xPeer(getPeer(), UNO_QUERY); @@ -638,7 +637,7 @@ Any SAL_CALL FmXGridControl::getSelection( ) throw (RuntimeException, std::exce } -void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) { m_aSelectionListeners.addInterface( _rxListener ); if( getPeer().is() && 1 == m_aSelectionListeners.getLength() ) @@ -649,7 +648,7 @@ void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSele } -void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) { if( getPeer().is() && 1 == m_aSelectionListeners.getLength() ) { @@ -660,7 +659,7 @@ void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XS } -Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xType ) throw(RuntimeException, std::exception) +Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xType ) { if (getPeer().is()) { @@ -673,7 +672,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xT } -Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException, std::exception) +Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const Type& xType ) { if (getPeer().is()) { @@ -686,7 +685,7 @@ Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const T } -void SAL_CALL FmXGridControl::removeModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::removeModifyListener(const Reference< css::util::XModifyListener >& l) { if( getPeer().is() && m_aModifyListeners.getLength() == 1 ) { @@ -697,7 +696,7 @@ void SAL_CALL FmXGridControl::removeModifyListener(const Reference< css::util::X } -void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) { SolarMutexGuard aGuard; m_bInDraw = true; @@ -706,7 +705,7 @@ void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeExc } -void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) { css::util::ModeChangeEvent aModeChangeEvent; @@ -758,7 +757,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio // XBoundComponent -void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener >& l) { m_aUpdateListeners.addInterface( l ); if( getPeer().is() && m_aUpdateListeners.getLength() == 1 ) @@ -769,7 +768,7 @@ void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener } -void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListener >& l) { if( getPeer().is() && m_aUpdateListeners.getLength() == 1 ) { @@ -780,7 +779,7 @@ void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListe } -sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXGridControl::commit() { Reference< XBoundComponent > xBound(getPeer(), UNO_QUERY); if (xBound.is()) @@ -791,7 +790,7 @@ sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException, std::excepti // XContainer -void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerListener >& l) { m_aContainerListeners.addInterface( l ); if( getPeer().is() && m_aContainerListeners.getLength() == 1 ) @@ -802,7 +801,7 @@ void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerLi } -void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContainerListener >& l) { if( getPeer().is() && m_aContainerListeners.getLength() == 1 ) { @@ -813,7 +812,7 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine } -Reference< css::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) +Reference< css::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) { Reference< css::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); if (xPeerProvider.is()) @@ -823,7 +822,7 @@ Reference< css::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const } -Sequence< Reference< css::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException, std::exception ) +Sequence< Reference< css::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts) { Reference< css::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); if (xPeerProvider.is()) @@ -833,7 +832,7 @@ Sequence< Reference< css::frame::XDispatch > > SAL_CALL FmXGridControl::queryDis } -void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) { Reference< css::frame::XDispatchProviderInterception > xPeerInterception(getPeer(), UNO_QUERY); if (xPeerInterception.is()) @@ -841,7 +840,7 @@ void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Referenc } -void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) { Reference< css::frame::XDispatchProviderInterception > xPeerInterception(getPeer(), UNO_QUERY); if (xPeerInterception.is()) @@ -849,7 +848,7 @@ void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference } -void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridControlListener >& _listener ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -863,7 +862,7 @@ void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridCont } -void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridControlListener >& _listener ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -878,14 +877,14 @@ void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridC } -sal_Int16 SAL_CALL FmXGridControl::getCurrentColumnPosition() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL FmXGridControl::getCurrentColumnPosition() { Reference< XGridControl > xGrid( getPeer(), UNO_QUERY ); return xGrid.is() ? xGrid->getCurrentColumnPosition() : -1; } -void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) { Reference< XGridControl > xGrid( getPeer(), UNO_QUERY ); if ( xGrid.is() ) @@ -897,21 +896,21 @@ void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( Ru // XElementAccess -sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXGridControl::hasElements() { Reference< XElementAccess > xPeer(getPeer(), UNO_QUERY); return xPeer.is() && xPeer->hasElements(); } -Type SAL_CALL FmXGridControl::getElementType( ) throw(RuntimeException, std::exception) +Type SAL_CALL FmXGridControl::getElementType( ) { return cppu::UnoType<css::awt::XTextComponent>::get(); } // XEnumerationAccess -Reference< XEnumeration > SAL_CALL FmXGridControl::createEnumeration() throw( RuntimeException, std::exception ) +Reference< XEnumeration > SAL_CALL FmXGridControl::createEnumeration() { Reference< XEnumerationAccess > xPeer(getPeer(), UNO_QUERY); if (xPeer.is()) @@ -922,14 +921,14 @@ Reference< XEnumeration > SAL_CALL FmXGridControl::createEnumeration() throw( R // XIndexAccess -sal_Int32 SAL_CALL FmXGridControl::getCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FmXGridControl::getCount() { Reference< XIndexAccess > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->getCount() : 0; } -Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) +Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) { Reference< XIndexAccess > xPeer(getPeer(), UNO_QUERY); if (!xPeer.is()) @@ -940,7 +939,7 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun // css::util::XModeSelector -void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::setMode(const OUString& Mode) { Reference< css::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); if (!xPeer.is()) @@ -950,21 +949,21 @@ void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportExce } -OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXGridControl::getMode() { Reference< css::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->getMode() : OUString(); } -css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception ) +css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedModes() { Reference< css::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->getSupportedModes() : css::uno::Sequence<OUString>(); } -sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) { Reference< css::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() && xPeer->supportsMode(Mode); @@ -1107,7 +1106,7 @@ FmXGridPeer* FmXGridPeer::getImplementation( const Reference< XInterface >& _rxI } -sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) { sal_Int64 nReturn(0); @@ -1125,7 +1124,7 @@ sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIden // XEventListener -void FmXGridPeer::disposing(const EventObject& e) throw( RuntimeException, std::exception ) +void FmXGridPeer::disposing(const EventObject& e) { using namespace ::com::sun::star::util; bool bKnownSender = false; @@ -1167,20 +1166,20 @@ using namespace ::com::sun::star::util; } -void FmXGridPeer::addModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception ) +void FmXGridPeer::addModifyListener(const Reference< css::util::XModifyListener >& l) { m_aModifyListeners.addInterface( l ); } -void FmXGridPeer::removeModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception ) +void FmXGridPeer::removeModifyListener(const Reference< css::util::XModifyListener >& l) { m_aModifyListeners.removeInterface( l ); } #define LAST_KNOWN_TYPE FormComponentType::PATTERNFIELD -Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType ) throw(RuntimeException, std::exception) +Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType ) { // eine 'Konvertierungstabelle' static const bool bCanConvert[LAST_KNOWN_TYPE][4] = @@ -1276,7 +1275,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType } -Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException, std::exception) +Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type& xType ) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); DBG_ASSERT(pGrid && pGrid->IsOpen(), "FmXGridPeer::queryFieldData : have no valid grid window !"); @@ -1364,7 +1363,7 @@ void FmXGridPeer::CellModified() // XPropertyChangeListener -void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception ) +void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) { SolarMutexGuard aGuard; // want to do a lot of VCL stuff here ... @@ -1477,19 +1476,19 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE // XBoundComponent -void FmXGridPeer::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException, std::exception ) +void FmXGridPeer::addUpdateListener(const Reference< XUpdateListener >& l) { m_aUpdateListeners.addInterface(l); } -void FmXGridPeer::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException, std::exception ) +void FmXGridPeer::removeUpdateListener(const Reference< XUpdateListener >& l) { m_aUpdateListeners.removeInterface(l); } -sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception ) +sal_Bool FmXGridPeer::commit() { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); if (!m_xCursor.is() || !pGrid) @@ -1511,7 +1510,7 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception ) } -void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeException, std::exception ) +void FmXGridPeer::cursorMoved(const EventObject& _rEvent) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); // we are not interested in move to insert row only in the resetted event @@ -1521,7 +1520,7 @@ void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeExceptio } -void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException, std::exception ) +void FmXGridPeer::rowChanged(const EventObject& _rEvent) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); if (pGrid && pGrid->IsOpen()) @@ -1534,7 +1533,7 @@ void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException } -void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception ) +void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) { // not interested in ... // (our parent is a form which means we get a loaded or reloaded after this rowSetChanged) @@ -1542,33 +1541,33 @@ void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) throw( RuntimeExce // XLoadListener -void FmXGridPeer::loaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) +void FmXGridPeer::loaded(const EventObject& /*rEvent*/) { updateGrid(m_xCursor); } -void FmXGridPeer::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) +void FmXGridPeer::unloaded(const EventObject& /*rEvent*/) { updateGrid( Reference< XRowSet > (nullptr) ); } -void FmXGridPeer::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void FmXGridPeer::reloading(const EventObject& /*aEvent*/) { // empty the grid updateGrid( Reference< XRowSet > (nullptr) ); } -void FmXGridPeer::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void FmXGridPeer::unloading(const EventObject& /*aEvent*/) { // empty the grid updateGrid( Reference< XRowSet > (nullptr) ); } -void FmXGridPeer::reloaded(const EventObject& aEvent) throw( RuntimeException, std::exception ) +void FmXGridPeer::reloaded(const EventObject& aEvent) { { const sal_Int32 cnt = m_xColumns->getCount(); @@ -1586,7 +1585,7 @@ void FmXGridPeer::reloaded(const EventObject& aEvent) throw( RuntimeException, s // XGridPeer -Reference< XIndexContainer > FmXGridPeer::getColumns() throw( RuntimeException, std::exception ) +Reference< XIndexContainer > FmXGridPeer::getColumns() { return m_xColumns; } @@ -1632,7 +1631,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) } -void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( RuntimeException, std::exception ) +void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) { SolarMutexGuard aGuard; @@ -1689,7 +1688,7 @@ void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( } -void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exception ) +void FmXGridPeer::setDesignMode(sal_Bool bOn) { if (bOn != isDesignMode()) { @@ -1705,7 +1704,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exce } -sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException, std::exception ) +sal_Bool FmXGridPeer::isDesignMode() { VclPtr<vcl::Window> pWin = GetWindow(); if (pWin) @@ -1715,7 +1714,7 @@ sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException, std::exception ) } -void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeException, std::exception ) +void FmXGridPeer::elementInserted(const ContainerEvent& evt) { SolarMutexGuard aGuard; @@ -1747,7 +1746,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep } -void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeException, std::exception ) +void FmXGridPeer::elementReplaced(const ContainerEvent& evt) { SolarMutexGuard aGuard; @@ -1802,7 +1801,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep } -void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeException, std::exception ) +void FmXGridPeer::elementRemoved(const ContainerEvent& evt) { SolarMutexGuard aGuard; @@ -1819,7 +1818,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept } -void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) throw( RuntimeException, std::exception ) +void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) { SolarMutexGuard aGuard; @@ -2031,7 +2030,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() } -Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException, std::exception ) +Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) { Any aProp; if (GetWindow()) @@ -2080,7 +2079,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc } -void FmXGridPeer::dispose() throw( RuntimeException, std::exception ) +void FmXGridPeer::dispose() { EventObject aEvt; aEvt.Source = static_cast< ::cppu::OWeakObject* >(this); @@ -2112,12 +2111,12 @@ void FmXGridPeer::dispose() throw( RuntimeException, std::exception ) // XContainer -void FmXGridPeer::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException, std::exception ) +void FmXGridPeer::addContainerListener(const Reference< XContainerListener >& l) { m_aContainerListeners.addInterface( l ); } -void FmXGridPeer::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException, std::exception ) +void FmXGridPeer::removeContainerListener(const Reference< XContainerListener >& l) { m_aContainerListeners.removeInterface( l ); } @@ -2178,13 +2177,13 @@ void FmXGridPeer::updateGrid(const Reference< XRowSet >& _rxCursor) } -Reference< XRowSet > FmXGridPeer::getRowSet() throw( RuntimeException, std::exception ) +Reference< XRowSet > FmXGridPeer::getRowSet() { return m_xCursor; } -void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw( RuntimeException, std::exception ) +void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); if (!pGrid || !m_xColumns.is() || !m_xColumns->getCount()) @@ -2221,26 +2220,26 @@ void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw( } -void SAL_CALL FmXGridPeer::addGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridPeer::addGridControlListener( const Reference< XGridControlListener >& _listener ) { m_aGridControlListeners.addInterface( _listener ); } -void SAL_CALL FmXGridPeer::removeGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridPeer::removeGridControlListener( const Reference< XGridControlListener >& _listener ) { m_aGridControlListeners.removeInterface( _listener ); } -sal_Int16 FmXGridPeer::getCurrentColumnPosition() throw( RuntimeException, std::exception ) +sal_Int16 FmXGridPeer::getCurrentColumnPosition() { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); return pGrid ? pGrid->GetViewColumnPos(pGrid->GetCurColumnId()) : -1; } -void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException, std::exception ) +void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); if (pGrid) @@ -2248,7 +2247,7 @@ void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeExcepti } -void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeException, std::exception ) +void FmXGridPeer::selectionChanged(const EventObject& evt) { SolarMutexGuard aGuard; @@ -2298,27 +2297,27 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeExcepti // XElementAccess -sal_Bool FmXGridPeer::hasElements() throw( RuntimeException, std::exception ) +sal_Bool FmXGridPeer::hasElements() { return getCount() != 0; } -Type SAL_CALL FmXGridPeer::getElementType( ) throw(RuntimeException, std::exception) +Type SAL_CALL FmXGridPeer::getElementType( ) { return cppu::UnoType<css::awt::XControl>::get(); } // XEnumerationAccess -Reference< XEnumeration > FmXGridPeer::createEnumeration() throw( RuntimeException, std::exception ) +Reference< XEnumeration > FmXGridPeer::createEnumeration() { return new ::comphelper::OEnumerationByIndex(this); } // XIndexAccess -sal_Int32 FmXGridPeer::getCount() throw( RuntimeException, std::exception ) +sal_Int32 FmXGridPeer::getCount() { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); if (pGrid) @@ -2328,7 +2327,7 @@ sal_Int32 FmXGridPeer::getCount() throw( RuntimeException, std::exception ) } -Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) +Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); if (_nIndex < 0 || @@ -2353,7 +2352,7 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, // css::util::XModeSelector -void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception ) +void FmXGridPeer::setMode(const OUString& Mode) { if (!supportsMode(Mode)) throw NoSupportException(); @@ -2374,13 +2373,13 @@ void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, Runti } -OUString FmXGridPeer::getMode() throw( RuntimeException, std::exception ) +OUString FmXGridPeer::getMode() { return m_aMode; } -css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes() throw( RuntimeException, std::exception ) +css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes() { static css::uno::Sequence<OUString> aModes; if (!aModes.getLength()) @@ -2394,7 +2393,7 @@ css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes() throw( RuntimeExce } -sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception ) +sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) { css::uno::Sequence<OUString> aModes(getSupportedModes()); const OUString* pModes = aModes.getConstArray(); @@ -2437,7 +2436,7 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn) } -void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std::exception ) +void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); EditBrowseBoxFlags nOldFlags = pGrid->GetBrowserFlags(); @@ -2449,7 +2448,7 @@ void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std: } -Reference< css::frame::XDispatch > FmXGridPeer::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) +Reference< css::frame::XDispatch > FmXGridPeer::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) { Reference< css::frame::XDispatch > xResult; @@ -2468,7 +2467,7 @@ Reference< css::frame::XDispatch > FmXGridPeer::queryDispatch(const css::util:: } -Sequence< Reference< css::frame::XDispatch > > FmXGridPeer::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException, std::exception ) +Sequence< Reference< css::frame::XDispatch > > FmXGridPeer::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts) { if (m_xFirstDispatchInterceptor.is()) return m_xFirstDispatchInterceptor->queryDispatches(aDescripts); @@ -2478,7 +2477,7 @@ Sequence< Reference< css::frame::XDispatch > > FmXGridPeer::queryDispatches(cons } -void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) +void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) { if (_xInterceptor.is()) { @@ -2507,7 +2506,7 @@ void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< css::fram } -void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) +void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) { if (!_xInterceptor.is()) return; @@ -2561,7 +2560,7 @@ void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< css::frame } -void FmXGridPeer::statusChanged(const css::frame::FeatureStateEvent& Event) throw( RuntimeException, std::exception ) +void FmXGridPeer::statusChanged(const css::frame::FeatureStateEvent& Event) { DBG_ASSERT(m_pStateCache, "FmXGridPeer::statusChanged : invalid call !"); DBG_ASSERT(m_pDispatchers, "FmXGridPeer::statusChanged : invalid call !"); @@ -2588,13 +2587,13 @@ void FmXGridPeer::statusChanged(const css::frame::FeatureStateEvent& Event) thro } -sal_Bool FmXGridPeer::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) +sal_Bool FmXGridPeer::approveReset(const EventObject& /*rEvent*/) { return true; } -sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) { Sequence< Any > aBookmarks; if ( !( _rSelection >>= aBookmarks ) ) @@ -2611,7 +2610,7 @@ sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalAr } -Any SAL_CALL FmXGridPeer::getSelection( ) throw (RuntimeException, std::exception) +Any SAL_CALL FmXGridPeer::getSelection( ) { VclPtr< FmGridControl > pVclControl = GetAs< FmGridControl >(); Sequence< Any > aSelectionBookmarks = pVclControl->getSelectionBookmarks(); @@ -2619,19 +2618,19 @@ Any SAL_CALL FmXGridPeer::getSelection( ) throw (RuntimeException, std::excepti } -void SAL_CALL FmXGridPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) { m_aSelectionListeners.addInterface( _rxListener ); } -void SAL_CALL FmXGridPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) { m_aSelectionListeners.removeInterface( _rxListener ); } -void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException, std::exception ) +void FmXGridPeer::resetted(const EventObject& rEvent) { if (m_xColumns == rEvent.Source) { // my model was reset -> refresh the grid content diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 0ec4156755a6..2195b90708dd 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -645,7 +645,7 @@ void DbCellControl::implAdjustGenericFieldSetting( const Reference< XPropertySet } -void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException) +void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) { SolarMutexGuard aGuard; @@ -1443,7 +1443,7 @@ CellControllerRef DbFormattedField::CreateController() const } -void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException ) +void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) { if (_rEvent.PropertyName == FM_PROP_FORMATKEY ) { @@ -2394,7 +2394,7 @@ DbComboBox::DbComboBox(DbGridColumn& _rColumn) } -void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException ) +void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) { if ( _rEvent.PropertyName == FM_PROP_STRINGITEMLIST ) { @@ -2513,7 +2513,7 @@ DbListBox::DbListBox(DbGridColumn& _rColumn) } -void DbListBox::_propertyChanged( const css::beans::PropertyChangeEvent& _rEvent ) throw( RuntimeException ) +void DbListBox::_propertyChanged( const css::beans::PropertyChangeEvent& _rEvent ) { if ( _rEvent.PropertyName == FM_PROP_STRINGITEMLIST ) { @@ -3174,7 +3174,7 @@ void FmXGridCell::SetTextLineColor(const Color& _rColor) // XTypeProvider -Sequence< Type > SAL_CALL FmXGridCell::getTypes( ) throw (RuntimeException, std::exception) +Sequence< Type > SAL_CALL FmXGridCell::getTypes( ) { Sequence< uno::Type > aTypes = ::comphelper::concatSequences( ::cppu::OComponentHelper::getTypes(), @@ -3208,7 +3208,7 @@ void FmXGridCell::disposing() } -Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType ) { Any aReturn = OComponentHelper::queryAggregation( _rType ); @@ -3223,13 +3223,13 @@ Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType ) throw // css::awt::XControl -Reference< XInterface > FmXGridCell::getContext() throw( RuntimeException, std::exception ) +Reference< XInterface > FmXGridCell::getContext() { return Reference< XInterface > (); } -Reference< css::awt::XControlModel > FmXGridCell::getModel() throw( css::uno::RuntimeException, std::exception ) +Reference< css::awt::XControlModel > FmXGridCell::getModel() { checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< css::awt::XControlModel > (m_pColumn->getModel(), UNO_QUERY); @@ -3237,14 +3237,14 @@ Reference< css::awt::XControlModel > FmXGridCell::getModel() throw( css::uno::R // css::form::XBoundControl -sal_Bool FmXGridCell::getLock() throw( RuntimeException, std::exception ) +sal_Bool FmXGridCell::getLock() { checkDisposed(OComponentHelper::rBHelper.bDisposed); return m_pColumn->isLocked(); } -void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException, std::exception ) +void FmXGridCell::setLock(sal_Bool _bLock) { checkDisposed(OComponentHelper::rBHelper.bDisposed); if (getLock() == _bLock) @@ -3257,119 +3257,119 @@ void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException, std::excepti } -void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int16 ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int16 ) { OSL_FAIL( "FmXGridCell::setPosSize: not implemented" ); // not allowed to tamper with this for a grid cell } -awt::Rectangle SAL_CALL FmXGridCell::getPosSize( ) throw (RuntimeException, std::exception) +awt::Rectangle SAL_CALL FmXGridCell::getPosSize( ) { OSL_FAIL( "FmXGridCell::getPosSize: not implemented" ); return awt::Rectangle(); } -void SAL_CALL FmXGridCell::setVisible( sal_Bool ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::setVisible( sal_Bool ) { OSL_FAIL( "FmXGridCell::setVisible: not implemented" ); // not allowed to tamper with this for a grid cell } -void SAL_CALL FmXGridCell::setEnable( sal_Bool ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::setEnable( sal_Bool ) { OSL_FAIL( "FmXGridCell::setEnable: not implemented" ); // not allowed to tamper with this for a grid cell } -void SAL_CALL FmXGridCell::setFocus( ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::setFocus( ) { OSL_FAIL( "FmXGridCell::setFocus: not implemented" ); // not allowed to tamper with this for a grid cell } -void SAL_CALL FmXGridCell::addWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::addWindowListener( const Reference< awt::XWindowListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aWindowListeners.addInterface( _rxListener ); } -void SAL_CALL FmXGridCell::removeWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::removeWindowListener( const Reference< awt::XWindowListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aWindowListeners.removeInterface( _rxListener ); } -void SAL_CALL FmXGridCell::addFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::addFocusListener( const Reference< awt::XFocusListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aFocusListeners.addInterface( _rxListener ); } -void SAL_CALL FmXGridCell::removeFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::removeFocusListener( const Reference< awt::XFocusListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aFocusListeners.removeInterface( _rxListener ); } -void SAL_CALL FmXGridCell::addKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::addKeyListener( const Reference< awt::XKeyListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aKeyListeners.addInterface( _rxListener ); } -void SAL_CALL FmXGridCell::removeKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::removeKeyListener( const Reference< awt::XKeyListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aKeyListeners.removeInterface( _rxListener ); } -void SAL_CALL FmXGridCell::addMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::addMouseListener( const Reference< awt::XMouseListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aMouseListeners.addInterface( _rxListener ); } -void SAL_CALL FmXGridCell::removeMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::removeMouseListener( const Reference< awt::XMouseListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aMouseListeners.removeInterface( _rxListener ); } -void SAL_CALL FmXGridCell::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aMouseMotionListeners.addInterface( _rxListener ); } -void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aMouseMotionListeners.removeInterface( _rxListener ); } -void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener ) { OSL_FAIL( "FmXGridCell::addPaintListener: not implemented" ); (void)_rxListener; } -void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener ) { OSL_FAIL( "FmXGridCell::removePaintListener: not implemented" ); (void)_rxListener; @@ -3608,7 +3608,7 @@ void FmXEditCell::disposing() } -Any SAL_CALL FmXEditCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXEditCell::queryAggregation( const css::uno::Type& _rType ) { Any aReturn = FmXTextCell::queryAggregation( _rType ); @@ -3619,7 +3619,7 @@ Any SAL_CALL FmXEditCell::queryAggregation( const css::uno::Type& _rType ) throw } -Sequence< css::uno::Type > SAL_CALL FmXEditCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL FmXEditCell::getTypes( ) { return ::comphelper::concatSequences( FmXTextCell::getTypes(), @@ -3632,19 +3632,19 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( FmXEditCell ) // css::awt::XTextComponent -void SAL_CALL FmXEditCell::addTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::addTextListener(const Reference< css::awt::XTextListener >& l) { m_aTextListeners.addInterface( l ); } -void SAL_CALL FmXEditCell::removeTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::removeTextListener(const Reference< css::awt::XTextListener >& l) { m_aTextListeners.removeInterface( l ); } -void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::setText( const OUString& aText ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3659,7 +3659,7 @@ void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeExcept } -void SAL_CALL FmXEditCell::insertText(const css::awt::Selection& rSel, const OUString& aText) throw(RuntimeException, std::exception) +void SAL_CALL FmXEditCell::insertText(const css::awt::Selection& rSel, const OUString& aText) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3671,7 +3671,7 @@ void SAL_CALL FmXEditCell::insertText(const css::awt::Selection& rSel, const OUS } -OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXEditCell::getText() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3695,7 +3695,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception } -OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXEditCell::getSelectedText() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3709,7 +3709,7 @@ OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::e } -void SAL_CALL FmXEditCell::setSelection( const css::awt::Selection& aSelection ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::setSelection( const css::awt::Selection& aSelection ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3718,7 +3718,7 @@ void SAL_CALL FmXEditCell::setSelection( const css::awt::Selection& aSelection ) } -css::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException, std::exception ) +css::awt::Selection SAL_CALL FmXEditCell::getSelection() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3730,7 +3730,7 @@ css::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException } -sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXEditCell::isEditable() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3738,7 +3738,7 @@ sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::except } -void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3747,7 +3747,7 @@ void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) throw( RuntimeExcep } -sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3755,7 +3755,7 @@ sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() throw( RuntimeException, std::ex } -void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3764,13 +3764,13 @@ void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeExcepti } -void SAL_CALL FmXEditCell::addChangeListener( const Reference< form::XChangeListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXEditCell::addChangeListener( const Reference< form::XChangeListener >& Listener ) { m_aChangeListeners.addInterface( Listener ); } -void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeListener >& Listener ) { m_aChangeListeners.removeInterface( Listener ); } @@ -3853,7 +3853,7 @@ void FmXCheckBoxCell::disposing() } -Any SAL_CALL FmXCheckBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXCheckBoxCell::queryAggregation( const css::uno::Type& _rType ) { Any aReturn = FmXDataCell::queryAggregation( _rType ); @@ -3864,7 +3864,7 @@ Any SAL_CALL FmXCheckBoxCell::queryAggregation( const css::uno::Type& _rType ) t } -Sequence< css::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes( ) { return ::comphelper::concatSequences( FmXDataCell::getTypes(), @@ -3876,19 +3876,19 @@ Sequence< css::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes( ) throw(RuntimeE IMPLEMENT_GET_IMPLEMENTATION_ID( FmXCheckBoxCell ) -void SAL_CALL FmXCheckBoxCell::addItemListener( const Reference< css::awt::XItemListener >& l ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXCheckBoxCell::addItemListener( const Reference< css::awt::XItemListener >& l ) { m_aItemListeners.addInterface( l ); } -void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< css::awt::XItemListener >& l ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< css::awt::XItemListener >& l ) { m_aItemListeners.removeInterface( l ); } -void SAL_CALL FmXCheckBoxCell::setState( short n ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXCheckBoxCell::setState( short n ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3900,7 +3900,7 @@ void SAL_CALL FmXCheckBoxCell::setState( short n ) throw( RuntimeException, std: } -short SAL_CALL FmXCheckBoxCell::getState() throw( RuntimeException, std::exception ) +short SAL_CALL FmXCheckBoxCell::getState() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3913,7 +3913,7 @@ short SAL_CALL FmXCheckBoxCell::getState() throw( RuntimeException, std::excepti } -void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3922,19 +3922,19 @@ void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeExcept } -void SAL_CALL FmXCheckBoxCell::addActionListener( const Reference< awt::XActionListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXCheckBoxCell::addActionListener( const Reference< awt::XActionListener >& Listener ) { m_aActionListeners.addInterface( Listener ); } -void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActionListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActionListener >& Listener ) { m_aActionListeners.removeInterface( Listener ); } -void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& Label ) throw (RuntimeException, std::exception) +void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& Label ) { SolarMutexGuard aGuard; if ( m_pColumn ) @@ -3945,7 +3945,7 @@ void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& Label ) throw (RuntimeE } -void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& Command ) throw (RuntimeException, std::exception) +void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& Command ) { m_aActionCommand = Command; } @@ -4030,7 +4030,7 @@ void FmXListBoxCell::disposing() } -Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType ) { Any aReturn = FmXTextCell::queryAggregation(_rType); @@ -4041,7 +4041,7 @@ Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType ) th } -Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes( ) { return ::comphelper::concatSequences( FmXTextCell::getTypes(), @@ -4053,31 +4053,31 @@ Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes( ) throw(RuntimeEx IMPLEMENT_GET_IMPLEMENTATION_ID( FmXListBoxCell ) -void SAL_CALL FmXListBoxCell::addItemListener(const Reference< css::awt::XItemListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::addItemListener(const Reference< css::awt::XItemListener >& l) { m_aItemListeners.addInterface( l ); } -void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< css::awt::XItemListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< css::awt::XItemListener >& l) { m_aItemListeners.removeInterface( l ); } -void SAL_CALL FmXListBoxCell::addActionListener(const Reference< css::awt::XActionListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::addActionListener(const Reference< css::awt::XActionListener >& l) { m_aActionListeners.addInterface( l ); } -void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< css::awt::XActionListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< css::awt::XActionListener >& l) { m_aActionListeners.removeInterface( l ); } -void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) { ::osl::MutexGuard aGuard( m_aMutex ); if (m_pBox) @@ -4085,7 +4085,7 @@ void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) thr } -void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItems, sal_Int16 nPos) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItems, sal_Int16 nPos) { ::osl::MutexGuard aGuard( m_aMutex ); if (m_pBox) @@ -4101,7 +4101,7 @@ void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItem } -void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pBox ) @@ -4112,20 +4112,20 @@ void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) thro } -sal_Int16 SAL_CALL FmXListBoxCell::getItemCount() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL FmXListBoxCell::getItemCount() { ::osl::MutexGuard aGuard( m_aMutex ); return m_pBox ? m_pBox->GetEntryCount() : 0; } -OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString(); } -css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException, std::exception ) +css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4144,7 +4144,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() throw( RuntimeE } -sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() { ::osl::MutexGuard aGuard( m_aMutex ); if (m_pBox) @@ -4159,7 +4159,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() throw( RuntimeException, } -Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( RuntimeException, std::exception ) +Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() { ::osl::MutexGuard aGuard( m_aMutex ); Sequence<sal_Int16> aSeq; @@ -4175,7 +4175,7 @@ Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( Runt return aSeq; } -OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXListBoxCell::getSelectedItem() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4191,7 +4191,7 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException, std } -css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException, std::exception ) +css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4209,7 +4209,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() throw( } -void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4218,7 +4218,7 @@ void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) th } -void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4230,7 +4230,7 @@ void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPosit } -void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4239,7 +4239,7 @@ void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect } -sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4250,7 +4250,7 @@ sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException, std:: } -void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4259,7 +4259,7 @@ void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) throw( RuntimeExc } -sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4271,7 +4271,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() throw( RuntimeExceptio } -void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4280,7 +4280,7 @@ void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Runt } -void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4358,7 +4358,7 @@ void FmXComboBoxCell::disposing() } -Any SAL_CALL FmXComboBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXComboBoxCell::queryAggregation( const css::uno::Type& _rType ) { Any aReturn = FmXTextCell::queryAggregation(_rType); @@ -4369,7 +4369,7 @@ Any SAL_CALL FmXComboBoxCell::queryAggregation( const css::uno::Type& _rType ) t } -Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes( ) { return ::comphelper::concatSequences( FmXTextCell::getTypes(), @@ -4381,31 +4381,31 @@ Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes( ) throw(RuntimeException, IMPLEMENT_GET_IMPLEMENTATION_ID( FmXComboBoxCell ) -void SAL_CALL FmXComboBoxCell::addItemListener(const Reference< awt::XItemListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXComboBoxCell::addItemListener(const Reference< awt::XItemListener >& l) { m_aItemListeners.addInterface( l ); } -void SAL_CALL FmXComboBoxCell::removeItemListener(const Reference< awt::XItemListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXComboBoxCell::removeItemListener(const Reference< awt::XItemListener >& l) { m_aItemListeners.removeInterface( l ); } -void SAL_CALL FmXComboBoxCell::addActionListener(const Reference< awt::XActionListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXComboBoxCell::addActionListener(const Reference< awt::XActionListener >& l) { m_aActionListeners.addInterface( l ); } -void SAL_CALL FmXComboBoxCell::removeActionListener(const Reference< awt::XActionListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXComboBoxCell::removeActionListener(const Reference< awt::XActionListener >& l) { m_aActionListeners.removeInterface( l ); } -void SAL_CALL FmXComboBoxCell::addItem( const OUString& Item, sal_Int16 Pos ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXComboBoxCell::addItem( const OUString& Item, sal_Int16 Pos ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pComboBox ) @@ -4413,7 +4413,7 @@ void SAL_CALL FmXComboBoxCell::addItem( const OUString& Item, sal_Int16 Pos ) th } -void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& Items, sal_Int16 Pos ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& Items, sal_Int16 Pos ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pComboBox ) @@ -4429,7 +4429,7 @@ void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& Items, sal_ } -void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 Pos, sal_Int16 Count ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 Pos, sal_Int16 Count ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pComboBox ) @@ -4440,20 +4440,20 @@ void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 Pos, sal_Int16 Count ) thr } -sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount() { ::osl::MutexGuard aGuard( m_aMutex ); return m_pComboBox ? m_pComboBox->GetEntryCount() : 0; } -OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 Pos ) throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 Pos ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pComboBox ? OUString(m_pComboBox->GetEntry(Pos)) : OUString(); } -Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4470,7 +4470,7 @@ Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeExceptio } -sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4482,7 +4482,7 @@ sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() throw( RuntimeExcepti } -void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( RuntimeException, std::exception ) +void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pComboBox ) @@ -4538,7 +4538,7 @@ FmXFilterCell::~FmXFilterCell() // XUnoTunnel -sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) { sal_Int64 nReturn(0); @@ -4581,7 +4581,7 @@ void FmXFilterCell::disposing() } -Any SAL_CALL FmXFilterCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXFilterCell::queryAggregation( const css::uno::Type& _rType ) { Any aReturn = FmXGridCell::queryAggregation(_rType); @@ -4592,7 +4592,7 @@ Any SAL_CALL FmXFilterCell::queryAggregation( const css::uno::Type& _rType ) thr } -Sequence< css::uno::Type > SAL_CALL FmXFilterCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL FmXFilterCell::getTypes( ) { return ::comphelper::concatSequences( FmXGridCell::getTypes(), @@ -4605,72 +4605,72 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( FmXFilterCell ) // css::awt::XTextComponent -void SAL_CALL FmXFilterCell::addTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::addTextListener(const Reference< css::awt::XTextListener >& l) { m_aTextListeners.addInterface( l ); } -void SAL_CALL FmXFilterCell::removeTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::removeTextListener(const Reference< css::awt::XTextListener >& l) { m_aTextListeners.removeInterface( l ); } -void SAL_CALL FmXFilterCell::setText( const OUString& aText ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::setText( const OUString& aText ) { ::osl::MutexGuard aGuard( m_aMutex ); static_cast<DbFilterField*>(m_pCellControl)->SetText(aText); } -void SAL_CALL FmXFilterCell::insertText( const css::awt::Selection& /*rSel*/, const OUString& /*aText*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::insertText( const css::awt::Selection& /*rSel*/, const OUString& /*aText*/ ) { } -OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXFilterCell::getText() { ::osl::MutexGuard aGuard( m_aMutex ); return static_cast<DbFilterField*>(m_pCellControl)->GetText(); } -OUString SAL_CALL FmXFilterCell::getSelectedText() throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXFilterCell::getSelectedText() { return getText(); } -void SAL_CALL FmXFilterCell::setSelection( const css::awt::Selection& /*aSelection*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::setSelection( const css::awt::Selection& /*aSelection*/ ) { } -css::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeException, std::exception ) +css::awt::Selection SAL_CALL FmXFilterCell::getSelection() { return css::awt::Selection(); } -sal_Bool SAL_CALL FmXFilterCell::isEditable() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXFilterCell::isEditable() { return true; } -void SAL_CALL FmXFilterCell::setEditable( sal_Bool /*bEditable*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::setEditable( sal_Bool /*bEditable*/ ) { } -sal_Int16 SAL_CALL FmXFilterCell::getMaxTextLen() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL FmXFilterCell::getMaxTextLen() { return 0; } -void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) { } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 75516618b595..f901dd3d5ab8 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -97,10 +97,10 @@ public: private: // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& /*i_aEvt*/) throw ( RuntimeException, std::exception ) override + virtual void SAL_CALL disposing(const css::lang::EventObject& /*i_aEvt*/) override { } - virtual void SAL_CALL rowsChanged(const css::sdb::RowsChangeEvent& i_aEvt) throw ( RuntimeException, std::exception ) override + virtual void SAL_CALL rowsChanged(const css::sdb::RowsChangeEvent& i_aEvt) override { if ( i_aEvt.Action == RowChangeAction::UPDATE ) { @@ -138,7 +138,7 @@ public: GridFieldValueListener(DbGridControl& _rParent, const Reference< XPropertySet >& xField, sal_uInt16 _nId); virtual ~GridFieldValueListener() override; - virtual void _propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ) override; + virtual void _propertyChanged(const PropertyChangeEvent& evt) override; void suspend() { ++m_nSuspended; } void resume() { --m_nSuspended; } @@ -165,7 +165,7 @@ GridFieldValueListener::~GridFieldValueListener() dispose(); } -void GridFieldValueListener::_propertyChanged(const PropertyChangeEvent& _evt) throw( RuntimeException ) +void GridFieldValueListener::_propertyChanged(const PropertyChangeEvent& _evt) { DBG_ASSERT(m_nSuspended>=0, "GridFieldValueListener::_propertyChanged : resume > suspend !"); if (m_nSuspended <= 0) @@ -199,7 +199,7 @@ public: DisposeListenerGridBridge( DbGridControl& _rParent, const Reference< XComponent >& _rxObject); virtual ~DisposeListenerGridBridge() override; - virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) throw( RuntimeException ) override { m_rParent.disposing(_nId, _rEvent); } + virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) override { m_rParent.disposing(_nId, _rEvent); } }; DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject) @@ -254,7 +254,7 @@ public: void suspend() { ++m_nSuspended; } void resume() { --m_nSuspended; } - virtual void _propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception ) override; + virtual void _propertyChanged(const PropertyChangeEvent& evt) override; }; FmXGridSourcePropListener::FmXGridSourcePropListener(DbGridControl* _pParent) @@ -265,7 +265,7 @@ FmXGridSourcePropListener::FmXGridSourcePropListener(DbGridControl* _pParent) DBG_ASSERT(m_pParent, "FmXGridSourcePropListener::FmXGridSourcePropListener : invalid parent !"); } -void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception ) +void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt) { DBG_ASSERT(m_nSuspended>=0, "FmXGridSourcePropListener::_propertyChanged : resume > suspend !"); if (m_nSuspended <= 0) @@ -2732,7 +2732,7 @@ void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const PopupMe } } -void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception ) +void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) { SAL_INFO("svx.fmcomp", "DbGridControl::DataSourcePropertyChanged"); SolarMutexGuard aGuard; diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx index 813f51a73612..7b50b9f065d7 100644 --- a/svx/source/form/datalistener.cxx +++ b/svx/source/form/datalistener.cxx @@ -45,23 +45,23 @@ namespace svxform } // XContainerListener - void SAL_CALL DataListener::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DataListener::elementInserted( const ContainerEvent& /*Event*/ ) { m_pNaviWin->NotifyChanges(); } - void SAL_CALL DataListener::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DataListener::elementRemoved( const ContainerEvent& /*Event*/ ) { m_pNaviWin->NotifyChanges(); } - void SAL_CALL DataListener::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DataListener::elementReplaced( const ContainerEvent& /*Event*/ ) { m_pNaviWin->NotifyChanges(); } // XFrameActionListener - void SAL_CALL DataListener::frameAction( const FrameActionEvent& rActionEvt ) throw (RuntimeException, std::exception) + void SAL_CALL DataListener::frameAction( const FrameActionEvent& rActionEvt ) { if ( FrameAction_COMPONENT_ATTACHED == rActionEvt.Action || FrameAction_COMPONENT_REATTACHED == rActionEvt.Action ) @@ -71,13 +71,13 @@ namespace svxform } // xml::dom::events::XEventListener - void SAL_CALL DataListener::handleEvent( const Reference< XEvent >& /*evt*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DataListener::handleEvent( const Reference< XEvent >& /*evt*/ ) { m_pNaviWin->NotifyChanges(); } // lang::XEventListener - void SAL_CALL DataListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DataListener::disposing( const EventObject& /*Source*/ ) { SAL_WARN( "svx.form", "disposing" ); } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 3c1116a83494..374324049f97 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -242,16 +242,16 @@ public: FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexAccess >& xControllers); // XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const EventObject& Source) override; // XFilterControllerListener - virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& Event ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& Event ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& Event ) override; + virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& Event ) override; + virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& Event ) override; // helpers /// @throws RuntimeException - void dispose() throw( RuntimeException ); + void dispose(); void AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd ); @@ -269,7 +269,7 @@ FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexA } -void FmFilterAdapter::dispose() throw( RuntimeException ) +void FmFilterAdapter::dispose() { AddOrRemoveListener( m_xControllers, false ); } @@ -318,7 +318,7 @@ void FmFilterAdapter::setText(sal_Int32 nRowPos, // XEventListener -void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( RuntimeException, std::exception ) +void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) { } @@ -358,7 +358,7 @@ namespace // XFilterControllerListener -void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) throw( RuntimeException, std::exception ) +void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) { SolarMutexGuard aGuard; @@ -409,7 +409,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) thr } -void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event ) throw (RuntimeException, std::exception) +void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event ) { SolarMutexGuard aGuard; @@ -444,7 +444,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event } -void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event ) throw (RuntimeException, std::exception) +void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event ) { SolarMutexGuard aGuard; diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index a3c96f8fdc9c..32700e9d70f3 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -28,7 +28,7 @@ using namespace ::svxform; -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier) { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; if ( rServiceSpecifier.startsWith( "com.sun.star.form.component." ) ) @@ -47,7 +47,7 @@ using namespace ::svxform; } -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() { static const OUStringLiteral aSvxComponentServiceNameList[] = { diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 8ce3e23b3ab9..8d87f611b368 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -38,12 +38,12 @@ SvxFmDrawPage::~SvxFmDrawPage() throw () { } -css::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) { Any aRet = ::cppu::queryInterface ( _rType , static_cast< XFormsSupplier2* >( this ) @@ -55,7 +55,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) thr return aRet; } -css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) { css::uno::Sequence< css::uno::Type > aTypes(SvxDrawPage::getTypes()); aTypes.realloc(aTypes.getLength() + 1); @@ -66,7 +66,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw( } SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xDescr ) - throw (css::uno::RuntimeException, std::exception) { OUString aShapeType( xDescr->getShapeType() ); @@ -80,7 +79,6 @@ SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::draw } css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::CreateShape( SdrObject *pObj ) const - throw (css::uno::RuntimeException, std::exception) { if( SdrInventor::FmForm == pObj->GetObjInventor() ) { @@ -92,7 +90,7 @@ css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::CreateShape( SdrObje } // XFormsSupplier -css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( css::uno::RuntimeException, std::exception ) +css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() { css::uno::Reference< css::container::XNameContainer > xForms; @@ -104,7 +102,7 @@ css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::ge } // XFormsSupplier2 -sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxFmDrawPage::hasForms() { bool bHas = false; FmFormPage* pFormPage = dynamic_cast<FmFormPage*>( GetSdrPage() ); diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 59b8c209f695..0c39405586d8 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -73,7 +73,7 @@ namespace svxform } - void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans ) throw(RuntimeException, std::exception) + void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans ) { TransferableHelper::implCallOwnLostOwnership( _rxClipboard, _rxTrans ); m_bClipboardOwner = false; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 9f12a2ad9c53..b58c364e661d 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -88,10 +88,10 @@ namespace svxform explicit FormScriptListener( FormScriptingEnvironment * pScriptExecutor ); // XScriptListener - virtual void SAL_CALL firing( const ScriptEvent& aEvent ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL approveFiring( const ScriptEvent& aEvent ) throw (InvocationTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL firing( const ScriptEvent& aEvent ) override; + virtual Any SAL_CALL approveFiring( const ScriptEvent& aEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; // lifetime control void SAL_CALL dispose(); @@ -722,7 +722,7 @@ namespace svxform } - void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) { if ( _rEvent.ScriptType == "VBAInterop" ) return; // not handled here @@ -743,7 +743,7 @@ namespace svxform } - Any SAL_CALL FormScriptListener::approveFiring( const ScriptEvent& _rEvent ) throw (InvocationTargetException, RuntimeException, std::exception) + Any SAL_CALL FormScriptListener::approveFiring( const ScriptEvent& _rEvent ) { Any aResult; @@ -755,7 +755,7 @@ namespace svxform } - void SAL_CALL FormScriptListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL FormScriptListener::disposing( const EventObject& /*Source*/ ) { // not interested in } @@ -785,8 +785,7 @@ namespace svxform bool mbQuitBlocked; public: // XTerminateListener - virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/) - throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/) override { mbQuitBlocked = true; #if HAVE_FEATURE_SCRIPTING @@ -795,16 +794,14 @@ namespace svxform throw css::frame::TerminationVetoException(); } - virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/) - throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/) override { mbQuitBlocked = false; } using cppu::WeakComponentImplHelperBase::disposing; - virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override { const bool bShutDown = (rEvent.Source == m_xDesktop); if (bShutDown && m_xDesktop.is()) @@ -815,20 +812,17 @@ namespace svxform } // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.svx.StarBasicQuitGuard"); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { css::uno::Sequence<OUString> aSeq { "com.sun.star.svx.StarBasicQuitGuard" }; return aSeq; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 218adc06c597..4db230f93b1a 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -733,7 +733,7 @@ bool FmXFormShell::IsReadonlyDoc() const // EventListener -void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) { if (m_xActiveController == e.Source) @@ -771,7 +771,7 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime } -void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) { if ( impl_checkDisposed() ) return; @@ -836,7 +836,7 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu } -void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent) { if ( impl_checkDisposed() ) return; @@ -847,7 +847,7 @@ void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent) throw } -void SAL_CALL FmXFormShell::formDeactivated(const lang::EventObject& rEvent) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormShell::formDeactivated(const lang::EventObject& rEvent) { if ( impl_checkDisposed() ) return; @@ -2486,7 +2486,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextIn // XContainerListener -void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) +void FmXFormShell::elementInserted(const ContainerEvent& evt) { if ( impl_checkDisposed() ) return; @@ -2501,7 +2501,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(css::uno::Ru } -void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) +void FmXFormShell::elementReplaced(const ContainerEvent& evt) { if ( impl_checkDisposed() ) return; @@ -2514,7 +2514,7 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(css::uno::Ru } -void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) +void FmXFormShell::elementRemoved(const ContainerEvent& evt) { if ( impl_checkDisposed() ) return; @@ -2622,7 +2622,7 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem } -void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) +void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) { if ( impl_checkDisposed() ) return; diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 10a9b75a8b00..1e1d3aa337c5 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -111,7 +111,7 @@ void FmRecordCountListener::DisConnect() } -void SAL_CALL FmRecordCountListener::disposing(const css::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception ) +void SAL_CALL FmRecordCountListener::disposing(const css::lang::EventObject& /*Source*/) { DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::disposing should never have been called without a propset !"); DisConnect(); @@ -129,7 +129,7 @@ void FmRecordCountListener::NotifyCurrentCount() } -void FmRecordCountListener::propertyChange(const css::beans::PropertyChangeEvent& /*evt*/) throw(css::uno::RuntimeException, std::exception) +void FmRecordCountListener::propertyChange(const css::beans::PropertyChangeEvent& /*evt*/) { NotifyCurrentCount(); } diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index feea0056f88b..4f1d69215730 100644 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -81,7 +81,7 @@ namespace svx } - void SAL_CALL FmTextControlFeature::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException, std::exception) + void SAL_CALL FmTextControlFeature::statusChanged( const FeatureStateEvent& _rState ) { m_aFeatureState = _rState.State; m_bFeatureEnabled = _rState.IsEnabled; @@ -91,7 +91,7 @@ namespace svx } - void SAL_CALL FmTextControlFeature::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL FmTextControlFeature::disposing( const EventObject& /*Source*/ ) { // nothing to do } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 3f170ff0c61a..724a831188b8 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -177,9 +177,9 @@ namespace svx virtual ~FmFocusListenerAdapter() override; protected: - virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; }; @@ -223,21 +223,21 @@ namespace svx } - void SAL_CALL FmFocusListenerAdapter::focusGained( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) + void SAL_CALL FmFocusListenerAdapter::focusGained( const css::awt::FocusEvent& e ) { if ( m_pObserver ) m_pObserver->focusGained( e ); } - void SAL_CALL FmFocusListenerAdapter::focusLost( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) + void SAL_CALL FmFocusListenerAdapter::focusLost( const css::awt::FocusEvent& e ) { if ( m_pObserver ) m_pObserver->focusLost( e ); } - void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) + void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source ) { (void)Source; DBG_ASSERT( Source.Source == m_xWindow, "FmFocusListenerAdapter::disposing: where did this come from?" ); @@ -262,11 +262,11 @@ namespace svx virtual ~FmMouseListenerAdapter() override; protected: - virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; }; FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IContextRequestObserver* _pObserver ) @@ -309,7 +309,7 @@ namespace svx } - void SAL_CALL FmMouseListenerAdapter::mousePressed( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mousePressed( const css::awt::MouseEvent& _rEvent ) { SolarMutexGuard aGuard; // is this a request for a context menu? @@ -321,25 +321,25 @@ namespace svx } - void SAL_CALL FmMouseListenerAdapter::mouseReleased( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseReleased( const css::awt::MouseEvent& /*e*/ ) { // not interested in } - void SAL_CALL FmMouseListenerAdapter::mouseEntered( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseEntered( const css::awt::MouseEvent& /*e*/ ) { // not interested in } - void SAL_CALL FmMouseListenerAdapter::mouseExited( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseExited( const css::awt::MouseEvent& /*e*/ ) { // not interested in } - void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source ) { (void)Source; DBG_ASSERT( Source.Source == m_xWindow, "FmMouseListenerAdapter::disposing: where did this come from?" ); diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 1c4805299b8a..8555605d170d 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -300,7 +300,7 @@ FmXDisposeMultiplexer::~FmXDisposeMultiplexer() // css::lang::XEventListener -void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source) throw( RuntimeException, std::exception ) +void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source) { Reference< css::lang::XEventListener> xPreventDelete(this); diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 6963b0db8cee..3ae443c30f74 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -79,17 +79,17 @@ class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener { public: /// @throws css::uno::RuntimeException - explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException ) + explicit ScriptEventListenerWrapper( FmFormModel& _rModel) :m_rModel( _rModel ) ,m_attemptedListenerCreation( false ) { } // XEventListener - virtual void SAL_CALL disposing(const EventObject& ) throw( RuntimeException, std::exception ) override {} + virtual void SAL_CALL disposing(const EventObject& ) override {} // XScriptListener - virtual void SAL_CALL firing(const ScriptEvent& evt) throw(RuntimeException, std::exception) override + virtual void SAL_CALL firing(const ScriptEvent& evt) override { attemptListenerCreation(); if ( m_vbaListener.is() ) @@ -98,7 +98,7 @@ public: } } - virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( css::reflection::InvocationTargetException, RuntimeException, std::exception) override + virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) override { attemptListenerCreation(); if ( m_vbaListener.is() ) @@ -509,7 +509,7 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj) // XEventListener -void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException, std::exception ) +void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) { // check if it's an object we have cached information about if (m_pPropertySetCache) @@ -527,7 +527,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime // XPropertyChangeListener -void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -722,7 +722,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // XContainerListener -void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -746,7 +746,7 @@ void FmXUndoEnvironment::implSetModified() } -void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -763,7 +763,7 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr } -void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -776,7 +776,7 @@ void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) thro } -void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) { implSetModified(); } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index bac41bc254fb..35742d528b2f 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -219,23 +219,23 @@ void FormViewPageWindowAdapter::dispose() m_aControllerList.clear(); } -sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements() { return getCount() != 0; } -Type SAL_CALL FormViewPageWindowAdapter::getElementType() throw( RuntimeException, std::exception ) +Type SAL_CALL FormViewPageWindowAdapter::getElementType() { return cppu::UnoType<XFormController>::get(); } // XIndexAccess -sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount() { return m_aControllerList.size(); } -Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) +Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) { if (nIndex < 0 || nIndex >= getCount()) @@ -246,7 +246,7 @@ Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( Inde return aElement; } -void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& Control ) throw (RuntimeException, std::exception) +void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& Control ) { SolarMutexGuard aSolarGuard; @@ -461,7 +461,7 @@ FmXFormView::~FmXFormView() // EventListener -void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormView::disposing(const EventObject& Source) { if ( m_xWindow.is() && Source.Source == m_xWindow ) { @@ -476,14 +476,14 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx // XFormControllerListener -void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) { if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() ) m_pView->GetFormShell()->GetImpl()->formActivated( rEvent ); } -void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) { if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() ) m_pView->GetFormShell()->GetImpl()->formDeactivated( rEvent ); @@ -491,7 +491,7 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run // XContainerListener -void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) { try { @@ -519,13 +519,13 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run } -void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) { elementInserted(evt); } -void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) { } @@ -1903,7 +1903,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) } } -void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException, std::exception) +void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) { if ( m_xWindow.is() && m_pView ) { @@ -1911,7 +1911,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime } } -void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException, std::exception) +void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) { // when switch the focus outside the office the mark didn't change // so we can not remove us as focus listener diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 3a09dccfa87a..668125ff2dc8 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -99,7 +99,6 @@ using namespace ::dbtools; css::uno::Reference< css::uno::XInterface > SAL_CALL FormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) - throw (css::uno::Exception) { return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) ); } @@ -430,11 +429,11 @@ public: const Sequence< PropertyValue >& getValues() const { return m_aValues; } // XInteractionSupplyParameters - virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) override; }; -void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) +void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) { m_aValues = _rValues; } @@ -463,14 +462,14 @@ public: } virtual OUString GetComponentServiceName() override {return OUString("Edit");} - virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) override; protected: virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) override; }; -void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException, std::exception ) +void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -627,7 +626,7 @@ void SAL_CALL FormController::release() throw () } -Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FormController::queryInterface( const Type& _rType ) { Any aRet = FormController_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -638,12 +637,12 @@ Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeE } -Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Sequence< Type > SAL_CALL FormController::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL FormController::getTypes( ) { return comphelper::concatSequences( FormController_BASE::getTypes(), @@ -652,17 +651,17 @@ Sequence< Type > SAL_CALL FormController::getTypes( ) throw(RuntimeException, s } // XServiceInfo -sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL FormController::getImplementationName() { return OUString("org.openoffice.comp.svx.FormController"); } -Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() { // service names which are supported only, but cannot be used to created an // instance at a service factory @@ -674,13 +673,13 @@ Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( R } -sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/) { return true; } -void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::resetted(const EventObject& rEvent) { ::osl::MutexGuard aGuard(m_aMutex); if (getCurrentControl().is() && (getCurrentControl()->getModel() == rEvent.Source)) @@ -764,14 +763,12 @@ void FormController::impl_setTextOnAllFilter_throw() sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/, sal_Int32 /*nHandle*/, const Any& /*rValue*/ ) - throw( IllegalArgumentException ) { return false; } void FormController::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const Any& /*rValue*/ ) - throw( Exception, std::exception ) { } @@ -855,7 +852,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons } -Reference< XPropertySetInfo > FormController::getPropertySetInfo() throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > FormController::getPropertySetInfo() { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -887,19 +884,19 @@ void FormController::fillProperties( // XFilterController -void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) { m_aFilterListeners.addInterface( Listener ); } -void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) { m_aFilterListeners.removeInterface( Listener ); } -::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( css::uno::RuntimeException, std::exception ) +::sal_Int32 SAL_CALL FormController::getFilterComponents() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -908,7 +905,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X } -::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( css::uno::RuntimeException, std::exception ) +::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -917,7 +914,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X } -void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException, std::exception ) +void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -936,7 +933,7 @@ void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::s } -Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component ) throw( RuntimeException, IndexOutOfBoundsException, std::exception ) +Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -948,7 +945,7 @@ Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component } -Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw( RuntimeException, std::exception ) +Sequence< Sequence< OUString > > FormController::getPredicateExpressions() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -981,7 +978,7 @@ Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw } -void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term ) { // SYNCHRONIZED --> ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -1022,7 +1019,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term ) throw (I } -void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeException, std::exception) +void SAL_CALL FormController::appendEmptyDisjunctiveTerm() { // SYNCHRONIZED --> ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -1033,7 +1030,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti } -::sal_Int32 SAL_CALL FormController::getActiveTerm() throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL FormController::getActiveTerm() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -1042,7 +1039,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti } -void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -1059,14 +1056,14 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm ) throw (Ind // XElementAccess -sal_Bool SAL_CALL FormController::hasElements() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::hasElements() { ::osl::MutexGuard aGuard( m_aMutex ); return !m_aChildren.empty(); } -Type SAL_CALL FormController::getElementType() throw( RuntimeException, std::exception ) +Type SAL_CALL FormController::getElementType() { return cppu::UnoType<XFormController>::get(); @@ -1074,7 +1071,7 @@ Type SAL_CALL FormController::getElementType() throw( RuntimeException, std::ex // XEnumerationAccess -Reference< XEnumeration > SAL_CALL FormController::createEnumeration() throw( RuntimeException, std::exception ) +Reference< XEnumeration > SAL_CALL FormController::createEnumeration() { ::osl::MutexGuard aGuard( m_aMutex ); return new ::comphelper::OEnumerationByIndex(this); @@ -1082,14 +1079,14 @@ Reference< XEnumeration > SAL_CALL FormController::createEnumeration() throw( R // XIndexAccess -sal_Int32 SAL_CALL FormController::getCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FormController::getCount() { ::osl::MutexGuard aGuard( m_aMutex ); return m_aChildren.size(); } -Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) +Any SAL_CALL FormController::getByIndex(sal_Int32 Index) { ::osl::MutexGuard aGuard( m_aMutex ); if (Index < 0 || @@ -1101,7 +1098,7 @@ Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBounds // EventListener -void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::disposing(const EventObject& e) { // Ist der Container disposed worden ::osl::MutexGuard aGuard( m_aMutex ); @@ -1231,7 +1228,7 @@ namespace } -void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); if ( evt.PropertyName == FM_PROP_BOUNDFIELD ) @@ -1441,7 +1438,7 @@ IMPL_LINK_NOARG(FormController, OnToggleAutoFields, void*, void) // XTextListener -void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::textChanged(const TextEvent& e) { // SYNCHRONIZED --> ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -1498,7 +1495,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce // XItemListener -void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); impl_onModify(); @@ -1506,7 +1503,7 @@ void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) thro // XModificationBroadcaster -void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -1514,7 +1511,7 @@ void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener } -void FormController::removeModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException, std::exception ) +void FormController::removeModifyListener(const Reference< XModifyListener > & l) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -1523,7 +1520,7 @@ void FormController::removeModifyListener(const Reference< XModifyListener > & l // XModificationListener -void FormController::modified( const EventObject& _rEvent ) throw( RuntimeException, std::exception ) +void FormController::modified( const EventObject& _rEvent ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1616,7 +1613,7 @@ bool FormController::determineLockState() const // FocusListener -void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, std::exception ) +void FormController::focusGained(const FocusEvent& e) { // SYNCHRONIZED --> ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -1769,7 +1766,7 @@ IMPL_LINK_NOARG( FormController, OnDeactivated, void*, void ) } -void FormController::focusLost(const FocusEvent& e) throw( RuntimeException, std::exception ) +void FormController::focusLost(const FocusEvent& e) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1786,31 +1783,31 @@ void FormController::focusLost(const FocusEvent& e) throw( RuntimeException, std } -void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) { // not interested in } -void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) { // not interested in } -void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent ) { m_pControlBorderManager->mouseEntered( _rEvent.Source ); } -void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) { m_pControlBorderManager->mouseExited( _rEvent.Source ); } -void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource ) { Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), false, false ) ); Reference< XValidatableFormComponent > xValidatable( _rSource.Source, UNO_QUERY ); @@ -1822,7 +1819,7 @@ void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSou } -void FormController::setModel(const Reference< XTabControllerModel > & Model) throw( RuntimeException, std::exception ) +void FormController::setModel(const Reference< XTabControllerModel > & Model) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -1935,7 +1932,7 @@ void FormController::setModel(const Reference< XTabControllerModel > & Model) th } -Reference< XTabControllerModel > FormController::getModel() throw( RuntimeException, std::exception ) +Reference< XTabControllerModel > FormController::getModel() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2001,7 +1998,7 @@ void FormController::removeFromEventAttacher(const Reference< XControl > & xCont } -void FormController::setContainer(const Reference< XControlContainer > & xContainer) throw( RuntimeException, std::exception ) +void FormController::setContainer(const Reference< XControlContainer > & xContainer) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); Reference< XTabControllerModel > xTabModel(getModel()); @@ -2086,7 +2083,7 @@ void FormController::setContainer(const Reference< XControlContainer > & xContai } -Reference< XControlContainer > FormController::getContainer() throw( RuntimeException, std::exception ) +Reference< XControlContainer > FormController::getContainer() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2098,7 +2095,7 @@ Reference< XControlContainer > FormController::getContainer() throw( RuntimeExc } -Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeException, std::exception ) +Sequence< Reference< XControl > > FormController::getControls() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2138,7 +2135,7 @@ Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeEx } -void FormController::autoTabOrder() throw( RuntimeException, std::exception ) +void FormController::autoTabOrder() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2149,7 +2146,7 @@ void FormController::autoTabOrder() throw( RuntimeException, std::exception ) } -void FormController::activateTabOrder() throw( RuntimeException, std::exception ) +void FormController::activateTabOrder() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2538,7 +2535,7 @@ void FormController::removeControl(const Reference< XControl > & xControl) // XLoadListener -void FormController::loaded(const EventObject& rEvent) throw( RuntimeException, std::exception ) +void FormController::loaded(const EventObject& rEvent) { OSL_ENSURE( rEvent.Source == m_xModelAsIndex, "FormController::loaded: where did this come from?" ); @@ -2620,7 +2617,7 @@ IMPL_LINK_NOARG(FormController, OnLoad, void*, void) } -void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception ) +void FormController::unloaded(const EventObject& /*rEvent*/) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2629,7 +2626,7 @@ void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeExcep } -void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void FormController::reloading(const EventObject& /*aEvent*/) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2641,7 +2638,7 @@ void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeExce } -void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException, std::exception ) +void FormController::reloaded(const EventObject& aEvent) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2650,7 +2647,7 @@ void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException } -void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void FormController::unloading(const EventObject& /*aEvent*/) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2659,7 +2656,7 @@ void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeExce } -void FormController::unload() throw( RuntimeException ) +void FormController::unload() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2768,7 +2765,7 @@ void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm // css::sdbc::XRowSetListener -void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception ) +void FormController::cursorMoved(const EventObject& /*event*/) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2789,12 +2786,12 @@ void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeExc } -void FormController::rowChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception ) +void FormController::rowChanged(const EventObject& /*event*/) { // not interested in ... } -void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception ) +void FormController::rowSetChanged(const EventObject& /*event*/) { // not interested in ... } @@ -2802,7 +2799,7 @@ void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeE // XContainerListener -void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2848,7 +2845,7 @@ void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw( } -void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) { // simulate an elementRemoved ContainerEvent aRemoveEvent( evt ); @@ -2863,7 +2860,7 @@ void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw( } -void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2909,7 +2906,7 @@ Reference< XControl > FormController::isInList(const Reference< XWindowPeer > & } -void FormController::activateFirst() throw( RuntimeException, std::exception ) +void FormController::activateFirst() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2920,7 +2917,7 @@ void FormController::activateFirst() throw( RuntimeException, std::exception ) } -void FormController::activateLast() throw( RuntimeException, std::exception ) +void FormController::activateLast() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2932,7 +2929,7 @@ void FormController::activateLast() throw( RuntimeException, std::exception ) // XFormController -Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw (RuntimeException, std::exception) +Reference< XFormOperations > SAL_CALL FormController::getFormOperations() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2941,7 +2938,7 @@ Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw } -Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( RuntimeException, std::exception ) +Reference< XControl> SAL_CALL FormController::getCurrentControl() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2949,14 +2946,14 @@ Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( Runtime } -void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); m_aActivateListeners.addInterface(l); } -void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2964,7 +2961,7 @@ void SAL_CALL FormController::removeActivateListener(const Reference< XFormContr } -void SAL_CALL FormController::addChildController( const Reference< XFormController >& ChildController ) throw( RuntimeException, IllegalArgumentException, std::exception ) +void SAL_CALL FormController::addChildController( const Reference< XFormController >& ChildController ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3001,7 +2998,7 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll } -Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw (RuntimeException, std::exception) +Reference< XFormControllerContext > SAL_CALL FormController::getContext() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3009,7 +3006,7 @@ Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw } -void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3017,7 +3014,7 @@ void SAL_CALL FormController::setContext( const Reference< XFormControllerContex } -Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler() throw (RuntimeException, std::exception) +Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3025,7 +3022,7 @@ Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler( } -void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3436,7 +3433,7 @@ void FormController::stopFiltering() // XModeSelector -void FormController::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception ) +void FormController::setMode(const OUString& Mode) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3464,7 +3461,7 @@ void FormController::setMode(const OUString& Mode) throw( NoSupportException, Ru } -OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::exception ) +OUString SAL_CALL FormController::getMode() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3473,7 +3470,7 @@ OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::except } -Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL FormController::getSupportedModes() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3489,7 +3486,7 @@ Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( Runtime } -sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3653,7 +3650,7 @@ namespace // XRowSetApproveListener -sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3741,7 +3738,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent } -sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3758,7 +3755,7 @@ sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) th } -sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3776,7 +3773,7 @@ sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) // XRowSetApproveBroadcaster -void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3785,7 +3782,7 @@ void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetA } -void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3795,7 +3792,7 @@ void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowS // XErrorListener -void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3816,7 +3813,7 @@ void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( R // XErrorBroadcaster -void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3825,7 +3822,7 @@ void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorList } -void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3835,7 +3832,7 @@ void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorL // XDatabaseParameterBroadcaster2 -void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3844,7 +3841,7 @@ void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDat } -void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3854,20 +3851,20 @@ void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< X // XDatabaseParameterBroadcaster -void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) { FormController::addDatabaseParameterListener( aListener ); } -void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) { FormController::removeDatabaseParameterListener( aListener ); } // XDatabaseParameterListener -sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -3945,7 +3942,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& // XConfirmDeleteBroadcaster -void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3954,7 +3951,7 @@ void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirm } -void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException, std::exception ) +void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3964,7 +3961,7 @@ void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConf // XConfirmDeleteListener -sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -4026,7 +4023,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th } -void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) { ::osl::MutexGuard aGuard( m_aMutex ); // for now, just copy the ids of the features, because .... @@ -4040,7 +4037,7 @@ void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& } -void SAL_CALL FormController::invalidateAllFeatures( ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::invalidateAllFeatures( ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -4055,7 +4052,6 @@ void SAL_CALL FormController::invalidateAllFeatures( ) throw (RuntimeException, Reference< XDispatch > FormController::interceptedQueryDispatch( const URL& aURL, const OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/) - throw( RuntimeException ) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); Reference< XDispatch > xReturn; @@ -4094,7 +4090,7 @@ FormController::interceptedQueryDispatch( const URL& aURL, } -void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) { if ( _rArgs.getLength() != 1 ) { @@ -4122,7 +4118,7 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper } -void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) { if (_rURL.Complete == FMURL_CONFIRM_DELETION) { @@ -4140,19 +4136,19 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene } -Reference< XInterface > SAL_CALL FormController::getParent() throw( RuntimeException, std::exception ) +Reference< XInterface > SAL_CALL FormController::getParent() { return m_xParent; } -void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent) throw( NoSupportException, RuntimeException, std::exception ) +void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent) { m_xParent = Parent; } -void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) { (void)_rURL; OSL_ENSURE(_rURL.Complete == FMURL_CONFIRM_DELETION, "FormController::removeStatusListener: invalid (unsupported) URL!"); @@ -4192,7 +4188,7 @@ bool FormController::ensureInteractionHandler() } -void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest ) { if ( !ensureInteractionHandler() ) return; @@ -4234,7 +4230,7 @@ void FormController::implInvalidateCurrentControlDependentFeatures() } -void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) throw (RuntimeException, std::exception) +void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) { implInvalidateCurrentControlDependentFeatures(); } diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index b4bd0f3dedb9..ccfde930f8a4 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -381,7 +381,7 @@ namespace svx } - void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) throw (RuntimeException, std::exception) + void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) { if ( !m_pInvalidationCallback ) // nobody's interested in ... @@ -399,7 +399,7 @@ namespace svx } - void SAL_CALL FormControllerHelper::invalidateAllFeatures() throw (RuntimeException, std::exception) + void SAL_CALL FormControllerHelper::invalidateAllFeatures() { if ( !m_pInvalidationCallback ) // nobody's interested in ... @@ -442,14 +442,14 @@ namespace svx } - void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& Event ) throw (RuntimeException, std::exception) + void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& Event ) { OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccurred: two errors during one operation?" ); m_aOperationError = Event.Reason; } - void SAL_CALL FormControllerHelper::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL FormControllerHelper::disposing( const EventObject& /*_Source*/ ) { // not interested in } diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index 52802221cf02..e490119fa7a7 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -70,7 +70,7 @@ namespace svxform } - Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException, std::exception) + Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) { ::osl::MutexGuard aGuard( *m_pMutex ); Reference< XDispatch> xResult; @@ -87,7 +87,7 @@ namespace svxform Sequence< Reference< XDispatch > > SAL_CALL - DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) throw(RuntimeException, std::exception) + DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) { ::osl::MutexGuard aGuard( *m_pMutex ); Sequence< Reference< XDispatch> > aReturn(aDescripts.getLength()); @@ -101,35 +101,35 @@ namespace svxform } - Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider( ) throw(RuntimeException, std::exception) + Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider( ) { ::osl::MutexGuard aGuard( *m_pMutex ); return m_xSlaveDispatcher; } - void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider) throw( RuntimeException, std::exception ) + void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider) { ::osl::MutexGuard aGuard( *m_pMutex ); m_xSlaveDispatcher = xNewDispatchProvider; } - Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider() throw( RuntimeException, std::exception ) + Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider() { ::osl::MutexGuard aGuard( *m_pMutex ); return m_xMasterDispatcher; } - void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier) throw( RuntimeException, std::exception ) + void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier) { ::osl::MutexGuard aGuard( *m_pMutex ); m_xMasterDispatcher = xNewSupplier; } - void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) + void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source) { if (m_bListening) { diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index 1e0688dd08db..bfda3c7a54c8 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -119,7 +119,7 @@ namespace svx } - void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception) + void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); @@ -157,7 +157,7 @@ namespace svx } - void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception) + void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) { (void)_rURL; OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::addStatusListener: unexpected URL!" ); @@ -174,7 +174,7 @@ namespace svx } - void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception) + void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) { (void)_rURL; OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::removeStatusListener: unexpected URL!" ); diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index c8ff1c2f170e..85b26fff6b78 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -76,114 +76,114 @@ namespace svxform } // form::XFormController - virtual Reference< XControl > SAL_CALL getCurrentControl( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL addActivateListener( const Reference< form::XFormControllerListener >& l ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL removeActivateListener( const Reference< form::XFormControllerListener >& l ) throw (RuntimeException, std::exception) override; + virtual Reference< XControl > SAL_CALL getCurrentControl( ) override; + virtual void SAL_CALL addActivateListener( const Reference< form::XFormControllerListener >& l ) override; + virtual void SAL_CALL removeActivateListener( const Reference< form::XFormControllerListener >& l ) override; // awt::XTabController - virtual void SAL_CALL setModel( const Reference< XTabControllerModel >& Model ) throw (RuntimeException, std::exception) override; - virtual Reference< XTabControllerModel > SAL_CALL getModel( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setContainer( const Reference< XControlContainer >& Container ) throw (RuntimeException, std::exception) override; - virtual Reference< XControlContainer > SAL_CALL getContainer( ) throw (RuntimeException, std::exception) override; - virtual Sequence< Reference< XControl > > SAL_CALL getControls( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL autoTabOrder( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL activateTabOrder( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL activateFirst( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL activateLast( ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setModel( const Reference< XTabControllerModel >& Model ) override; + virtual Reference< XTabControllerModel > SAL_CALL getModel( ) override; + virtual void SAL_CALL setContainer( const Reference< XControlContainer >& Container ) override; + virtual Reference< XControlContainer > SAL_CALL getContainer( ) override; + virtual Sequence< Reference< XControl > > SAL_CALL getControls( ) override; + virtual void SAL_CALL autoTabOrder( ) override; + virtual void SAL_CALL activateTabOrder( ) override; + virtual void SAL_CALL activateFirst( ) override; + virtual void SAL_CALL activateLast( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: const Reference< form::runtime::XFormController > m_xDelegator; }; - Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl( ) throw (RuntimeException, std::exception) + Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl( ) { return m_xDelegator->getCurrentControl(); } - void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException, std::exception) + void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener ) { m_xDelegator->addActivateListener( _listener ); } - void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException, std::exception) + void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener ) { m_xDelegator->removeActivateListener( _listener ); } - void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model ) throw (RuntimeException, std::exception) + void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model ) { m_xDelegator->setModel( _model ); } - Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel( ) throw (RuntimeException, std::exception) + Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel( ) { return m_xDelegator->getModel(); } - void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container ) throw (RuntimeException, std::exception) + void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container ) { m_xDelegator->setContainer( _container ); } - Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer( ) throw (RuntimeException, std::exception) + Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer( ) { return m_xDelegator->getContainer(); } - Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls( ) throw (RuntimeException, std::exception) + Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls( ) { return m_xDelegator->getControls(); } - void SAL_CALL LegacyFormController::autoTabOrder( ) throw (RuntimeException, std::exception) + void SAL_CALL LegacyFormController::autoTabOrder( ) { m_xDelegator->autoTabOrder(); } - void SAL_CALL LegacyFormController::activateTabOrder( ) throw (RuntimeException, std::exception) + void SAL_CALL LegacyFormController::activateTabOrder( ) { m_xDelegator->activateTabOrder(); } - void SAL_CALL LegacyFormController::activateFirst( ) throw (RuntimeException, std::exception) + void SAL_CALL LegacyFormController::activateFirst( ) { m_xDelegator->activateFirst(); } - void SAL_CALL LegacyFormController::activateLast( ) throw (RuntimeException, std::exception) + void SAL_CALL LegacyFormController::activateLast( ) { m_xDelegator->activateLast(); } - OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL LegacyFormController::getImplementationName( ) { return OUString( "org.openoffice.comp.svx.LegacyFormController" ); } - sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName ) { return cppu::supportsService(this, _serviceName); } - Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) { Sequence< OUString > aServices(2); aServices.getArray()[0] = "com.sun.star.form.FormController"; @@ -195,7 +195,6 @@ namespace svxform css::uno::Reference< css::uno::XInterface > SAL_CALL LegacyFormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) - throw (css::uno::Exception) { return ::svxform::LegacyFormController::Create( _rxORB ); } diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 6cd10d247b9f..2af1e9f1ce8e 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -61,13 +61,13 @@ namespace svxform // XPropertyChangeListener - void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) + void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source) { Remove( Source.Source ); } - void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt) throw(RuntimeException, std::exception) + void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt) { if( !m_pNavModel ) return; if( evt.PropertyName != FM_PROP_NAME ) return; @@ -92,7 +92,7 @@ namespace svxform // XContainerListener - void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt) throw(RuntimeException, std::exception) + void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt) { if (IsLocked() || !m_pNavModel) return; @@ -131,7 +131,7 @@ namespace svxform } - void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt) throw(RuntimeException, std::exception) + void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt) { if (IsLocked() || !m_pNavModel) return; @@ -179,7 +179,7 @@ namespace svxform } - void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt) throw(RuntimeException, std::exception) + void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt) { Reference< XInterface > xElement; evt.Element >>= xElement; diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 91e7e89caa8e..d44ec744b416 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -257,7 +257,7 @@ bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) } -void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) +void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt) { css::uno::Reference< css::form::XForm > xForm(evt.Source, css::uno::UNO_QUERY); UpdateContent(xForm); diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index d65eff71b535..9f2cc14413a2 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -100,7 +100,7 @@ namespace svxform } - Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId( ) throw(RuntimeException, std::exception) + Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -112,19 +112,19 @@ namespace svxform } - OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL OAddConditionDialog::getImplementationName() { return OAddConditionDialog_GetImplementationName(); } - Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() { return OAddConditionDialog_GetSupportedServiceNames(); } - Reference<XPropertySetInfo> SAL_CALL OAddConditionDialog::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference<XPropertySetInfo> SAL_CALL OAddConditionDialog::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 41ee2b86d22c..5f639df86af5 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -132,8 +132,8 @@ public: void ExecutePopup( vcl::Window *pParent, const ::Point &aPos ); - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent &rEvent) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject &rSource) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent &rEvent) override; + virtual void SAL_CALL disposing( const css::lang::EventObject &rSource) override; }; @@ -171,7 +171,6 @@ GalleryThemePopup::GalleryThemePopup( void SAL_CALL GalleryThemePopup::statusChanged( const css::frame::FeatureStateEvent &rEvent ) -throw ( css::uno::RuntimeException, std::exception ) { const OUString &rURL = rEvent.FeatureURL.Complete; if ( rURL == CMD_SID_GALLERY_ENABLE_ADDCOPY ) @@ -207,7 +206,6 @@ throw ( css::uno::RuntimeException, std::exception ) void SAL_CALL GalleryThemePopup::disposing( const css::lang::EventObject &/*rSource*/) -throw ( css::uno::RuntimeException, std::exception ) { } diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index ddae1082c597..7437e931dfec 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -61,39 +61,39 @@ public: virtual ~AccFrameSelector() override; //XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; //XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; //XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) override; + virtual css::awt::Point SAL_CALL getLocation( ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; + virtual css::awt::Size SAL_CALL getSize( ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override; + virtual void SAL_CALL removeAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; void Invalidate(); void NotifyFocusListeners(bool bGetFocus); @@ -104,7 +104,7 @@ protected: private: /// @throws css::uno::RuntimeException - void IsValid() throw (css::uno::RuntimeException); + void IsValid(); void RemoveFrameSelEventListener(); VclPtr<FrameSelector> mpFrameSel; diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 1eea3a88a03f..4ccc2221d0ae 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -97,60 +97,58 @@ public: // XAccessible /// Return the XAccessibleContext. virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocation() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL grabFocus() override; - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale() throw (css::uno::RuntimeException, css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) override; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; + virtual OUString SAL_CALL getAccessibleDescription() override; + virtual OUString SAL_CALL getAccessibleName() override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() override; + virtual css::lang::Locale SAL_CALL getLocale() override; // virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::uno::RuntimeException) {} // virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::uno::RuntimeException) {} // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; // XServiceName - virtual OUString SAL_CALL getServiceName() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL clearAccessibleSelection() throw (css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL selectAllAccessibleChildren() throw (css::uno::RuntimeException, std::exception ) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() throw (css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection() override; + virtual void SAL_CALL selectAllAccessibleChildren() override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; // IAccessibleViewforwarder virtual Rectangle GetVisibleArea() const override; @@ -159,7 +157,7 @@ public: protected: /// @throws css::lang::IndexOutOfBoundsException - void checkChildIndexOnSelection( long nIndexOfChild ) throw (css::lang::IndexOutOfBoundsException ); + void checkChildIndexOnSelection( long nIndexOfChild ); public: @@ -179,20 +177,19 @@ protected: When the object is already disposed then a <type>DisposedException</type> is thrown. */ - Rectangle GetBoundingBoxOnScreen() throw (css::uno::RuntimeException); + Rectangle GetBoundingBoxOnScreen(); /// Return the object's current bounding box relative to the parent object. /// /// @throws css::uno::RuntimeException - Rectangle GetBoundingBox() throw (css::uno::RuntimeException); + Rectangle GetBoundingBox(); virtual void SAL_CALL disposing() final override; private: /// @throws css::uno::RuntimeException /// @throws css::lang::IndexOutOfBoundsException - SdrObject* getSdrObject( sal_Int32 nIndex ) - throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException ); + SdrObject* getSdrObject( sal_Int32 nIndex ); void CommitChange (sal_Int16 aEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue); diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 4e0b41de70c0..41d8f26eb292 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -48,7 +48,7 @@ namespace svx virtual void SAL_CALL disposing() override; - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; public: SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ); @@ -57,22 +57,22 @@ namespace svx DECLARE_XTYPEPROVIDER( ) // XAccessibleComponent - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override { return this; } - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override { return this; } + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // call the fireEvent method from the table when it exists. @@ -133,44 +133,44 @@ namespace svx DECLARE_XTYPEPROVIDER( ) // XAccessibleComponent - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override { return this; } - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override { return this; } + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleTable - virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) override; + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; inline void SAL_CALL fireEvent( @@ -188,19 +188,15 @@ namespace svx // OCommonAccessibleSelection // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (css::uno::RuntimeException) override; + implIsSelected( sal_Int32 nAccessibleChildIndex ) override; // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, - std::exception) override; + implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; // OCommonAccessibleComponent /// implements the calculation of the bounding rectangle - still waiting to be overwritten - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; }; @@ -222,7 +218,7 @@ namespace svx // OCommonAccessibleComponent /// implements the calculation of the bounding rectangle - still waiting to be overwritten - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; public: // XInterface @@ -234,30 +230,30 @@ namespace svx void ParentDestroyed(); // XAccessibleComponent - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override { return this; } + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override { return this; } - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override { return mpParent->m_pParent->getForeground(); } - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override { return mpParent->m_pParent->getBackground(); } + virtual sal_Int32 SAL_CALL getForeground( ) override { return mpParent->m_pParent->getForeground(); } + virtual sal_Int32 SAL_CALL getBackground( ) override { return mpParent->m_pParent->getBackground(); } // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; inline void SAL_CALL fireEvent( diff --git a/svx/source/inc/coreservices.hxx b/svx/source/inc/coreservices.hxx index 35205a8004d4..4f74500738a2 100644 --- a/svx/source/inc/coreservices.hxx +++ b/svx/source/inc/coreservices.hxx @@ -37,39 +37,39 @@ namespace svx { OUString SAL_CALL ExtrusionDepthController_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames(); OUString SAL_CALL ExtrusionDirectionControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionDirectionControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames(); OUString SAL_CALL ExtrusionLightingControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionLightingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames(); OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Reference< css::uno::XInterface > SAL_CALL ExtrusionSurfaceControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames(); OUString SAL_CALL FontworkAlignmentControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkAlignmentControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames(); OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &) throw( css::uno::RuntimeException ); +css::uno::Reference< css::uno::XInterface > SAL_CALL FontworkCharacterSpacingControl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > &); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames(); } #endif diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx index c12109c3e001..2749c4e5240e 100644 --- a/svx/source/inc/datalistener.hxx +++ b/svx/source/inc/datalistener.hxx @@ -50,18 +50,18 @@ namespace svxform public: // XContainerListener - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override; // XFrameActionListener - virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) override; // xml::dom::events::XEventListener - virtual void SAL_CALL handleEvent( const css::uno::Reference< css::xml::dom::events::XEvent >& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handleEvent( const css::uno::Reference< css::xml::dom::events::XEvent >& evt ) override; // lang::XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 244c56983439..8d391288719d 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -270,12 +270,10 @@ class RecoveryCore : public ::cppu::WeakImplHelper< css::frame::XStatusListener public: // css.frame.XStatusListener - virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) override; // css.lang.XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override; // helper @@ -338,31 +336,23 @@ class PluginProgress : public ::cppu::WeakImplHelper< css::task::XStatusIndicato // XStatusIndicator virtual void SAL_CALL start(const OUString& sText , - sal_Int32 nRange) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 nRange) override; - virtual void SAL_CALL end() - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL end() override; - virtual void SAL_CALL setText(const OUString& sText) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setText(const OUString& sText) override; - virtual void SAL_CALL setValue(sal_Int32 nValue) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue(sal_Int32 nValue) override; - virtual void SAL_CALL reset() - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset() override; // XComponent - virtual void SAL_CALL dispose() - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) override; }; class SaveDialog : public Dialog diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 90e425922885..db0672d05669 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -75,7 +75,7 @@ namespace svxform protected: // XClipboardOwner - virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans ) override; // TransferableHelper virtual void DragFinished( sal_Int8 nDropAction ) override; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 04bb94ba8a7f..bf4c601eea86 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -290,16 +290,16 @@ namespace svxform OFormComponentObserver( ::svxform::NavigatorTreeModel* pModel ); // XEventListenerListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // css::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override; // css::container::XContainerListener - virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override; void Lock() { m_nLocks++; } void UnLock() { m_nLocks--; } diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 60b0dcde5f83..4e1239c65a32 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -95,20 +95,17 @@ namespace svxform /// @throws css::uno::Exception css::uno::Reference<css::uno::XInterface> SAL_CALL FmXGridControl_NewInstance_Impl( - css::uno::Reference<css::lang::XMultiServiceFactory> const &) - throw (css::uno::Exception); + css::uno::Reference<css::lang::XMultiServiceFactory> const &); /// @throws css::uno::Exception css::uno::Reference<css::uno::XInterface> SAL_CALL FormController_NewInstance_Impl( - css::uno::Reference<css::lang::XMultiServiceFactory> const &) - throw (css::uno::Exception); + css::uno::Reference<css::lang::XMultiServiceFactory> const &); /// @throws css::uno::Exception css::uno::Reference<css::uno::XInterface> SAL_CALL LegacyFormController_NewInstance_Impl( - css::uno::Reference<css::lang::XMultiServiceFactory> const &) - throw (css::uno::Exception); + css::uno::Reference<css::lang::XMultiServiceFactory> const &); #endif // INCLUDED_SVX_SOURCE_INC_FMSERVS_HXX diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index fc799e139241..d9b668026108 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -268,22 +268,22 @@ protected: SAL_DLLPRIVATE virtual ~FmXFormShell() override; // EventListener - SAL_DLLPRIVATE virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // css::container::XContainerListener - SAL_DLLPRIVATE virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; - SAL_DLLPRIVATE virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; - SAL_DLLPRIVATE virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override; + SAL_DLLPRIVATE virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override; + SAL_DLLPRIVATE virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override; // XSelectionChangeListener - SAL_DLLPRIVATE virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) override; // css::beans::XPropertyChangeListener - SAL_DLLPRIVATE virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override; // css::form::XFormControllerListener - SAL_DLLPRIVATE virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; - SAL_DLLPRIVATE virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) override; + SAL_DLLPRIVATE virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) override; // OComponentHelper SAL_DLLPRIVATE virtual void SAL_CALL disposing() override; diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index a0d465c4007d..b8038b23ee20 100644 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx @@ -80,8 +80,8 @@ namespace svx protected: // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index b4d3df4c41d4..40ed363cb2ff 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -163,18 +163,18 @@ public: protected: // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override; // XContainerListener - virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; void ModeChanged(); void dispose(); diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 71e4d0821d6a..59fe6d23b23f 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -105,15 +105,15 @@ public: //const SdrPageViewWinRec*, FmXFormView* pView); // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) override; // XFormControllerContext - virtual void SAL_CALL makeVisible( const css::uno::Reference< css::awt::XControl >& Control ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL makeVisible( const css::uno::Reference< css::awt::XControl >& Control ) override; const ::std::vector< css::uno::Reference< css::form::runtime::XFormController > >& GetList() {return m_aControllerList;} @@ -194,20 +194,20 @@ public: // UNO Anbindung // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // css::container::XContainerListener - virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override; // css::form::XFormControllerListener - virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) override; + virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) override; // XFocusListener - virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override; FmFormView* getView() const {return m_pView;} PFormViewPageWindowAdapter findWindow( const css::uno::Reference< css::awt::XControlContainer >& _rxCC ) const; diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index f9537a93c245..5ee325731154 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -213,197 +213,196 @@ namespace svxform virtual ~FormController() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArgs ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArgs ) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) override; // css::container::XChild - virtual css::uno::Reference< css::uno::XInterface> SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface>& Parent) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::uno::XInterface> SAL_CALL getParent() override; + virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface>& Parent) override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // OComponentHelper virtual void SAL_CALL disposing() override; // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, - sal_Int32 nHandle, const css::uno::Any& rValue ) - throw( css::lang::IllegalArgumentException ) override; + sal_Int32 nHandle, const css::uno::Any& rValue ) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw( css::uno::Exception, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; using OPropertySetHelper::getFastPropertyValue; // XFilterController - virtual ::sal_Int32 SAL_CALL getFilterComponents() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 Component ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 Term ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveTerm( ::sal_Int32 ActiveTerm ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFilterComponents() override; + virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() override; + virtual void SAL_CALL addFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) override; + virtual void SAL_CALL removeFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) override; + virtual void SAL_CALL setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) override; + virtual css::uno::Reference< css::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 Component ) override; + virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() override; + virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 Term ) override; + virtual void SAL_CALL appendEmptyDisjunctiveTerm() override; + virtual ::sal_Int32 SAL_CALL getActiveTerm() override; + virtual void SAL_CALL setActiveTerm( ::sal_Int32 ActiveTerm ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // css::container::XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() override; // css::container::XContainerListener - virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) override; // XLoadListener - virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL unloaded(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) override; + virtual void SAL_CALL unloaded(const css::lang::EventObject& rEvent) override; + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) override; + virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) override; + virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) override; // XModeSelector - virtual void SAL_CALL setMode(const OUString& Mode) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getMode() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setMode(const OUString& Mode) override; + virtual OUString SAL_CALL getMode() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes() override; + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) override; // css::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) override; + virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) override; // XFocusListener - virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) override; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) override; // XMouseListener - virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& _rEvent ) override; + virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& _rEvent ) override; + virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& _rEvent ) override; + virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& _rEvent ) override; // XFormComponentValidityListener - virtual void SAL_CALL componentValidityChanged( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL componentValidityChanged( const css::lang::EventObject& _rSource ) override; // XInteractionHandler - virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) override; // XGridControlListener - virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) override; // css::beans::XPropertyChangeListener -> change of states - virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override; // XTextListener -> modify setzen - virtual void SAL_CALL textChanged(const css::awt::TextEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL textChanged(const css::awt::TextEvent& rEvent) override; // XItemListener -> modify setzen - virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& rEvent) override; // XModifyListener -> modify setzen - virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) override; // XFormController - virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::XControl> SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override; + virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() override; + virtual css::uno::Reference< css::awt::XControl> SAL_CALL getCurrentControl() override; + virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) override; + virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) override; + virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& ChildController ) override; - virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() override; + virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) override; + virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override; + virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) override; // XTabController - virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl> > SAL_CALL getControls() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl> > SAL_CALL getControls() override; - virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel>& Model) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::awt::XTabControllerModel> SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel>& Model) override; + virtual css::uno::Reference< css::awt::XTabControllerModel> SAL_CALL getModel() override; - virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer>& Container) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::awt::XControlContainer> SAL_CALL getContainer() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer>& Container) override; + virtual css::uno::Reference< css::awt::XControlContainer> SAL_CALL getContainer() override; - virtual void SAL_CALL autoTabOrder() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL activateTabOrder() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL autoTabOrder() override; + virtual void SAL_CALL activateTabOrder() override; - virtual void SAL_CALL activateFirst() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL activateLast() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL activateFirst() override; + virtual void SAL_CALL activateLast() override; // css::sdbc::XRowSetListener - virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) override; + virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) override; + virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) override; // XRowSetApproveListener - virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL approveRowChange(const css::sdb::RowChangeEvent& event) throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) override; + virtual sal_Bool SAL_CALL approveRowChange(const css::sdb::RowChangeEvent& event) override; + virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) override; // XRowSetApproveBroadcaster - virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) override; + virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) override; // XSQLErrorBroadcaster - virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) override; // XSQLErrorListener - virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) override; + virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) override; // XDatabaseParameterBroadcaster2 - virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) override; + virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) override; // XDatabaseParameterBroadcaster - virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) override; + virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) override; // XDatabaseParameterListener - virtual sal_Bool SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) override; // XConfirmDeleteBroadcaster - virtual void SAL_CALL addConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) override; + virtual void SAL_CALL removeConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) override; // XConfirmDeleteListener - virtual sal_Bool SAL_CALL confirmDelete(const css::sdb::RowChangeEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL confirmDelete(const css::sdb::RowChangeEvent& aEvent) override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XResetListener - virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) override; + virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) override; // XFeatureInvalidation - virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL invalidateAllFeatures( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) override; + virtual void SAL_CALL invalidateAllFeatures( ) override; // method for registration static css::uno::Sequence< OUString > const & getSupportedServiceNames_Static(); @@ -421,7 +420,7 @@ namespace svxform const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags - ) throw( css::uno::RuntimeException ) override; + ) override; virtual ::osl::Mutex* getInterceptorMutex() override { return &m_aMutex; } @@ -477,7 +476,7 @@ namespace svxform void removeFromEventAttacher(const css::uno::Reference< css::awt::XControl>& xControl); void toggleAutoFields(bool bAutoFields); /// @throws css::uno::RuntimeException - void unload() throw( css::uno::RuntimeException ); + void unload(); void removeBoundFieldListener(); void startFormListening( const css::uno::Reference< css::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly ); diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index 37dfa672c1da..f48357db5ac9 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -181,14 +181,14 @@ namespace svx virtual ~FormControllerHelper() override; // XFeatureInvalidation - virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL invalidateAllFeatures() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) override; + virtual void SAL_CALL invalidateAllFeatures() override; // XSQLErrorListener - virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& Event ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: enum FormOperation { EXECUTE, EXECUTE_ARGS, COMMIT_CONTROL, COMMIT_RECORD }; diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 5708737cf258..f6ecd37a1aff 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -35,7 +35,7 @@ namespace svxform public: /// @throws css::uno::RuntimeException virtual css::uno::Reference< css::frame::XDispatch> interceptedQueryDispatch( - const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException ) = 0; + const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) = 0; virtual ::osl::Mutex* getInterceptorMutex() = 0; @@ -81,17 +81,17 @@ namespace svxform ); // css::frame::XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) override; // css::frame::XDispatchProviderInterceptor - virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) override; + virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) override; + virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) override; // css::lang::XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index e53641574e46..00bd404bd86e 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -75,9 +75,9 @@ namespace svx protected: // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) override; protected: /** notifies our current state to one or all listeners diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 13d0a8aba8ed..a337a2cc3098 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -323,7 +323,7 @@ protected: protected: // OPropertyChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override; private: void implDoPropertyListening( const OUString& _rPropertyName, bool _bWarnIfNotExistent ); @@ -433,7 +433,7 @@ protected: virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // OPropertyChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override; }; @@ -478,7 +478,7 @@ protected: virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; // OPropertyChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override; }; @@ -505,7 +505,7 @@ protected: virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; // OPropertyChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override; }; @@ -730,58 +730,58 @@ public: void init(); DECLARE_UNO3_AGG_DEFAULTS(FmXGridCell, OComponentHelper) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; void SetTextLineColor(); void SetTextLineColor(const Color& _rColor); // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // OComponentHelper virtual void SAL_CALL disposing() override; // css::lang::XComponent - virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override {OComponentHelper::dispose();} - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener)throw(css::uno::RuntimeException, std::exception) override { OComponentHelper::addEventListener(aListener);} - virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener)throw(css::uno::RuntimeException, std::exception) override { OComponentHelper::removeEventListener(aListener);} + virtual void SAL_CALL dispose() override {OComponentHelper::dispose();} + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) override { OComponentHelper::addEventListener(aListener);} + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) override { OComponentHelper::removeEventListener(aListener);} // css::awt::XControl - virtual void SAL_CALL setContext(const css::uno::Reference< css::uno::XInterface >& /*Context*/) throw(css::uno::RuntimeException, std::exception) override {} - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& /*Toolkit*/, const css::uno::Reference< css::awt::XWindowPeer >& /*Parent*/) throw(css::uno::RuntimeException, std::exception) override {} - - virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override {return css::uno::Reference< css::awt::XWindowPeer > ();} - virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& /*Model*/) throw (css::uno::RuntimeException, std::exception) override {return false;} - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override {return css::uno::Reference< css::awt::XView > ();} - virtual void SAL_CALL setDesignMode(sal_Bool /*bOn*/) throw (css::uno::RuntimeException, std::exception) override {} - virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override {return false;} - virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override {return false;} + virtual void SAL_CALL setContext(const css::uno::Reference< css::uno::XInterface >& /*Context*/) override {} + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() override; + virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& /*Toolkit*/, const css::uno::Reference< css::awt::XWindowPeer >& /*Parent*/) override {} + + virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() override {return css::uno::Reference< css::awt::XWindowPeer > ();} + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& /*Model*/) override {return false;} + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; + virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() override {return css::uno::Reference< css::awt::XView > ();} + virtual void SAL_CALL setDesignMode(sal_Bool /*bOn*/) override {} + virtual sal_Bool SAL_CALL isDesignMode() override {return false;} + virtual sal_Bool SAL_CALL isTransparent() override {return false;} // css::form::XBoundControl - virtual sal_Bool SAL_CALL getLock() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLock(sal_Bool _bLock) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getLock() override; + virtual void SAL_CALL setLock(sal_Bool _bLock) override; // XWindow - virtual void SAL_CALL setPosSize( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosSize( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int16 Flags ) override; + virtual css::awt::Rectangle SAL_CALL getPosSize( ) override; + virtual void SAL_CALL setVisible( sal_Bool Visible ) override; + virtual void SAL_CALL setEnable( sal_Bool Enable ) override; + virtual void SAL_CALL setFocus( ) override; + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; bool Commit() {return m_pCellControl->Commit();} void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) @@ -879,32 +879,32 @@ public: FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl ); DECLARE_UNO3_AGG_DEFAULTS(FmXEditCell, FmXTextCell) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // OComponentHelper virtual void SAL_CALL disposing() override; // css::awt::XTextComponent - virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText(const OUString& aText) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Selection SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEditable() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEditable(sal_Bool bEditable) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getMaxTextLen() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) override; + virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) override; + virtual void SAL_CALL setText(const OUString& aText) override; + virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getSelectedText() override; + virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) override; + virtual css::awt::Selection SAL_CALL getSelection() override; + virtual sal_Bool SAL_CALL isEditable() override; + virtual void SAL_CALL setEditable(sal_Bool bEditable) override; + virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) override; + virtual sal_Int16 SAL_CALL getMaxTextLen() override; // XChangeBroadcaster - virtual void SAL_CALL addChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) override; + virtual void SAL_CALL removeChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) override; protected: virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; @@ -936,26 +936,26 @@ public: // UNO DECLARE_UNO3_AGG_DEFAULTS(FmXCheckBoxCell, FmXDataCell) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // OComponentHelper virtual void SAL_CALL disposing() override; // css::awt::XCheckBox - virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getState() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setState(sal_Int16 n) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabel(const OUString& Label) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enableTriState(sal_Bool b) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override; + virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override; + virtual sal_Int16 SAL_CALL getState() override; + virtual void SAL_CALL setState(sal_Int16 n) override; + virtual void SAL_CALL setLabel(const OUString& Label) override; + virtual void SAL_CALL enableTriState(sal_Bool b) override; // XButton - virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override; + virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override; //virtual void SAL_CALL setLabel( const OUString& Label ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setActionCommand( const OUString& Command ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActionCommand( const OUString& Command ) override; protected: virtual vcl::Window* getEventWindow() const override; @@ -979,36 +979,36 @@ public: FmXListBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ); DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // OComponentHelper virtual void SAL_CALL disposing() override; // css::awt::XListBox - virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItem(const OUString& aItem, sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItems(const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItems(sal_Int16 nPos, sal_Int16 nCount) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getItemCount() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItem(sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getItems() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getSelectedItemPos() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedItem() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL selectItemsPos(const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isMutipleMode() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL setMultipleMode(sal_Bool bMulti) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getDropDownLineCount() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL setDropDownLineCount(sal_Int16 nLines) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override; + virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) override; + virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener >& l) override; + virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener >& l) override; + virtual void SAL_CALL addItem(const OUString& aItem, sal_Int16 nPos) override; + virtual void SAL_CALL addItems(const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos) override; + virtual void SAL_CALL removeItems(sal_Int16 nPos, sal_Int16 nCount) override; + virtual sal_Int16 SAL_CALL getItemCount() override; + virtual OUString SAL_CALL getItem(sal_Int16 nPos) override; + virtual css::uno::Sequence< OUString > SAL_CALL getItems() override; + virtual sal_Int16 SAL_CALL getSelectedItemPos() override; + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() override; + virtual OUString SAL_CALL getSelectedItem() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems() override; + virtual void SAL_CALL SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) override; + virtual void SAL_CALL SAL_CALL selectItemsPos(const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) override; + virtual void SAL_CALL SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) override; + virtual sal_Bool SAL_CALL isMutipleMode() override; + virtual void SAL_CALL SAL_CALL setMultipleMode(sal_Bool bMulti) override; + virtual sal_Int16 SAL_CALL getDropDownLineCount() override; + virtual void SAL_CALL SAL_CALL setDropDownLineCount(sal_Int16 nLines) override; + virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) override; protected: virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; @@ -1034,26 +1034,26 @@ public: FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ); DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // OComponentHelper virtual void SAL_CALL disposing() override; // XComboBox - virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItem( const OUString& Item, ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& Items, ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItem( ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getItems( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 Lines ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) override; + virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) override; + virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) override; + virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) override; + virtual void SAL_CALL addItem( const OUString& Item, ::sal_Int16 Pos ) override; + virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& Items, ::sal_Int16 Pos ) override; + virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) override; + virtual ::sal_Int16 SAL_CALL getItemCount( ) override; + virtual OUString SAL_CALL getItem( ::sal_Int16 Pos ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getItems( ) override; + virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) override; + virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 Lines ) override; protected: virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; @@ -1074,12 +1074,12 @@ public: DECLARE_UNO3_AGG_DEFAULTS(FmXFilterCell, FmXGridCell) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; // helpers for XUnoTunnel static const css::uno::Sequence<sal_Int8>& getUnoTunnelId(); @@ -1092,18 +1092,18 @@ public: virtual void SAL_CALL disposing() override; // css::awt::XTextComponent - virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText(const OUString& aText) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Selection SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEditable() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEditable(sal_Bool bEditable) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getMaxTextLen() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) override; + virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) override; + virtual void SAL_CALL setText(const OUString& aText) override; + virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getSelectedText() override; + virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) override; + virtual css::awt::Selection SAL_CALL getSelection() override; + virtual sal_Bool SAL_CALL isEditable() override; + virtual void SAL_CALL setEditable(sal_Bool bEditable) override; + virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) override; + virtual sal_Int16 SAL_CALL getMaxTextLen() override; protected: DECL_LINK( OnCommit, DbFilterField&, void ); diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 7de85a596d7b..76d626de9d09 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -82,64 +82,62 @@ public: virtual ~SvxPixelCtlAccessibleChild() override; //XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; //XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; //XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) override; + virtual css::awt::Point SAL_CALL getLocation( ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; + virtual css::awt::Size SAL_CALL getSize( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; + virtual void SAL_CALL grabFocus( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; //Methods for XAccessibleEventBroadcaster sal_uInt32 mnClientId; virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; //Solution: Add the event handling method void FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew); virtual void SAL_CALL disposing() override; /// @throws css::uno::RuntimeException - Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen(); /// @throws css::uno::RuntimeException - Rectangle const & GetBoundingBox() throw( css::uno::RuntimeException ); + Rectangle const & GetBoundingBox(); /// @returns true if it's disposed or in disposing inline bool IsAlive() const; /// @throws css::lang::DisposedException if it's not alive - void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException ); + void ThrowExceptionIfNotAlive(); void CheckChild(); @@ -169,56 +167,54 @@ public: virtual ~SvxPixelCtlAccessible() override; //XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; //XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; //XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) override; + virtual css::awt::Point SAL_CALL getLocation( ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; + virtual css::awt::Size SAL_CALL getSize( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; + virtual void SAL_CALL grabFocus( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL clearAccessibleSelection( ) override; + void SAL_CALL selectAllAccessibleChildren( ) override; + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; //Methods for XAccessibleEventBroadcaster sal_uInt32 mnClientId; virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; //Solution: Add the event handling method void FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew); virtual void SAL_CALL disposing() override; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 79ce253aec1c..ea375908995c 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -80,129 +80,120 @@ protected: public: // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleContext() override; // XAccessibleComponent virtual sal_Bool SAL_CALL - containsPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override; + containsPoint( const css::awt::Point& rPoint ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; virtual css::awt::Rectangle SAL_CALL - getBounds() throw( css::uno::RuntimeException, std::exception ) override; + getBounds() override; virtual css::awt::Point SAL_CALL - getLocation() throw( css::uno::RuntimeException, std::exception ) override; + getLocation() override; virtual css::awt::Point SAL_CALL - getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override; + getLocationOnScreen() override; virtual css::awt::Size SAL_CALL - getSize() throw( css::uno::RuntimeException, std::exception ) override; + getSize() override; /// @throws css::uno::RuntimeException bool SAL_CALL - isVisible() throw( css::uno::RuntimeException ); + isVisible(); virtual void SAL_CALL - grabFocus() throw( css::uno::RuntimeException, std::exception ) override; + grabFocus() override; virtual sal_Int32 SAL_CALL - getForeground( ) throw (css::uno::RuntimeException, std::exception) override; + getForeground( ) override; virtual sal_Int32 SAL_CALL - getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + getBackground( ) override; // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild( sal_Int32 nIndex ) - throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override; + getAccessibleChild( sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleParent() override; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL - getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleRole() override; virtual OUString SAL_CALL - getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleDescription() override; virtual OUString SAL_CALL - getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleName() override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleRelationSet() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleStateSet() override; virtual css::lang::Locale SAL_CALL - getLocale() - throw( css::uno::RuntimeException, - css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; + getLocale() override; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& sServiceName ) override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XTypeProvider virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; + getImplementationId() override; // XAccessibleSelection virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + selectAccessibleChild( sal_Int32 nChildIndex ) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + isAccessibleChildSelected( sal_Int32 nChildIndex ) override; virtual void SAL_CALL - clearAccessibleSelection() throw( css::uno::RuntimeException, std::exception ) override; + clearAccessibleSelection() override; virtual void SAL_CALL - selectAllAccessibleChildren() throw( css::uno::RuntimeException, std::exception ) override; + selectAllAccessibleChildren() override; virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; + deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; protected: // internals /// @throws css::lang::IndexOutOfBoundsException - void checkChildIndex( long nIndexOfChild ) throw( css::lang::IndexOutOfBoundsException ); + void checkChildIndex( long nIndexOfChild ); /** Selects a new child by index. @@ -231,12 +222,12 @@ protected: /// @Return the object's current bounding box relative to the desktop. /// /// @throws css::uno::RuntimeException - Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen(); /// @Return the object's current bounding box relative to the parent object. /// /// @throws css::uno::RuntimeException - Rectangle GetBoundingBox() throw( css::uno::RuntimeException ); + Rectangle GetBoundingBox(); virtual void SAL_CALL disposing() override; @@ -244,7 +235,7 @@ protected: inline bool IsAlive() const; /// @throws css::lang::DisposedException if it's not alive - void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException ); + void ThrowExceptionIfNotAlive(); private: /** Description of this object. This is not a constant because it can @@ -305,110 +296,106 @@ protected: public: // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleContext() override; // XAccessibleComponent virtual sal_Bool SAL_CALL - containsPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override; + containsPoint( const css::awt::Point& rPoint ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; virtual css::awt::Rectangle SAL_CALL - getBounds() throw( css::uno::RuntimeException, std::exception ) override; + getBounds() override; virtual css::awt::Point SAL_CALL - getLocation() throw( css::uno::RuntimeException, std::exception ) override; + getLocation() override; virtual css::awt::Point SAL_CALL - getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override; + getLocationOnScreen() override; virtual css::awt::Size SAL_CALL - getSize() throw( css::uno::RuntimeException, std::exception ) override; + getSize() override; virtual void SAL_CALL - grabFocus() throw( css::uno::RuntimeException, std::exception ) override; + grabFocus() override; virtual sal_Int32 SAL_CALL - getForeground( ) throw (css::uno::RuntimeException, std::exception) override; + getForeground( ) override; virtual sal_Int32 SAL_CALL - getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + getBackground( ) override; // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nIndex ) - throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override; + getAccessibleChild( sal_Int32 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleParent() override; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL - getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleRole() override; virtual OUString SAL_CALL - getAccessibleDescription() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleDescription() override; virtual OUString SAL_CALL - getAccessibleName() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleName() override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleRelationSet() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override; + getAccessibleStateSet() override; virtual css::lang::Locale SAL_CALL - getLocale() - throw( css::uno::RuntimeException, css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; + getLocale() override; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; // XAccessibleValue virtual css::uno::Any SAL_CALL - getCurrentValue() throw( css::uno::RuntimeException, std::exception ) override; + getCurrentValue() override; virtual sal_Bool SAL_CALL - setCurrentValue( const css::uno::Any& aNumber ) throw( css::uno::RuntimeException, std::exception ) override; + setCurrentValue( const css::uno::Any& aNumber ) override; virtual css::uno::Any SAL_CALL - getMaximumValue() throw( css::uno::RuntimeException, std::exception ) override; + getMaximumValue() override; virtual css::uno::Any SAL_CALL - getMinimumValue() throw( css::uno::RuntimeException, std::exception ) override; + getMinimumValue() override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& sServiceName ) override; virtual css::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XTypeProvider virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; + getImplementationId() override; // internal /// Sets the checked status @@ -417,10 +404,10 @@ public: protected: /// @throws css::uno::RuntimeException - Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen(); /// @throws css::uno::RuntimeException - Rectangle const & GetBoundingBox() throw( css::uno::RuntimeException ); + Rectangle const & GetBoundingBox(); void CommitChange( const css::accessibility::AccessibleEventObject& rEvent ); @@ -430,7 +417,7 @@ protected: inline bool IsAlive() const; /// @throws css::lang::DisposedException if it's not alive - void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException ); + void ThrowExceptionIfNotAlive(); /// Mutex guarding this object. ::osl::Mutex maMutex; diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 6440fc4bc755..73d98dbe5ec3 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -102,7 +102,7 @@ public: protected: // FmXChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override; protected: using SfxControllerItem::GetBindings; diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 32ef594b3c6e..753768681b1e 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -52,14 +52,14 @@ namespace svxform OAddConditionDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index 71701fa6ede6..fcbf6c464486 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -47,8 +47,7 @@ public: static bool save( const OUString& rURL, const css::uno::Reference< css::container::XNameContainer >& xTable, const css::uno::Reference< css::embed::XStorage > &xStorage, - OUString *pOptName ) - throw (css::uno::RuntimeException, std::exception); + OUString *pOptName ); // methods without content: virtual void ExportAutoStyles_() override; diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index fea4e303dc03..c684fed7abb6 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -30,11 +30,11 @@ public: explicit SmartTagMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: void FillMenu(); @@ -58,7 +58,6 @@ SmartTagMenuController::SmartTagMenuController( const css::uno::Reference< css:: } void SmartTagMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) { resetPopupMenu( m_xPopupMenu ); @@ -216,13 +215,11 @@ IMPL_LINK( SmartTagMenuController, MenuSelect, Menu*, pMenu, bool ) } OUString SmartTagMenuController::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svx.SmartTagMenuController" ); } css::uno::Sequence< OUString > SmartTagMenuController::getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) { css::uno::Sequence< OUString > aRet { "com.sun.star.frame.PopupMenuController" }; return aRet; diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index a0488a38970d..2a13a40b0181 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -621,24 +621,24 @@ namespace sdr { namespace contact { virtual ~ViewObjectContactOfUnoControl_Impl() override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; // XWindowListener - virtual void SAL_CALL windowResized( const WindowEvent& e ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const WindowEvent& e ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const EventObject& e ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const EventObject& e ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized( const WindowEvent& e ) override; + virtual void SAL_CALL windowMoved( const WindowEvent& e ) override; + virtual void SAL_CALL windowShown( const EventObject& e ) override; + virtual void SAL_CALL windowHidden( const EventObject& e ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const PropertyChangeEvent& evt ) override; // XModeChangeListener - virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) override; // XContainerListener - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override; private: /** retrieves the SdrPageView which our associated SdrPageViewWindow belongs to @@ -1299,7 +1299,7 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) { SolarMutexGuard aSolarGuard; // some code below - in particular our disposal - might trigger actions which require the @@ -1325,33 +1325,33 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowResized( const WindowEvent& /*e*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowResized( const WindowEvent& /*e*/ ) { // not interested in } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowMoved( const WindowEvent& /*e*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowMoved( const WindowEvent& /*e*/ ) { // not interested in } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const EventObject& /*e*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const EventObject& /*e*/ ) { SolarMutexGuard aSolarGuard; m_bControlIsVisible = true; } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const EventObject& /*e*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const EventObject& /*e*/ ) { SolarMutexGuard aSolarGuard; m_bControlIsVisible = false; } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw(RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) { SolarMutexGuard aSolarGuard; // (re)painting might require VCL operations, which need the SolarMutex @@ -1372,7 +1372,7 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::modeChanged( const ModeChangeEvent& _rSource ) { SolarMutexGuard aSolarGuard; @@ -1394,13 +1394,13 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementInserted( const ContainerEvent& /*_Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementInserted( const ContainerEvent& /*_Event*/ ) { // not interested in } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) { SolarMutexGuard aSolarGuard; // some code below - in particular our disposal - might trigger actions which require the @@ -1415,7 +1415,7 @@ namespace sdr { namespace contact { } - void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException, std::exception) + void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementReplaced( const ContainerEvent& Event ) { SolarMutexGuard aSolarGuard; DBG_ASSERT( Event.Source == m_xContainer, "ViewObjectContactOfUnoControl_Impl::elementReplaced: where did this come from?" ); diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 77970a87b8b4..caa7c7754410 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -45,19 +45,16 @@ public: PrimitiveFactory2D(): PrimitiveFactory2DImplBase(m_aMutex) {} // Methods from XPrimitiveFactory2D - virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.graphic.PrimitiveFactory2D"); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return css::uno::Sequence<OUString>{ "com.sun.star.graphic.PrimitiveFactory2D"}; @@ -66,7 +63,7 @@ public: css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape( const uno::Reference< drawing::XShape >& xShape, - const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception) + const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) { css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval; @@ -86,7 +83,7 @@ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage( const uno::Reference< drawing::XDrawPage >& xDrawPage, - const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) throw (uno::RuntimeException, std::exception) + const uno::Sequence< beans::PropertyValue >& /*aParms*/ ) { css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aRetval; diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 242f8b1ccb04..f84d938bd1bd 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -71,22 +71,15 @@ public: // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( const ::rtl::OUString& rsResourceURL, - const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override; + + OUString SAL_CALL getImplementationName() override { return OUString("org.apache.openoffice.comp.svx.sidebar.PanelFactory"); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; } }; @@ -98,10 +91,6 @@ PanelFactory::PanelFactory() Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw( - container::NoSuchElementException, - lang::IllegalArgumentException, - RuntimeException, std::exception) { const ::comphelper::NamedValueCollection aArguments (rArguments); Reference<frame::XFrame> xFrame (aArguments.getOrDefault("Frame", Reference<frame::XFrame>())); diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index e00a015d34b2..1b6c624380e4 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -49,7 +49,6 @@ SelectionChangeHandler::~SelectionChangeHandler() void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject&) - throw (uno::RuntimeException, std::exception) { if (maSelectionChangeCallback) { @@ -65,13 +64,11 @@ void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject& void SAL_CALL SelectionChangeHandler::disposing (const lang::EventObject&) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL SelectionChangeHandler::disposing() - throw (uno::RuntimeException) { if (mbIsConnected) Disconnect(); diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx index a48374fb06b5..b966cd9fbc13 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx @@ -88,7 +88,7 @@ ParaLRSpacingControl::~ParaLRSpacingControl() { } -void SAL_CALL ParaLRSpacingControl::dispose() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ParaLRSpacingControl::dispose() { if(m_xMultiplexer.is()) { @@ -134,7 +134,6 @@ void ParaLRSpacingControl::StateChanged(sal_uInt16 nSID, SfxItemState eState, } void SAL_CALL ParaLRSpacingControl::notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); @@ -150,7 +149,6 @@ void SAL_CALL ParaLRSpacingControl::notifyContextChangeEvent(const css::ui::Cont } ::css::uno::Any SAL_CALL ParaLRSpacingControl::queryInterface(const ::css::uno::Type& aType) - throw (::css::uno::RuntimeException, ::std::exception) { ::css::uno::Any a(SfxToolBoxControl::queryInterface(aType)); if (a.hasValue()) @@ -165,7 +163,6 @@ void SAL_CALL ParaLRSpacingControl::acquire() throw () } void SAL_CALL ParaLRSpacingControl::disposing(const ::css::lang::EventObject&) - throw (::css::uno::RuntimeException, ::std::exception) { SfxToolBoxControl::disposing(); } diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index c8fdd697544a..5b2645f7234f 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -35,7 +35,6 @@ TextUnderlinePopup::~TextUnderlinePopup() } void TextUnderlinePopup::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { SfxToolBoxControl::initialize(aArguments); if (GetToolBox().GetItemCommand(GetId()) == m_aCommandURL) diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 6320d8f3d70b..7eb9011a0164 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -267,7 +267,7 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, } // css::util::XModifyListener -void SmartTagMgr::modified( const lang::EventObject& ) throw( RuntimeException, std::exception ) +void SmartTagMgr::modified( const lang::EventObject& ) { SolarMutexGuard aGuard; @@ -279,7 +279,7 @@ void SmartTagMgr::modified( const lang::EventObject& ) throw( RuntimeException, } // css::lang::XEventListener -void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeException, std::exception ) +void SmartTagMgr::disposing( const lang::EventObject& rEvent ) { SolarMutexGuard aGuard; @@ -306,7 +306,7 @@ void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeExc } // css::util::XChangesListener -void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( RuntimeException, std::exception) +void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) { SolarMutexGuard aGuard; diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 3b924abb13c1..ee7a1dfb03bf 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -135,36 +135,36 @@ public: private: Rectangle impl_getScaledRect_nothrow() const; // XStateChangeListener - virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override; + virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override; // document::XEventListener - virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) override; // XEmbeddedClient - virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL saveObject() override; + virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) override; // XComponentSupplier - virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception ) override; + virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() override; // XInplaceClient - virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL canInplaceActivate() override; + virtual void SAL_CALL activatingInplace() override; + virtual void SAL_CALL activatingUI() override; + virtual void SAL_CALL deactivatedInplace() override; + virtual void SAL_CALL deactivatedUI() override; + virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() override; + virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() override; + virtual awt::Rectangle SAL_CALL getPlacement() override; + virtual awt::Rectangle SAL_CALL getClipRectangle() override; + virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) override; + virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) override; + virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) override; // XWindowSupplier - virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception ) override; + virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() override; }; SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj ) @@ -180,7 +180,7 @@ Rectangle SdrLightEmbeddedClient_Impl::impl_getScaledRect_nothrow() const return aLogicRect; } -void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) +void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) { } @@ -194,7 +194,7 @@ void SdrLightEmbeddedClient_Impl::Release() release(); } -void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) { SolarMutexGuard aGuard; @@ -209,14 +209,14 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventO } } -void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ ) { SolarMutexGuard aGuard; GetSdrGlobalData().GetOLEObjCache().RemoveObj(mpObj); } -void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObject& aEvent ) { // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl @@ -282,9 +282,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj } void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject() - throw ( embed::ObjectSaveVetoException, - uno::Exception, - uno::RuntimeException, std::exception ) { // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl uno::Reference< embed::XCommonEmbedPersist > xPersist; @@ -308,8 +305,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject() } void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisible*/ ) - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { // nothing to do currently // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl @@ -328,7 +323,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisibl } uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComponent() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XCloseable > xResult; @@ -341,7 +335,6 @@ uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComp // XInplaceClient sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate() - throw ( uno::RuntimeException, std::exception ) { bool bRet = false; SolarMutexGuard aGuard; @@ -357,14 +350,10 @@ sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate() } void SAL_CALL SdrLightEmbeddedClient_Impl::activatingInplace() - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { } void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -408,14 +397,10 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() } void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedInplace() - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { } void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; css::uno::Reference< css::frame::XLayoutManager > xLayoutManager(getLayoutManager()); @@ -428,8 +413,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() } uno::Reference< css::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Impl::getLayoutManager() - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { uno::Reference< css::frame::XLayoutManager > xMan; SolarMutexGuard aGuard; @@ -447,16 +430,12 @@ uno::Reference< css::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Imp } uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl::getInplaceDispatchProvider() - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return uno::Reference < frame::XDispatchProvider >( lcl_getFrame_throw(mpObj), uno::UNO_QUERY_THROW ); } awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement() - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( !mpObj ) @@ -473,28 +452,19 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement() } awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getClipRectangle() - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { return getPlacement(); } void SAL_CALL SdrLightEmbeddedClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ ) - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { } void SAL_CALL SdrLightEmbeddedClient_Impl::scrollObject( const awt::Size& /*aOffset*/ ) - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { } void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangle& aPosRect ) - throw ( embed::WrongStateException, - uno::Exception, - uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( !mpObj ) @@ -551,7 +521,6 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl // XWindowSupplier uno::Reference< awt::XWindow > SAL_CALL SdrLightEmbeddedClient_Impl::getWindow() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< awt::XWindow > xCurrent = m_xWindow; diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index a4a0ade0ab44..4199f69921b7 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -75,7 +75,7 @@ public: {} // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; void StopListening(const uno::Reference< lang::XComponent >& xComp); void StartListening(const uno::Reference< lang::XComponent >& xComp); @@ -83,7 +83,6 @@ public: // XEventListener void SAL_CALL SdrControlEventListenerImpl::disposing( const css::lang::EventObject& /*Source*/) - throw(css::uno::RuntimeException, std::exception) { if (pObj) { diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index f72e94ca8ae9..f44fd59ccb8b 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -135,7 +135,7 @@ bool AccessibleCell::ResetState (sal_Int16 aState) // XInterface -Any SAL_CALL AccessibleCell::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) +Any SAL_CALL AccessibleCell::queryInterface( const Type& aType ) { return AccessibleCellBase::queryInterface( aType ); } @@ -158,7 +158,7 @@ void SAL_CALL AccessibleCell::release( ) throw () /** The children of this cell come from the paragraphs of text. */ -sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() { SolarMutexGuard aSolarGuard; ThrowIfDisposed (); @@ -169,7 +169,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (css::uno::Ru /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. */ -Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nIndex) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nIndex) { SolarMutexGuard aSolarGuard; ThrowIfDisposed (); @@ -185,7 +185,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI SHOWING VISIBLE */ -Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() throw (RuntimeException, std::exception) +Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -256,7 +256,7 @@ Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() // XAccessibleComponent -sal_Bool SAL_CALL AccessibleCell::containsPoint( const css::awt::Point& aPoint) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleCell::containsPoint( const css::awt::Point& aPoint) { return AccessibleComponentBase::containsPoint( aPoint ); } @@ -269,7 +269,7 @@ sal_Bool SAL_CALL AccessibleCell::containsPoint( const css::awt::Point& aPoint) the already instantiated children and only if no match is found instantiate the remaining ones. */ -Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const css::awt::Point& aPoint) throw(RuntimeException, std::exception) +Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const css::awt::Point& aPoint) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -299,7 +299,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const c } -css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -345,7 +345,7 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, } -css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception) +css::awt::Point SAL_CALL AccessibleCell::getLocation() { ThrowIfDisposed (); css::awt::Rectangle aBoundingBox(getBounds()); @@ -353,7 +353,7 @@ css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, } -css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception) +css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() { ThrowIfDisposed (); @@ -377,7 +377,7 @@ css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeExce } -awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::exception) +awt::Size SAL_CALL AccessibleCell::getSize() { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -385,13 +385,13 @@ awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::excep } -void SAL_CALL AccessibleCell::grabFocus() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleCell::grabFocus() { AccessibleComponentBase::grabFocus(); } -sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getForeground() { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -401,7 +401,7 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std: } -sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getBackground() { ThrowIfDisposed (); sal_Int32 nColor (0L); @@ -414,20 +414,20 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std: // XAccessibleExtendedComponent -css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont() throw (css::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont() { //todo return AccessibleComponentBase::getFont(); } -OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getTitledBorderText() { return AccessibleComponentBase::getTitledBorderText(); } -OUString SAL_CALL AccessibleCell::getToolTipText() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getToolTipText() { return AccessibleComponentBase::getToolTipText(); } @@ -436,7 +436,7 @@ OUString SAL_CALL AccessibleCell::getToolTipText() throw (css::uno::RuntimeExcep // XAccessibleEventBroadcaster -void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -455,7 +455,7 @@ void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAcces } -void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) { SolarMutexGuard aSolarGuard; AccessibleContextBase::removeAccessibleEventListener(rxListener); @@ -467,13 +467,13 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc // XServiceInfo -OUString SAL_CALL AccessibleCell::getImplementationName() throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getImplementationName() { return OUString("AccessibleCell"); } -Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() { ThrowIfDisposed (); @@ -534,7 +534,7 @@ void AccessibleCell::disposing() AccessibleContextBase::dispose (); } -sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent() { ThrowIfDisposed (); return mnIndexInParent; @@ -577,7 +577,7 @@ OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow ) return aBuf.makeStringAndClear(); } -OUString SAL_CALL AccessibleCell::getAccessibleName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getAccessibleName() { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 6aecc113912b..053b0948c045 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -62,43 +62,43 @@ public: virtual bool ResetState (sal_Int16 aState) override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual OUString SAL_CALL getAccessibleName() override; const sdr::table::CellRef& getCellRef() { return mxCell;} void UpdateChildren(); static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(const css::awt::Point& aPoint) throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds() throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation() throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(const css::awt::Point& aPoint) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocation() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL grabFocus() override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override; + virtual OUString SAL_CALL getTitledBorderText() override; + virtual OUString SAL_CALL getToolTipText() override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; // IAccessibleViewForwarderListener virtual void ViewForwarderChanged() override; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 58db3b2726cb..3a344da23712 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -71,15 +71,15 @@ public: /// @throws IndexOutOfBoundsException /// @throws RuntimeException - Reference< XAccessible > getAccessibleChild(sal_Int32 i) throw (IndexOutOfBoundsException, RuntimeException); + Reference< XAccessible > getAccessibleChild(sal_Int32 i); /// @throws IndexOutOfBoundsException - void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException ); + void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ); // XModifyListener - virtual void SAL_CALL modified( const EventObject& aEvent ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const EventObject& aEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; AccessibleShapeTreeInfo& mrShapeTreeInfo; Reference< XTable > mxTable; @@ -90,7 +90,7 @@ public: rtl::Reference< AccessibleCell > getAccessibleCell (const Reference< XCell >& xCell); /// @throws IndexOutOfBoundsException /// @throws RuntimeException - rtl::Reference< AccessibleCell > getAccessibleCell (sal_Int32 nRow, sal_Int32 nColumn) throw (IndexOutOfBoundsException, RuntimeException); + rtl::Reference< AccessibleCell > getAccessibleCell (sal_Int32 nRow, sal_Int32 nColumn); }; @@ -154,7 +154,6 @@ rtl::Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (co } rtl::Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (sal_Int32 nRow, sal_Int32 nColumn) - throw (IndexOutOfBoundsException, RuntimeException) { Reference< XCell > xCell( mxTable->getCellByPosition( nColumn, nRow ) ); rtl::Reference< AccessibleCell > xChild = getAccessibleCell( xCell ); @@ -176,7 +175,6 @@ rtl::Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (sa Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int32 nChildIndex) - throw (IndexOutOfBoundsException, RuntimeException) { sal_Int32 nColumn = 0, nRow = 0; getColumnAndRow( nChildIndex, nColumn, nRow ); @@ -204,7 +202,7 @@ Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int32 } -void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException ) +void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) { rnRow = 0; rnColumn = nChildIndex; @@ -226,7 +224,7 @@ void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32 } // XModifyListener -void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/ ) { if( mxTable.is() ) try { @@ -321,7 +319,7 @@ void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/ } // XEventListener -void SAL_CALL AccessibleTableShapeImpl::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleTableShapeImpl::disposing( const EventObject& /*Source*/ ) { } @@ -369,7 +367,7 @@ SvxTableController* AccessibleTableShape::getTableController() // XInterface -Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) +Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) { if ( aType == cppu::UnoType<XAccessibleTableSelection>::get()) { @@ -398,26 +396,26 @@ void SAL_CALL AccessibleTableShape::release( ) throw () // XAccessible -OUString SAL_CALL AccessibleTableShape::getImplementationName() throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableShape::getImplementationName() { return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); } -OUString AccessibleTableShape::CreateAccessibleBaseName() throw (RuntimeException) +OUString AccessibleTableShape::CreateAccessibleBaseName() { return OUString("TableShape"); } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() * mxImpl->mxTable->getColumnCount() : 0; } -Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i ) { SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -426,7 +424,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_ } -sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() { return AccessibleRole::TABLE; } @@ -444,28 +442,28 @@ void SAL_CALL AccessibleTableShape::disposing() // XAccessibleTable -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() { SolarMutexGuard aSolarGuard; return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() : 0; } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) { SolarMutexGuard aSolarGuard; return mxImpl->mxTable.is() ? mxImpl->mxTable->getColumnCount() : 0; } -OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 nRow ) { checkCellPosition( 0, nRow ); return OUString(); } -OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, 0 ); @@ -473,7 +471,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int3 } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); @@ -487,7 +485,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRo } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); @@ -501,7 +499,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 } -Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders( ) throw (RuntimeException, std::exception) +Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders( ) { Reference< XAccessibleTable > xRet; SvxTableController* pController = getTableController(); @@ -517,7 +515,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea } -Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders( ) throw (RuntimeException, std::exception) +Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders( ) { Reference< XAccessibleTable > xRet; SvxTableController* pController = getTableController(); @@ -533,7 +531,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn } -Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( ) throw (RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( ) { sal_Int32 nRow = getAccessibleRowCount(); ::std::vector<bool> aSelected( nRow, true ); @@ -569,7 +567,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( } -Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns( ) throw (RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns( ) { sal_Int32 nColumn = getAccessibleColumnCount(); ::std::vector<bool> aSelected( nColumn, true ); @@ -605,7 +603,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumn } -sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) { SolarMutexGuard aSolarGuard; checkCellPosition( 0, nRow ); @@ -618,7 +616,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow } -sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, 0 ); @@ -631,7 +629,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC } -Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); @@ -644,21 +642,21 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal } -Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption( ) { Reference< XAccessible > xRet; return xRet; } -Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) { Reference< XAccessible > xRet; return xRet; } -sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); @@ -676,7 +674,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); @@ -684,7 +682,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; sal_Int32 nColumn = 0, nRow = 0; @@ -693,7 +691,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; sal_Int32 nColumn = 0, nRow = 0; @@ -705,7 +703,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIn // XAccessibleSelection -void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) +void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; CellPos aPos; @@ -730,7 +728,7 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex } -sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) +sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; CellPos aPos; @@ -740,7 +738,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh } -void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeException, std::exception ) +void SAL_CALL AccessibleTableShape::clearAccessibleSelection() { SolarMutexGuard aSolarGuard; @@ -750,7 +748,7 @@ void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeEx } -void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( RuntimeException, std::exception ) +void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() { SolarMutexGuard aSolarGuard; @@ -761,7 +759,7 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( Runtim } -sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw ( RuntimeException, std::exception ) +sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() { SolarMutexGuard aSolarGuard; @@ -780,7 +778,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw } -Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; @@ -801,7 +799,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi } -void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) +void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; CellPos aPos; @@ -830,7 +828,6 @@ void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildInd // XAccessibleTableSelection sal_Bool SAL_CALL AccessibleTableShape::selectRow( sal_Int32 row ) -throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); @@ -840,7 +837,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) } sal_Bool SAL_CALL AccessibleTableShape::selectColumn( sal_Int32 column ) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); @@ -850,7 +846,6 @@ sal_Bool SAL_CALL AccessibleTableShape::selectColumn( sal_Int32 column ) } sal_Bool SAL_CALL AccessibleTableShape::unselectRow( sal_Int32 row ) -throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); @@ -860,7 +855,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) } sal_Bool SAL_CALL AccessibleTableShape::unselectColumn( sal_Int32 column ) -throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); @@ -892,7 +886,7 @@ sal_Int32 AccessibleTableShape::GetIndexOfSelectedChild( return n < nChildren ? n : -1L; } -void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException ) +void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) { mxImpl->getColumnAndRow(nChildIndex, rnColumn, rnRow); } @@ -900,12 +894,10 @@ void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rn // XSelectionChangeListener void SAL_CALL AccessibleTableShape::disposing (const EventObject& aEvent) - throw (RuntimeException, std::exception) { AccessibleShape::disposing(aEvent); } void SAL_CALL AccessibleTableShape::selectionChanged (const EventObject& rEvent) - throw (RuntimeException, std::exception) { //sdr::table::CellRef xCellRef = static_cast< sdr::table::CellRef > (rEvent.Source); Reference< XCell > xCell(rEvent.Source, UNO_QUERY); @@ -1001,7 +993,7 @@ bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState) return AccessibleContextBase::ResetState (aState); } -void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) throw ( IndexOutOfBoundsException ) +void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) { if( (nCol >= 0) && (nRow >= 0) && mxImpl->mxTable.is() && (nCol < mxImpl->mxTable->getColumnCount()) && (nRow < mxImpl->mxTable->getRowCount()) ) return; @@ -1021,152 +1013,152 @@ AccessibleTableHeaderShape::~AccessibleTableHeaderShape() } // XAccessible -Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext() throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext() { return this; } // XAccessibleContext -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleChildCount( ) { return getAccessibleRowCount() * getAccessibleColumnCount(); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild( sal_Int32 i ) { return mpTable->getAccessibleChild( i ); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent() throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent() { Reference< XAccessible > XParent; return XParent; } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent() { return -1; } -sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole() { return mpTable->getAccessibleRole(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription() throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription() { return mpTable->getAccessibleDescription(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName() throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName() { return mpTable->getAccessibleName(); } -Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet() throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet() { return mpTable->getAccessibleStateSet(); } -Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet() throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet() { return mpTable->getAccessibleRelationSet(); } -Locale SAL_CALL AccessibleTableHeaderShape::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale SAL_CALL AccessibleTableHeaderShape::getLocale() { return mpTable->getLocale(); } //XAccessibleComponent -sal_Bool SAL_CALL AccessibleTableHeaderShape::containsPoint ( const css::awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleTableHeaderShape::containsPoint ( const css::awt::Point& aPoint ) { return mpTable->containsPoint( aPoint ); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoint ( const css::awt::Point& aPoint) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoint ( const css::awt::Point& aPoint) { return mpTable->getAccessibleAtPoint( aPoint ); } -css::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds() throw (RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds() { return mpTable->getBounds(); } -css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation() throw (RuntimeException, std::exception) +css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation() { return mpTable->getLocation(); } -css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen() throw (RuntimeException, std::exception) +css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen() { return mpTable->getLocationOnScreen(); } -css::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize() throw (RuntimeException, std::exception) +css::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize() { return mpTable->getSize(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground() { return mpTable->getForeground(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground() { return mpTable->getBackground(); } -void SAL_CALL AccessibleTableHeaderShape::grabFocus() throw (RuntimeException, std::exception) +void SAL_CALL AccessibleTableHeaderShape::grabFocus() { mpTable->grabFocus(); } // XAccessibleTable -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowCount() { return mbRow ? 1 : mpTable->getAccessibleRowCount(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnCount() { return !mbRow ? 1 : mpTable->getAccessibleColumnCount(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleRowDescription( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleRowDescription( sal_Int32 nRow ) { return mpTable->getAccessibleRowDescription( nRow ); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnDescription( sal_Int32 nColumn ) { return mpTable->getAccessibleColumnDescription( nColumn ); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) { return mpTable->getAccessibleRowExtentAt( nRow, nColumn ); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) { return mpTable->getAccessibleColumnExtentAt( nRow, nColumn ); } -Reference< XAccessibleTable > SAL_CALL AccessibleTableHeaderShape::getAccessibleRowHeaders( ) throw (RuntimeException, std::exception) +Reference< XAccessibleTable > SAL_CALL AccessibleTableHeaderShape::getAccessibleRowHeaders( ) { Reference< XAccessibleTable > xRet; return xRet; } -Reference< XAccessibleTable > SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnHeaders( ) throw (RuntimeException, std::exception) +Reference< XAccessibleTable > SAL_CALL AccessibleTableHeaderShape::getAccessibleColumnHeaders( ) { Reference< XAccessibleTable > xRet; return xRet; } -Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessibleRows( ) throw (RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessibleRows( ) { sal_Int32 nRow = getAccessibleRowCount(); ::std::vector<bool> aSelected( nRow, true ); @@ -1201,7 +1193,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessible return aRet; } -Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessibleColumns( ) throw (RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessibleColumns( ) { sal_Int32 nColumn = getAccessibleColumnCount(); ::std::vector<bool> aSelected( nColumn, true ); @@ -1236,54 +1228,53 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableHeaderShape::getSelectedAccessible return aRet; } -sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleRowSelected( sal_Int32 nRow ) { return mpTable->isAccessibleRowSelected( nRow ); } -sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleColumnSelected( sal_Int32 nColumn ) { return mpTable->isAccessibleColumnSelected( nColumn ); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) { return mpTable->getAccessibleCellAt( nRow, nColumn ); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleCaption( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleCaption( ) { return mpTable->getAccessibleCaption(); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleSummary( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleSummary( ) { return mpTable->getAccessibleSummary(); } -sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) { return mpTable->isAccessibleSelected( nRow, nColumn ); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { return mpTable->getAccessibleIndex( nRow, nColumn ); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRow( sal_Int32 nChildIndex ) { return mpTable->getAccessibleRow( nChildIndex ); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumn( sal_Int32 nChildIndex ) { return mpTable->getAccessibleColumn( nChildIndex ); } // XAccessibleTableSelection sal_Bool SAL_CALL AccessibleTableHeaderShape::selectRow( sal_Int32 row ) -throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if( mbRow ) return mpTable->selectRow( row ); @@ -1297,7 +1288,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) } sal_Bool SAL_CALL AccessibleTableHeaderShape::selectColumn( sal_Int32 column ) -throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if( !mbRow ) return mpTable->selectColumn( column ); @@ -1311,7 +1301,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) } sal_Bool SAL_CALL AccessibleTableHeaderShape::unselectRow( sal_Int32 row ) -throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if( mbRow ) return mpTable->unselectRow( row ); @@ -1324,7 +1313,6 @@ throw (IndexOutOfBoundsException, RuntimeException, std::exception) } sal_Bool SAL_CALL AccessibleTableHeaderShape::unselectColumn( sal_Int32 column ) -throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if( !mbRow ) return mpTable->unselectColumn( column ); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index aab82da16cad..0d3b4d444e35 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -352,7 +352,7 @@ rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject* } -Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException) +Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) : SdrText( rTableObj, pOutlinerParaObject ) , SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) , mpPropSet( ImplGetSvxCellPropertySet() ) @@ -803,7 +803,7 @@ sdr::properties::TextProperties* Cell::CloneProperties( SdrObject& rNewObj, Cell // XInterface -Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL Cell::queryInterface( const Type & rType ) { if( rType == cppu::UnoType<XMergeableCell>::get() ) return Any( Reference< XMergeableCell >( this ) ); @@ -840,7 +840,7 @@ void SAL_CALL Cell::release() throw () // XTypeProvider -Sequence< Type > SAL_CALL Cell::getTypes( ) throw (RuntimeException, std::exception) +Sequence< Type > SAL_CALL Cell::getTypes( ) { Sequence< Type > aTypes( SvxUnoTextBase::getTypes() ); @@ -853,29 +853,25 @@ Sequence< Type > SAL_CALL Cell::getTypes( ) throw (RuntimeException, std::excep } -Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } // XLayoutConstrains css::awt::Size SAL_CALL Cell::getMinimumSize() - throw (RuntimeException, - std::exception) { return css::awt::Size( getMinimumWidth(), getMinimumHeight() ); } css::awt::Size SAL_CALL Cell::getPreferredSize() - throw (RuntimeException, - std::exception) { return getMinimumSize(); } -css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize ) throw (RuntimeException, std::exception) +css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize ) { return aNewSize; } @@ -884,19 +880,19 @@ css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize ) // XMergeableCell -sal_Int32 SAL_CALL Cell::getRowSpan() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL Cell::getRowSpan() { return mnRowSpan; } -sal_Int32 SAL_CALL Cell::getColumnSpan() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL Cell::getColumnSpan() { return mnColSpan; } -sal_Bool SAL_CALL Cell::isMerged() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL Cell::isMerged() { return mbMerged; } @@ -905,13 +901,13 @@ sal_Bool SAL_CALL Cell::isMerged() throw (RuntimeException, std::exception) // XCell -OUString SAL_CALL Cell::getFormula( ) throw (RuntimeException, std::exception) +OUString SAL_CALL Cell::getFormula( ) { return msFormula; } -void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeException, std::exception) +void SAL_CALL Cell::setFormula( const OUString& aFormula ) { if( msFormula != aFormula ) { @@ -920,13 +916,13 @@ void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeExcepti } -double SAL_CALL Cell::getValue( ) throw (RuntimeException, std::exception) +double SAL_CALL Cell::getValue( ) { return mfValue; } -void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException, std::exception) +void SAL_CALL Cell::setValue( double nValue ) { if( mfValue != nValue ) { @@ -936,13 +932,13 @@ void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException, std::exce } -CellContentType SAL_CALL Cell::getType() throw (RuntimeException, std::exception) +CellContentType SAL_CALL Cell::getType() { return mnCellContentType; } -sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL Cell::getError( ) { return mnError; } @@ -973,13 +969,13 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa return aAny; } -Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() { return mpPropSet->getPropertySetInfo(); } -void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) { ::SolarMutexGuard aGuard; @@ -1120,7 +1116,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& } -Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; @@ -1203,22 +1199,22 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow } -void SAL_CALL Cell::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Cell::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) { } -void SAL_CALL Cell::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Cell::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) { } -void SAL_CALL Cell::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Cell::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) { } -void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) { } @@ -1226,7 +1222,7 @@ void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName // XMultiPropertySet -void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) { ::SolarMutexGuard aSolarGuard; @@ -1256,7 +1252,7 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName } -Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception) +Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) { ::SolarMutexGuard aSolarGuard; @@ -1289,17 +1285,17 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP } -void SAL_CALL Cell::addPropertiesChangeListener( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) +void SAL_CALL Cell::addPropertiesChangeListener( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) { } -void SAL_CALL Cell::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) +void SAL_CALL Cell::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& /*xListener*/ ) { } -void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) +void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) { } @@ -1307,7 +1303,7 @@ void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPr // XPropertyState -PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; @@ -1410,7 +1406,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th } -Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) { ::SolarMutexGuard aGuard; @@ -1440,7 +1436,7 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt } -void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; @@ -1481,7 +1477,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U } -Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) { ::SolarMutexGuard aGuard; @@ -1527,7 +1523,6 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(Unk void SAL_CALL Cell::setAllPropertiesToDefault() - throw (RuntimeException, std::exception) { delete mpProperties; mpProperties = new sdr::properties::CellProperties( static_cast< SdrTableObj& >( GetObject() ), this ); @@ -1554,7 +1549,7 @@ void SAL_CALL Cell::setAllPropertiesToDefault() } -void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception) +void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) { sal_Int32 nCount = aPropertyNames.getLength(); const OUString* pName = aPropertyNames.getConstArray(); @@ -1564,7 +1559,7 @@ void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropert } -Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) { sal_Int32 nCount = aPropertyNames.getLength(); Sequence< Any > aDefaults( nCount ); @@ -1581,14 +1576,14 @@ Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& // XText -void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, const Reference< XTextContent >& xContent, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, const Reference< XTextContent >& xContent, sal_Bool bAbsorb ) { SvxUnoTextBase::insertTextContent( xRange, xContent, bAbsorb ); notifyModified(); } -void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent ) throw (NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent ) { SvxUnoTextBase::removeTextContent( xContent ); notifyModified(); @@ -1598,14 +1593,14 @@ void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent // XSimpleText -void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (RuntimeException, std::exception) +void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) { SvxUnoTextBase::insertString( xRange, aString, bAbsorb ); notifyModified(); } -void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) { SvxUnoTextBase::insertControlCharacter( xRange, nControlCharacter, bAbsorb ); notifyModified(); @@ -1615,21 +1610,21 @@ void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRang // XTextRange -OUString SAL_CALL Cell::getString( ) throw (RuntimeException, std::exception) +OUString SAL_CALL Cell::getString( ) { maSelection.nStartPara = EE_PARA_MAX_COUNT; return SvxUnoTextBase::getString(); } -void SAL_CALL Cell::setString( const OUString& aString ) throw (RuntimeException, std::exception) +void SAL_CALL Cell::setString( const OUString& aString ) { SvxUnoTextBase::setString( aString ); notifyModified(); } // XEventListener -void SAL_CALL Cell::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) +void SAL_CALL Cell::disposing( const EventObject& /*Source*/ ) { mxTable.clear(); dispose(); diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 572908aa119f..9b568c584c11 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -102,79 +102,73 @@ public: SVX_DLLPRIVATE void copyFormatFrom( const CellRef& xSourceCell ); // XInterface - SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& Type ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& Type ) override; SVX_DLLPRIVATE virtual void SAL_CALL acquire() throw () override; SVX_DLLPRIVATE virtual void SAL_CALL release() throw () override; // XTypeProvider - SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) override; // XLayoutConstrains - SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getMinimumSize() - throw (css::uno::RuntimeException, - std::exception) override; - SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getPreferredSize() - throw (css::uno::RuntimeException, - std::exception) override; - SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getMinimumSize() override; + SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getPreferredSize() override; + SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // XMergeableCell - SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getRowSpan() throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColumnSpan() throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual sal_Bool SAL_CALL isMerged() throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getRowSpan() override; + SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColumnSpan() override; + SVX_DLLPRIVATE virtual sal_Bool SAL_CALL isMerged() override; // XCell - SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const OUString& aFormula ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual double SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::table::CellContentType SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual sal_Int32 SAL_CALL getError() throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() override; + SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const OUString& aFormula ) override; + SVX_DLLPRIVATE virtual double SAL_CALL getValue() override; + SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) override; + SVX_DLLPRIVATE virtual css::table::CellContentType SAL_CALL getType() override; + SVX_DLLPRIVATE virtual sal_Int32 SAL_CALL getError() override; // css::beans::XPropertySet - SVX_DLLPRIVATE virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XMultiPropertySet - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; // css::beans::XPropertyState - SVX_DLLPRIVATE virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; // XMultiPropertyStates - SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault() - throw (css::uno::RuntimeException, - std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault() override; + SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; // XText - SVX_DLLPRIVATE virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) override; + SVX_DLLPRIVATE virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) override; // XSimpleText - SVX_DLLPRIVATE virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) override; + SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, sal_Bool bAbsorb ) override; // XTextRange - SVX_DLLPRIVATE virtual OUString SAL_CALL getString( ) throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual OUString SAL_CALL getString( ) override; + SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) override; // XEventListener - SVX_DLLPRIVATE virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; SVX_DLLPRIVATE virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject ) override; @@ -199,7 +193,7 @@ protected: private: /// @throws css::uno::RuntimeException - SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException); + SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ); SVX_DLLPRIVATE virtual ~Cell() throw() override; Cell(Cell const &) = delete; diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 02427a6770a4..37b9e04577c8 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -50,19 +50,19 @@ CellCursor::~CellCursor() // XCellCursor -Reference< XCell > SAL_CALL CellCursor::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCell > SAL_CALL CellCursor::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) { return CellRange::getCellByPosition( nColumn, nRow ); } -Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) { return CellRange::getCellRangeByPosition( nLeft, nTop, nRight, nBottom ); } -Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& aRange ) throw (RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& aRange ) { return CellRange::getCellRangeByName( aRange ); } @@ -71,21 +71,21 @@ Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& // XCellCursor -void SAL_CALL CellCursor::gotoStart( ) throw (RuntimeException, std::exception) +void SAL_CALL CellCursor::gotoStart( ) { mnRight = mnLeft; mnBottom = mnTop; } -void SAL_CALL CellCursor::gotoEnd( ) throw (RuntimeException, std::exception) +void SAL_CALL CellCursor::gotoEnd( ) { mnLeft = mnRight; mnTop = mnBottom; } -void SAL_CALL CellCursor::gotoNext( ) throw (RuntimeException, std::exception) +void SAL_CALL CellCursor::gotoNext( ) { if( mxTable.is() ) { @@ -113,7 +113,7 @@ void SAL_CALL CellCursor::gotoNext( ) throw (RuntimeException, std::exception) } -void SAL_CALL CellCursor::gotoPrevious( ) throw (RuntimeException, std::exception) +void SAL_CALL CellCursor::gotoPrevious( ) { if( mxTable.is() ) { @@ -133,7 +133,7 @@ void SAL_CALL CellCursor::gotoPrevious( ) throw (RuntimeException, std::excepti } -void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (RuntimeException, std::exception) +void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) { if( mxTable.is() ) { @@ -231,7 +231,7 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd ) } -void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL CellCursor::merge( ) { CellPos aStart, aEnd; if( !GetMergedSelection( aStart, aEnd ) ) @@ -493,7 +493,7 @@ void CellCursor::split_vertical( sal_Int32 nRows ) } -void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (NoSupportException, IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) { if( (nColumns < 0) || (nRows < 0) ) throw IllegalArgumentException(); @@ -531,7 +531,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No } -sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL CellCursor::isMergeable( ) { CellPos aStart, aEnd; return GetMergedSelection( aStart, aEnd ); diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index 6a4c301b45cc..6b2a9d5b6d5b 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -39,21 +39,21 @@ public: virtual ~CellCursor() override; // XCellRange - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override; // XCellCursor - virtual void SAL_CALL gotoStart( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoEnd( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoNext( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoPrevious( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoStart( ) override; + virtual void SAL_CALL gotoEnd( ) override; + virtual void SAL_CALL gotoNext( ) override; + virtual void SAL_CALL gotoPrevious( ) override; + virtual void SAL_CALL gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) override; // XMergeableCellRange - virtual void SAL_CALL merge( ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL split( ::sal_Int32 Columns, ::sal_Int32 Rows ) throw (css::lang::NoSupportException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isMergeable( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL merge( ) override; + virtual void SAL_CALL split( ::sal_Int32 Columns, ::sal_Int32 Rows ) override; + virtual sal_Bool SAL_CALL isMergeable( ) override; protected: bool GetMergedSelection( CellPos& rStart, CellPos& rEnd ); diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index 1f7dc02416ff..b5e8001c283d 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -76,13 +76,13 @@ Reference< XTable > CellRange::getTable() // XCellRange -Reference< XCell > SAL_CALL CellRange::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCell > SAL_CALL CellRange::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) { return mxTable->getCellByPosition( mnLeft + nColumn, mnTop + nRow ); } -Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) { if( (nLeft >= 0 ) && (nTop >= 0) && (nRight >= nLeft) && (nBottom >= nTop) ) { @@ -102,7 +102,7 @@ Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nL } -Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& /*aRange*/ ) { return Reference< XCellRange >(); } diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 519729c7b608..c3955c415778 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -42,9 +42,9 @@ public: virtual css::uno::Reference< css::table::XTable > getTable() override; // XCellRange - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override; protected: TableModelRef mxTable; diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index 687da1b31937..1b5e081e444b 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -52,7 +52,7 @@ void FastPropertySetInfo::addProperties( const PropertyVector& rProps ) } -const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw (UnknownPropertyException ) +const Property& FastPropertySetInfo::getProperty( const OUString& aName ) { PropertyMap::iterator aIter( maMap.find( aName ) ); if( aIter == maMap.end() ) @@ -74,19 +74,19 @@ const Property* FastPropertySetInfo::hasProperty( const OUString& aName ) // XPropertySetInfo -Sequence< Property > SAL_CALL FastPropertySetInfo::getProperties() throw (RuntimeException, std::exception) +Sequence< Property > SAL_CALL FastPropertySetInfo::getProperties() { return Sequence< Property >( &maProperties[0], maProperties.size() ); } -Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) +Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName ) { return getProperty( aName ); } -sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) { return hasProperty( aName ) != nullptr; } @@ -105,40 +105,40 @@ FastPropertySet::~FastPropertySet() // XPropertySet -Reference< XPropertySetInfo > SAL_CALL FastPropertySet::getPropertySetInfo( ) throw (RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL FastPropertySet::getPropertySetInfo( ) { return Reference< XPropertySetInfo >( mxInfo.get() ); } -void SAL_CALL FastPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL FastPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) { setFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle, aValue ); } -Any SAL_CALL FastPropertySet::getPropertyValue( const OUString& aPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL FastPropertySet::getPropertyValue( const OUString& aPropertyName ) { return getFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle ); } -void SAL_CALL FastPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL FastPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) { } -void SAL_CALL FastPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL FastPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) { } -void SAL_CALL FastPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL FastPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) { } -void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) { } @@ -146,7 +146,7 @@ void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, co // XMultiPropertySet -void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) { const OUString* pPropertyNames = aPropertyNames.getConstArray(); const Any* pValues = aValues.getConstArray(); @@ -169,7 +169,7 @@ void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aP } -Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception) +Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) { sal_Int32 nCount = aPropertyNames.getLength(); Sequence< Any > aValues( nCount ); @@ -192,17 +192,17 @@ Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUS } -void SAL_CALL FastPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) +void SAL_CALL FastPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) { } -void SAL_CALL FastPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) +void SAL_CALL FastPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) { } -void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) +void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) { } diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index a88786a32d5e..47ac513eff0b 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -45,13 +45,13 @@ public: void addProperties( const PropertyVector& rProps ); /// @throws css::beans::UnknownPropertyException - const css::beans::Property& getProperty( const OUString& aName ) throw (css::beans::UnknownPropertyException ); + const css::beans::Property& getProperty( const OUString& aName ); const css::beans::Property* hasProperty( const OUString& aName ); // XPropertySetInfo - virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override; private: PropertyVector maProperties; @@ -66,25 +66,25 @@ public: virtual ~FastPropertySet() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XMultiPropertySet // virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override = 0; - virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override = 0; + virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) override = 0; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override = 0; private: rtl::Reference< FastPropertySetInfo > mxInfo; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index c951223827f1..0436d57e0106 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -224,10 +224,10 @@ public: SdrTableObjImpl& operator=( const SdrTableObjImpl& rSource ); // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; void update(); @@ -556,7 +556,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset // XModifyListener -void SAL_CALL SdrTableObjImpl::modified( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SdrTableObjImpl::modified( const css::lang::EventObject& /*aEvent*/ ) { update(); } @@ -636,7 +636,7 @@ void SdrTableObjImpl::dumpAsXml(xmlTextWriterPtr pWriter) const // XEventListener -void SAL_CALL SdrTableObjImpl::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SdrTableObjImpl::disposing( const css::lang::EventObject& /*Source*/ ) { mxActiveCell.clear(); mxTable.clear(); diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 6dc825b39159..06166e67488f 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -67,7 +67,7 @@ void TableColumn::dispose() } -void TableColumn::throwIfDisposed() const throw (css::uno::RuntimeException) +void TableColumn::throwIfDisposed() const { if( !mxTableModel.is() ) throw DisposedException(); @@ -90,7 +90,7 @@ TableColumn& TableColumn::operator=( const TableColumn& r ) // XCellRange -Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) { throwIfDisposed(); if( nColumn != 0 ) @@ -100,7 +100,7 @@ Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, s } -Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) { throwIfDisposed(); if( (nTop >= 0 ) && (nLeft == 0) && (nBottom >= nTop) && (nRight == 0) ) @@ -111,7 +111,7 @@ Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 } -Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString& /*aRange*/ ) { return Reference< XCellRange >(); } @@ -120,13 +120,13 @@ Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString // XNamed -OUString SAL_CALL TableColumn::getName() throw (RuntimeException, std::exception) +OUString SAL_CALL TableColumn::getName() { return maName; } -void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeException, std::exception) +void SAL_CALL TableColumn::setName( const OUString& aName ) { maName = aName; } @@ -135,7 +135,7 @@ void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeExcept // XFastPropertySet -void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) { bool bOk = false; bool bChange = false; @@ -223,7 +223,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a } -Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) { switch( nHandle ) { diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index 5832ea02956c..711a4c0c3847 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -42,22 +42,22 @@ public: void dispose(); /// @throws css::uno::RuntimeException - void throwIfDisposed() const throw (css::uno::RuntimeException); + void throwIfDisposed() const; TableColumn& operator=( const TableColumn& ); // XCellRange - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override; // XNamed - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override; /// Get the table that owns this column. TableModelRef const & getModel() const; diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index eaf01178c979..d80581ee30d0 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -50,7 +50,7 @@ void TableColumns::dispose() } -void TableColumns::throwIfDisposed() const throw (css::uno::RuntimeException) +void TableColumns::throwIfDisposed() const { if( !mxTableModel.is() ) throw DisposedException(); @@ -60,14 +60,14 @@ void TableColumns::throwIfDisposed() const throw (css::uno::RuntimeException) // XTableRows -void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception) +void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) { throwIfDisposed(); mxTableModel->insertColumns( nIndex, nCount ); } -void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception) +void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) { throwIfDisposed(); mxTableModel->removeColumns( nIndex, nCount ); @@ -77,14 +77,14 @@ void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) // XIndexAccess -sal_Int32 SAL_CALL TableColumns::getCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL TableColumns::getCount() { throwIfDisposed(); return mxTableModel->getColumnCount(); } -Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) { throwIfDisposed(); @@ -98,7 +98,7 @@ Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBounds // XElementAccess -Type SAL_CALL TableColumns::getElementType() throw (RuntimeException, std::exception) +Type SAL_CALL TableColumns::getElementType() { throwIfDisposed(); @@ -106,7 +106,7 @@ Type SAL_CALL TableColumns::getElementType() throw (RuntimeException, std::excep } -sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TableColumns::hasElements() { throwIfDisposed(); diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 56051fdc2113..778a1cae6031 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -36,19 +36,19 @@ public: void dispose(); /// @throws css::uno::RuntimeException - void throwIfDisposed() const throw (css::uno::RuntimeException); + void throwIfDisposed() const; // XTableColumns - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // Methods - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; private: TableModelRef mxTableModel; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 600495aadc82..02c5a732cf7a 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -110,10 +110,10 @@ public: : mpController( pController ) {} // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; SvxTableController* mpController; }; @@ -122,7 +122,7 @@ public: // XModifyListener -void SAL_CALL SvxTableControllerModifyListener::modified( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxTableControllerModifyListener::modified( const css::lang::EventObject& ) { if( mpController ) mpController->onTableModified(); @@ -132,7 +132,7 @@ void SAL_CALL SvxTableControllerModifyListener::modified( const css::lang::Event // XEventListener -void SAL_CALL SvxTableControllerModifyListener::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxTableControllerModifyListener::disposing( const css::lang::EventObject& ) { mpController = nullptr; } diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index ea4aa3358105..49b44de1b05b 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -72,43 +72,43 @@ public: TableDesignStyle(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XStyle - virtual sal_Bool SAL_CALL isUserDefined() throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isInUse() throw (RuntimeException, std::exception) override; - virtual OUString SAL_CALL getParentStyle() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) throw (NoSuchElementException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isUserDefined() override; + virtual sal_Bool SAL_CALL isInUse() override; + virtual OUString SAL_CALL getParentStyle() override; + virtual void SAL_CALL setParentStyle( const OUString& aParentStyle ) override; // XNamed - virtual OUString SAL_CALL getName() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XNameAccess - virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getElementNames() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) override; + virtual Any SAL_CALL getByName( const OUString& aName ) override; + virtual Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(RuntimeException, std::exception) override ; - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override ; + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const Reference< XModifyListener >& aListener ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const Reference< XModifyListener >& aListener ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const Reference< XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const Reference< XModifyListener >& aListener ) override; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; void notifyModifyListener(); @@ -127,51 +127,51 @@ class TableDesignFamily : public ::cppu::WeakImplHelper< XNameContainer, XNamed, { public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XNamed - virtual OUString SAL_CALL getName( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XNameAccess - virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getElementNames() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) override; + virtual Any SAL_CALL getByName( const OUString& aName ) override; + virtual Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(RuntimeException, std::exception) override ; - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override ; + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) override; // XSingleServiceFactory - virtual Reference< XInterface > SAL_CALL createInstance( ) throw(Exception, RuntimeException, std::exception) override; - virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override; + virtual Reference< XInterface > SAL_CALL createInstance( ) override; + virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) override; // XComponent - virtual void SAL_CALL dispose( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override; // XPropertySet - virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference<XPropertyChangeListener>& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener>& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const Reference<XVetoableChangeListener>&aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) override; + virtual Reference<XPropertySetInfo> SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) override; + virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference<XPropertyChangeListener>& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference<XPropertyChangeListener>& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference<XVetoableChangeListener>& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName,const Reference<XVetoableChangeListener>&aListener ) override; TableDesignStyleVector maDesigns; }; @@ -204,17 +204,17 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap() } // XServiceInfo -OUString SAL_CALL TableDesignStyle::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL TableDesignStyle::getImplementationName() { return OUString("TableDesignStyle"); } -sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames() { OUString aServiceName("com.sun.star.style.Style"); Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -222,12 +222,12 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getSupportedServiceNames() throw } // XStyle -sal_Bool SAL_CALL TableDesignStyle::isUserDefined() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TableDesignStyle::isUserDefined() { return false; } -sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TableDesignStyle::isInUse() { ClearableMutexGuard aGuard( rBHelper.rMutex ); OInterfaceContainerHelper * pContainer = rBHelper.getContainer( cppu::UnoType<XModifyListener>::get() ); @@ -248,13 +248,13 @@ sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException, std::exce } -OUString SAL_CALL TableDesignStyle::getParentStyle() throw (RuntimeException, std::exception) +OUString SAL_CALL TableDesignStyle::getParentStyle() { return OUString(); } -void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) throw (NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) { } @@ -262,13 +262,13 @@ void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) throw (NoSuchE // XNamed -OUString SAL_CALL TableDesignStyle::getName() throw (RuntimeException, std::exception) +OUString SAL_CALL TableDesignStyle::getName() { return msName; } -void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::setName( const OUString& rName ) { msName = rName; } @@ -277,7 +277,7 @@ void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeE // XNameAccess -Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) { SolarMutexGuard aGuard; @@ -291,7 +291,7 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchEl } -Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() { SolarMutexGuard aGuard; @@ -299,7 +299,7 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeE } -sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) { SolarMutexGuard aGuard; @@ -313,13 +313,13 @@ sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(Ru // XElementAccess -Type SAL_CALL TableDesignStyle::getElementType() throw(RuntimeException, std::exception) +Type SAL_CALL TableDesignStyle::getElementType() { return cppu::UnoType<XStyle>::get(); } -sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL TableDesignStyle::hasElements() { return true; } @@ -328,13 +328,13 @@ sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException, std::e // XIndexAccess -sal_Int32 SAL_CALL TableDesignStyle::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL TableDesignStyle::getCount() { return style_count; } -Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) { SolarMutexGuard aGuard; @@ -348,7 +348,7 @@ Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou // XNameReplace -void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& aElement ) { SolarMutexGuard aGuard; @@ -398,7 +398,7 @@ void SAL_CALL TableDesignStyle::disposing() // XModifyBroadcaster -void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListener >& xListener ) { ClearableMutexGuard aGuard( rBHelper.rMutex ); if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -414,7 +414,7 @@ void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListe } -void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener ) { rBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener ); } @@ -439,13 +439,13 @@ void TableDesignStyle::notifyModifyListener() // if we get a modify hint from a style, notify all registered XModifyListener -void SAL_CALL TableDesignStyle::modified( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::modified( const css::lang::EventObject& ) { notifyModifyListener(); } -void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) { } @@ -454,17 +454,17 @@ void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw // XServiceInfo -OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL TableDesignFamily::getImplementationName() { return OUString("TableDesignFamily"); } -sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() { OUString aServiceName("com.sun.star.style.StyleFamily"); Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -472,17 +472,17 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() thro } // XNamed -OUString SAL_CALL TableDesignFamily::getName() throw (RuntimeException, std::exception) +OUString SAL_CALL TableDesignFamily::getName() { return OUString( "table" ); } -void SAL_CALL TableDesignFamily::setName( const OUString& ) throw (RuntimeException, std::exception) +void SAL_CALL TableDesignFamily::setName( const OUString& ) { } // XNameAccess -Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) { SolarMutexGuard aGuard; @@ -498,7 +498,7 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchE } -Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() { SolarMutexGuard aGuard; @@ -514,7 +514,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(Runtime } -sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) { SolarMutexGuard aGuard; @@ -531,13 +531,13 @@ sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(Ru // XElementAccess -Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException, std::exception) +Type SAL_CALL TableDesignFamily::getElementType() { return cppu::UnoType<XStyle>::get(); } -sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL TableDesignFamily::hasElements() { SolarMutexGuard aGuard; @@ -548,7 +548,7 @@ sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException, std:: // XIndexAccess -sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL TableDesignFamily::getCount() { SolarMutexGuard aGuard; @@ -556,7 +556,7 @@ sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException, std::ex } -Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) { SolarMutexGuard aGuard; @@ -570,7 +570,7 @@ Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBo // XNameContainer -void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& rElement ) { SolarMutexGuard aGuard; @@ -589,7 +589,7 @@ void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& } -void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) { SolarMutexGuard aGuard; @@ -612,7 +612,7 @@ void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoS // XNameReplace -void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any& aElement ) { SolarMutexGuard aGuard; @@ -639,7 +639,7 @@ void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any // XSingleServiceFactory -Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() { SolarMutexGuard aGuard; @@ -647,7 +647,7 @@ Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Excep } -Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( const Sequence< Any >& ) throw(Exception, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( const Sequence< Any >& ) { return createInstance(); } @@ -656,7 +656,7 @@ Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( // XComponent -void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException, std::exception) +void SAL_CALL TableDesignFamily::dispose( ) { TableDesignStyleVector aDesigns; aDesigns.swap( maDesigns ); @@ -670,12 +670,12 @@ void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException, std::excep } -void SAL_CALL TableDesignFamily::addEventListener( const Reference< XEventListener >& ) throw (RuntimeException, std::exception) +void SAL_CALL TableDesignFamily::addEventListener( const Reference< XEventListener >& ) { } -void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventListener >& ) throw (RuntimeException, std::exception) +void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventListener >& ) { } @@ -683,20 +683,20 @@ void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventLis // XPropertySet -Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (RuntimeException, std::exception) +Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() { OSL_FAIL( "###unexpected!" ); return Reference<XPropertySetInfo>(); } -void TableDesignFamily::setPropertyValue( const OUString& , const Any& ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void TableDesignFamily::setPropertyValue( const OUString& , const Any& ) { OSL_FAIL( "###unexpected!" ); } -Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) { if ( PropertyName == "DisplayName" ) { @@ -710,25 +710,25 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U } -void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) { OSL_FAIL( "###unexpected!" ); } -void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) { OSL_FAIL( "###unexpected!" ); } -void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) { OSL_FAIL( "###unexpected!" ); } -void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) { OSL_FAIL( "###unexpected!" ); } diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index b0274ad65a67..e608aef83b54 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -289,14 +289,14 @@ void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellV // XTable -Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeException, std::exception) +Reference< XCellCursor > SAL_CALL TableModel::createCursor() { ::SolarMutexGuard aGuard; return createCursorByRange( Reference< XCellRange >( this ) ); } -Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) throw (IllegalArgumentException, RuntimeException, std::exception) +Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) { ::SolarMutexGuard aGuard; @@ -309,14 +309,14 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen } -sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL TableModel::getRowCount() { ::SolarMutexGuard aGuard; return getRowCountImpl(); } -sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL TableModel::getColumnCount() { ::SolarMutexGuard aGuard; return getColumnCountImpl(); @@ -333,7 +333,7 @@ std::vector<sal_Int32> TableModel::getColumnWidths() // XComponent -void TableModel::dispose() throw (RuntimeException, std::exception) +void TableModel::dispose() { ::SolarMutexGuard aGuard; TableModelBase::dispose(); @@ -343,14 +343,14 @@ void TableModel::dispose() throw (RuntimeException, std::exception) // XModifiable -sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TableModel::isModified( ) { ::SolarMutexGuard aGuard; return mbModified; } -void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException, std::exception) +void SAL_CALL TableModel::setModified( sal_Bool bModified ) { { ::SolarMutexGuard aGuard; @@ -364,13 +364,13 @@ void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoE // XModifyBroadcaster -void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& xListener ) { rBHelper.addListener( cppu::UnoType<XModifyListener>::get() , xListener ); } -void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener ) { rBHelper.removeListener( cppu::UnoType<XModifyListener>::get() , xListener ); } @@ -379,7 +379,7 @@ void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener // XColumnRowRange -Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeException, std::exception) +Reference< XTableColumns > SAL_CALL TableModel::getColumns() { ::SolarMutexGuard aGuard; @@ -389,7 +389,7 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep } -Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException, std::exception) +Reference< XTableRows > SAL_CALL TableModel::getRows() { ::SolarMutexGuard aGuard; @@ -402,7 +402,7 @@ Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException, // XCellRange -Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) { ::SolarMutexGuard aGuard; @@ -414,7 +414,7 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa } -Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) { ::SolarMutexGuard aGuard; @@ -428,7 +428,7 @@ Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 n } -Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& /*aRange*/ ) { return Reference< XCellRange >(); } @@ -437,40 +437,40 @@ Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& // XPropertySet -Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo( ) throw (RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo( ) { Reference< XPropertySetInfo > xInfo; return xInfo; } -void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) { } -Any SAL_CALL TableModel::getPropertyValue( const OUString& /*PropertyName*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableModel::getPropertyValue( const OUString& /*PropertyName*/ ) { return Any(); } -void SAL_CALL TableModel::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableModel::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) { } -void SAL_CALL TableModel::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableModel::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) { } -void SAL_CALL TableModel::addVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableModel::addVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) { } -void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) { } @@ -478,12 +478,12 @@ void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPrope // XFastPropertySet -void SAL_CALL TableModel::setFastPropertyValue( ::sal_Int32 /*nHandle*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableModel::setFastPropertyValue( ::sal_Int32 /*nHandle*/, const Any& /*aValue*/ ) { } -Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) { Any aAny; return aAny; @@ -542,14 +542,14 @@ void TableModel::disposing() // XBroadcaster -void TableModel::lockBroadcasts() throw (RuntimeException, std::exception) +void TableModel::lockBroadcasts() { ::SolarMutexGuard aGuard; ++mnNotifyLock; } -void TableModel::unlockBroadcasts() throw (RuntimeException, std::exception) +void TableModel::unlockBroadcasts() { ::SolarMutexGuard aGuard; --mnNotifyLock; @@ -953,7 +953,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) } -TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsException) +TableRowRef TableModel::getRow( sal_Int32 nRow ) const { if( (nRow >= 0) && (nRow < getRowCountImpl()) ) return maRows[nRow]; @@ -962,7 +962,7 @@ TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsEx } -TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutOfBoundsException) +TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const { if( (nColumn >= 0) && (nColumn < getColumnCountImpl()) ) return maColumns[nColumn]; diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index deb083498bd6..e5027da121fa 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -95,47 +95,47 @@ public: virtual css::uno::Reference< css::table::XTable > getTable() override; // XTable - virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursor( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursorByRange( const css::uno::Reference< css::table::XCellRange >& rRange ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursor( ) override; + virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursorByRange( const css::uno::Reference< css::table::XCellRange >& rRange ) override; + virtual ::sal_Int32 SAL_CALL getRowCount() override; + virtual ::sal_Int32 SAL_CALL getColumnCount() override; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; // XModifiable - virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XColumnRowRange - virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns() override; + virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows() override; // XCellRange - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( ::sal_Int32 nColumn, ::sal_Int32 nRow ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( ::sal_Int32 nLeft, ::sal_Int32 nTop, ::sal_Int32 nRight, ::sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( ::sal_Int32 nColumn, ::sal_Int32 nRow ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( ::sal_Int32 nLeft, ::sal_Int32 nTop, ::sal_Int32 nRight, ::sal_Int32 nBottom ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override; // XBroadcaster - virtual void SAL_CALL lockBroadcasts() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockBroadcasts() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lockBroadcasts() override; + virtual void SAL_CALL unlockBroadcasts() override; protected: void notifyModification(); @@ -163,9 +163,9 @@ private: virtual void SAL_CALL disposing() override; /// @throws css::lang::IndexOutOfBoundsException - TableRowRef getRow( sal_Int32 nRow ) const throw (css::lang::IndexOutOfBoundsException); + TableRowRef getRow( sal_Int32 nRow ) const; /// @throws css::lang::IndexOutOfBoundsException - TableColumnRef getColumn( sal_Int32 nColumn ) const throw (css::lang::IndexOutOfBoundsException); + TableColumnRef getColumn( sal_Int32 nColumn ) const; void updateRows(); void updateColumns(); diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 8f96b59767ac..4f2ced4932c8 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -80,7 +80,7 @@ void TableRow::dispose() } -void TableRow::throwIfDisposed() const throw (css::uno::RuntimeException) +void TableRow::throwIfDisposed() const { if( !mxTableModel.is() ) throw DisposedException(); @@ -157,7 +157,7 @@ const TableModelRef& TableRow::getModel() const // XCellRange -Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) { throwIfDisposed(); if( nRow != 0 ) @@ -167,7 +167,7 @@ Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_ } -Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) { throwIfDisposed(); if( (nLeft >= 0 ) && (nTop == 0) && (nRight >= nLeft) && (nBottom == 0) ) @@ -178,7 +178,7 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLe } -Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) +Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /*aRange*/ ) { throwIfDisposed(); return Reference< XCellRange >(); @@ -188,13 +188,13 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& / // XNamed -OUString SAL_CALL TableRow::getName() throw (RuntimeException, std::exception) +OUString SAL_CALL TableRow::getName() { return maName; } -void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException, std::exception) +void SAL_CALL TableRow::setName( const OUString& aName ) { maName = aName; } @@ -203,7 +203,7 @@ void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException // XFastPropertySet -void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) { bool bOk = false; bool bChange = false; @@ -295,7 +295,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal } -Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) { switch( nHandle ) { diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index bcdbe5ef9bc4..7242ae138751 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -42,7 +42,7 @@ public: void dispose(); /// @throws css::uno::RuntimeException - void throwIfDisposed() const throw (css::uno::RuntimeException); + void throwIfDisposed() const; TableRow& operator=( const TableRow& ); @@ -52,17 +52,17 @@ public: const TableModelRef& getModel() const; // XCellRange - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) override; // XNamed - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) override; private: static rtl::Reference< FastPropertySetInfo > getStaticPropertySetInfo(); diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index e816f7efe53c..f0c4e7593ab2 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -51,7 +51,7 @@ void TableRows::dispose() } -void TableRows::throwIfDisposed() const throw (css::uno::RuntimeException) +void TableRows::throwIfDisposed() const { if( !mxTableModel.is() ) throw DisposedException(); @@ -61,14 +61,14 @@ void TableRows::throwIfDisposed() const throw (css::uno::RuntimeException) // XTableRows -void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception) +void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) { throwIfDisposed(); mxTableModel->insertRows( nIndex, nCount ); } -void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception) +void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) { throwIfDisposed(); mxTableModel->removeRows( nIndex, nCount ); @@ -78,14 +78,14 @@ void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) thr // XIndexAccess -sal_Int32 SAL_CALL TableRows::getCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL TableRows::getCount() { throwIfDisposed(); return mxTableModel->getRowCount(); } -Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) { throwIfDisposed(); return Any( Reference< XCellRange >( static_cast< XCellRange* >( mxTableModel->getRow( Index ).get() ) ) ); @@ -95,14 +95,14 @@ Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsExc // XElementAccess -Type SAL_CALL TableRows::getElementType() throw (RuntimeException, std::exception) +Type SAL_CALL TableRows::getElementType() { throwIfDisposed(); return cppu::UnoType<XCellRange>::get(); } -sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TableRows::hasElements() { throwIfDisposed(); return mxTableModel->getRowCount() != 0; diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index 10788ff0afea..cdd665d56d9b 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -36,19 +36,19 @@ public: void dispose(); /// @throws css::uno::RuntimeException - void throwIfDisposed() const throw (css::uno::RuntimeException); + void throwIfDisposed() const; // XTableRows - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // Methods - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; private: TableModelRef mxTableModel; diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 5671bf97ace7..e03176232690 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -37,8 +37,7 @@ public: virtual ~NumberingPopup() override; virtual void dispose() override; - virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; }; class NumberingToolBoxControl : public svt::PopupWindowController @@ -50,18 +49,14 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; using svt::ToolboxController::createPopupWindow; }; @@ -144,7 +139,6 @@ void NumberingPopup::dispose() } void NumberingPopup::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException ) { mpValueSet->SetNoSelection(); @@ -208,7 +202,6 @@ VclPtr<vcl::Window> NumberingToolBoxControl::createPopupWindow( vcl::Window* pPa void SAL_CALL NumberingToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) { ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; @@ -222,7 +215,6 @@ void SAL_CALL NumberingToolBoxControl::statusChanged( const css::frame::FeatureS } void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); @@ -239,13 +231,11 @@ void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css } OUString SAL_CALL NumberingToolBoxControl::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svx.NumberingToolBoxControl" ); } css::uno::Sequence< OUString > SAL_CALL NumberingToolBoxControl::getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) { css::uno::Sequence<OUString> aRet { "com.sun.star.frame.ToolbarController" }; return aRet; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 4bcb8ce12a9a..0eb00d295c9c 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -160,7 +160,7 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE void ExtrusionDirectionWindow::statusChanged( const css::frame::FeatureStateEvent& Event -) throw ( css::uno::RuntimeException ) +) { if( Event.FeatureURL.Main == g_sExtrusionDirection ) { @@ -245,7 +245,6 @@ VclPtr<vcl::Window> ExtrusionDirectionControl::createPopupWindow( vcl::Window* p // XInitialization void SAL_CALL ExtrusionDirectionControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); @@ -264,7 +263,7 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() } -Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; @@ -273,19 +272,19 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr -) throw( RuntimeException ) +) { return *new ExtrusionDirectionControl( comphelper::getComponentContext(rSMgr) ); } -OUString SAL_CALL ExtrusionDirectionControl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL ExtrusionDirectionControl::getImplementationName( ) { return ExtrusionDirectionControl_getImplementationName(); } -Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames( ) { return ExtrusionDirectionControl_getSupportedServiceNames(); } @@ -382,7 +381,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) void ExtrusionDepthWindow::statusChanged( const css::frame::FeatureStateEvent& Event -) throw ( css::uno::RuntimeException, std::exception ) +) { if( Event.FeatureURL.Main.equals( msExtrusionDepth ) ) { @@ -480,7 +479,6 @@ VclPtr<vcl::Window> ExtrusionDepthController::createPopupWindow( vcl::Window* pP // XInitialization void SAL_CALL ExtrusionDepthController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); @@ -499,24 +497,24 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName() } -Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) ); } -OUString SAL_CALL ExtrusionDepthController::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL ExtrusionDepthController::getImplementationName( ) { return ExtrusionDepthController_getImplementationName(); } -Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames( ) { return ExtrusionDepthController_getSupportedServiceNames(); } @@ -632,7 +630,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) void ExtrusionLightingWindow::statusChanged( const css::frame::FeatureStateEvent& Event -) throw ( css::uno::RuntimeException ) +) { if( Event.FeatureURL.Main == g_sExtrusionLightingIntensity ) { @@ -745,7 +743,6 @@ VclPtr<vcl::Window> ExtrusionLightingControl::createPopupWindow( vcl::Window* pP // XInitialization void SAL_CALL ExtrusionLightingControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); @@ -764,7 +761,7 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName() } -Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; @@ -773,19 +770,19 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames( Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr -) throw( RuntimeException ) +) { return *new ExtrusionLightingControl( comphelper::getComponentContext(rSMgr) ); } -OUString SAL_CALL ExtrusionLightingControl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL ExtrusionLightingControl::getImplementationName( ) { return ExtrusionLightingControl_getImplementationName(); } -Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames( ) { return ExtrusionLightingControl_getSupportedServiceNames(); } @@ -825,7 +822,7 @@ void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) void ExtrusionSurfaceWindow::statusChanged( const css::frame::FeatureStateEvent& Event -) throw ( css::uno::RuntimeException ) +) { if( Event.FeatureURL.Main == g_sExtrusionSurface ) { @@ -881,7 +878,6 @@ VclPtr<vcl::Window> ExtrusionSurfaceControl::createPopupWindow( vcl::Window* pPa // XInitialization void SAL_CALL ExtrusionSurfaceControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); @@ -900,7 +896,7 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() } -Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; @@ -909,19 +905,19 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr -) throw( RuntimeException ) +) { return *new ExtrusionSurfaceControl( comphelper::getComponentContext(rSMgr) ); } -OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName( ) { return ExtrusionSurfaceControl_getImplementationName(); } -Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames( ) { return ExtrusionSurfaceControl_getSupportedServiceNames(); } diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 9b0f50b5687d..cdd9c6b6c597 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -43,7 +43,7 @@ public: virtual ~ExtrusionDirectionWindow() override; virtual void dispose() override; - virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: @@ -72,12 +72,11 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; using svt::PopupWindowController::createPopupWindow; }; @@ -108,7 +107,7 @@ private: public: ExtrusionDepthWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ); - virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override; }; class ExtrusionDepthController : public svt::PopupWindowController @@ -119,12 +118,11 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; using svt::PopupWindowController::createPopupWindow; }; @@ -160,7 +158,7 @@ public: virtual ~ExtrusionLightingWindow() override; virtual void dispose() override; - virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; @@ -173,12 +171,11 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; using svt::PopupWindowController::createPopupWindow; }; @@ -201,7 +198,7 @@ private: public: ExtrusionSurfaceWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ); - virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override; }; @@ -213,12 +210,11 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; using svt::PopupWindowController::createPopupWindow; }; diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index bc3099f4b5b0..b71e796c3c8d 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -248,7 +248,7 @@ class FontworkAlignmentWindow : public ToolbarMenu public: FontworkAlignmentWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ); - virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override; private: svt::ToolboxController& mrController; @@ -299,7 +299,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled ) } } -void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( RuntimeException ) +void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) { if( Event.FeatureURL.Main.equals( msFontworkAlignment ) ) { @@ -342,12 +342,11 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; using svt::PopupWindowController::createPopupWindow; }; @@ -366,7 +365,6 @@ VclPtr<vcl::Window> FontworkAlignmentControl::createPopupWindow( vcl::Window* pP // XInitialization void SAL_CALL FontworkAlignmentControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); @@ -385,26 +383,26 @@ OUString SAL_CALL FontworkAlignmentControl_getImplementationName() } -Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new FontworkAlignmentControl( comphelper::getComponentContext(rSMgr) ); } -OUString SAL_CALL FontworkAlignmentControl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL FontworkAlignmentControl::getImplementationName( ) { return FontworkAlignmentControl_getImplementationName(); } -Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames( ) { return FontworkAlignmentControl_getSupportedServiceNames(); } @@ -414,7 +412,7 @@ class FontworkCharacterSpacingWindow : public ToolbarMenu public: FontworkCharacterSpacingWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ); - virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) override; private: svt::ToolboxController& mrController; @@ -483,7 +481,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnab } -void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) +void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) { if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) ) { @@ -568,12 +566,11 @@ public: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; using svt::PopupWindowController::createPopupWindow; }; @@ -592,7 +589,6 @@ VclPtr<vcl::Window> FontworkCharacterSpacingControl::createPopupWindow( vcl::Win // XInitialization void SAL_CALL FontworkCharacterSpacingControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( aArguments ); @@ -611,26 +607,26 @@ OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() } -Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } -Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) { return *new FontworkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) ); } -OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName( ) { return FontworkCharacterSpacingControl_getImplementationName(); } -Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames( ) { return FontworkCharacterSpacingControl_getSupportedServiceNames(); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 53dd837d3a83..9b90df505afa 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -266,7 +266,7 @@ public: SvxLineEndWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ); virtual ~SvxLineEndWindow() override; virtual void dispose() override; - virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; }; SvxLineEndWindow::SvxLineEndWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ) @@ -412,7 +412,6 @@ void SvxLineEndWindow::FillValueSet() } void SvxLineEndWindow::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) { if ( rEvent.FeatureURL.Complete == ".uno:LineEndListState" ) { @@ -466,11 +465,11 @@ public: explicit SvxLineEndToolBoxControl( const css::uno::Reference<css::uno::XComponentContext>& rContext ); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; private: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; @@ -483,7 +482,6 @@ SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( const css::uno::Reference<cs } void SvxLineEndToolBoxControl::initialize( const css::uno::Sequence<css::uno::Any>& rArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( rArguments ); ToolBox* pToolBox = nullptr; @@ -498,13 +496,11 @@ VclPtr<vcl::Window> SvxLineEndToolBoxControl::createPopupWindow( vcl::Window* pP } OUString SvxLineEndToolBoxControl::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svx.LineEndToolBoxControl" ); } css::uno::Sequence<OUString> SvxLineEndToolBoxControl::getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.frame.ToolbarController" }; } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 13db72df34ee..e5a037c4b16d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -272,7 +272,7 @@ public: virtual ~SvxFrameWindow_Impl() override; virtual void dispose() override; - virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; @@ -1901,7 +1901,6 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) } void SvxFrameWindow_Impl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException ) { if ( rEvent.FeatureURL.Complete == ".uno:BorderReducedMode" ) { @@ -2319,7 +2318,6 @@ SvxStyleToolBoxControl::~SvxStyleToolBoxControl() } void SAL_CALL SvxStyleToolBoxControl::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException, std::exception) { SfxToolBoxControl::initialize( aArguments ); @@ -2343,7 +2341,6 @@ throw ( Exception, RuntimeException, std::exception) // XComponent void SAL_CALL SvxStyleToolBoxControl::dispose() - throw (css::uno::RuntimeException, std::exception) { SfxToolBoxControl::dispose(); @@ -2369,7 +2366,7 @@ void SAL_CALL SvxStyleToolBoxControl::dispose() pImpl.reset(); } -void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException, std::exception) +void SAL_CALL SvxStyleToolBoxControl::update() { // Do nothing, we will start binding our listener when we are visible. // See link SvxStyleToolBoxControl::VisibilityNotification. @@ -2678,18 +2675,18 @@ public: SvxFontNameToolBoxControl(); // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) override; // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: VclPtr<SvxFontNameBox_Impl> m_pBox; @@ -2700,7 +2697,6 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl() } void SvxFontNameToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; ToolBox* pToolBox = nullptr; @@ -2729,7 +2725,6 @@ void SvxFontNameToolBoxControl::statusChanged( const css::frame::FeatureStateEve } css::uno::Reference< css::awt::XWindow > SvxFontNameToolBoxControl::createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) - throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_pBox = VclPtr<SvxFontNameBox_Impl>::Create( VCLUnoHelper::GetWindow( rParent ), @@ -2739,26 +2734,22 @@ css::uno::Reference< css::awt::XWindow > SvxFontNameToolBoxControl::createItemWi } void SvxFontNameToolBoxControl::dispose() - throw ( css::uno::RuntimeException, std::exception ) { m_pBox.disposeAndClear(); ToolboxController::dispose(); } OUString SvxFontNameToolBoxControl::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svx.FontNameToolBoxControl" ); } sal_Bool SvxFontNameToolBoxControl::supportsService( const OUString& rServiceName ) - throw ( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, rServiceName ); } css::uno::Sequence< OUString > SvxFontNameToolBoxControl::getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.frame.ToolbarController" }; } @@ -2841,7 +2832,6 @@ IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, const NamedColor&, rColor, void) } void SvxColorToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) { if ( rEvent.FeatureURL.Complete == m_aCommandURL ) GetToolBox().EnableItem( GetId(), rEvent.IsEnabled ); @@ -2899,7 +2889,6 @@ void SvxColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/) } sal_Bool SvxColorToolBoxControl::opensSubToolbar() - throw (css::uno::RuntimeException, std::exception) { // For a split button, we mark this controller as a sub-toolbar controller, // so we get notified (through updateImage method) on button image changes, @@ -2908,7 +2897,6 @@ sal_Bool SvxColorToolBoxControl::opensSubToolbar() } void SvxColorToolBoxControl::updateImage() - throw (css::uno::RuntimeException, std::exception) { Image aImage = GetImage( m_xFrame, m_aCommandURL, hasBigImages() ); if ( !!aImage ) @@ -2919,13 +2907,11 @@ void SvxColorToolBoxControl::updateImage() } OUString SvxColorToolBoxControl::getSubToolbarName() - throw (css::uno::RuntimeException, std::exception) { return OUString(); } void SvxColorToolBoxControl::functionSelected( const OUString& /*rCommand*/ ) - throw (css::uno::RuntimeException, std::exception) { } @@ -2954,11 +2940,11 @@ public: explicit SvxFrameToolBoxControl( const css::uno::Reference< css::uno::XComponentContext >& rContext ); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; @@ -2971,7 +2957,6 @@ SvxFrameToolBoxControl::SvxFrameToolBoxControl( const css::uno::Reference< css:: } void SvxFrameToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { svt::PopupWindowController::initialize( rArguments ); ToolBox* pToolBox = nullptr; @@ -2989,13 +2974,11 @@ VclPtr<vcl::Window> SvxFrameToolBoxControl::createPopupWindow( vcl::Window* pPar } OUString SvxFrameToolBoxControl::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svx.FrameToolBoxControl" ); } css::uno::Sequence< OUString > SvxFrameToolBoxControl::getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.frame.ToolbarController" }; } @@ -3042,7 +3025,6 @@ SvxCurrencyToolBoxControl::SvxCurrencyToolBoxControl( sal_uInt16 nSlotId, sal_uI SvxCurrencyToolBoxControl::~SvxCurrencyToolBoxControl() {} void SvxCurrencyToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { SfxToolBoxControl::initialize(rArguments); if (GetToolBox().GetItemCommand(GetId()) == m_aCommandURL) diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 8ae9fe807bb1..091ede2f2002 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -51,27 +51,27 @@ class FontHeightToolBoxControl : public svt::ToolboxController, const css::uno::Reference< css::uno::XComponentContext >& rServiceManager ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override; + virtual void SAL_CALL click() override; + virtual void SAL_CALL doubleClick() override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override; void dispatchCommand( const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); using svt::ToolboxController::dispatchCommand; @@ -273,7 +273,6 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::X // XInterface css::uno::Any SAL_CALL FontHeightToolBoxControl::queryInterface( const css::uno::Type& aType ) -throw (css::uno::RuntimeException, std::exception) { uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -294,19 +293,16 @@ void SAL_CALL FontHeightToolBoxControl::release() throw () // XServiceInfo sal_Bool SAL_CALL FontHeightToolBoxControl::supportsService( const OUString& ServiceName ) -throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } OUString SAL_CALL FontHeightToolBoxControl::getImplementationName() -throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.svx.FontHeightToolBoxController"); } uno::Sequence< OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames( ) -throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; @@ -314,7 +310,6 @@ throw( uno::RuntimeException, std::exception ) // XComponent void SAL_CALL FontHeightToolBoxControl::dispose() -throw (uno::RuntimeException, std::exception) { svt::ToolboxController::dispose(); @@ -325,7 +320,6 @@ throw (uno::RuntimeException, std::exception) // XStatusListener void SAL_CALL FontHeightToolBoxControl::statusChanged( const frame::FeatureStateEvent& rEvent ) -throw ( uno::RuntimeException, std::exception ) { if ( m_pBox ) { @@ -354,29 +348,24 @@ throw ( uno::RuntimeException, std::exception ) // XToolbarController void SAL_CALL FontHeightToolBoxControl::execute( sal_Int16 /*KeyModifier*/ ) -throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL FontHeightToolBoxControl::click() -throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL FontHeightToolBoxControl::doubleClick() -throw (css::uno::RuntimeException, std::exception) { } uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createPopupWindow() -throw (css::uno::RuntimeException, std::exception) { return uno::Reference< awt::XWindow >(); } uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) - throw (css::uno::RuntimeException, std::exception) { uno::Reference< awt::XWindow > xItemWindow; diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 673ee775669d..1f55336da921 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -422,26 +422,26 @@ public: FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; DECL_LINK(EditModifyHdl, Edit&, void); @@ -465,7 +465,7 @@ FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< } // XInterface -css::uno::Any SAL_CALL FindTextToolbarController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL FindTextToolbarController::queryInterface( const css::uno::Type& aType ) { css::uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -485,24 +485,24 @@ void SAL_CALL FindTextToolbarController::release() throw () } // XServiceInfo -OUString SAL_CALL FindTextToolbarController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL FindTextToolbarController::getImplementationName() { return OUString("com.sun.star.svx.FindTextToolboxController"); } -sal_Bool SAL_CALL FindTextToolbarController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL FindTextToolbarController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL FindTextToolbarController::getSupportedServiceNames() { css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } // XComponent -void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL FindTextToolbarController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -517,7 +517,7 @@ void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeExce } // XInitialization -void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) +void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { svt::ToolboxController::initialize(aArguments); @@ -539,7 +539,7 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< c SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); } -css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) { css::uno::Reference< css::awt::XWindow > xItemWindow; @@ -560,7 +560,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre } // XStatusListener -void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) { SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) @@ -601,26 +601,26 @@ public: UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, Type eType ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; private: Type meType; @@ -635,7 +635,7 @@ UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Re } // XInterface -css::uno::Any SAL_CALL UpDownSearchToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL UpDownSearchToolboxController::queryInterface( const css::uno::Type& aType ) { css::uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -655,26 +655,26 @@ void SAL_CALL UpDownSearchToolboxController::release() throw () } // XServiceInfo -OUString SAL_CALL UpDownSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL UpDownSearchToolboxController::getImplementationName() { return meType == UpDownSearchToolboxController::UP? OUString( "com.sun.star.svx.UpSearchToolboxController" ) : OUString( "com.sun.star.svx.DownSearchToolboxController" ); } -sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL UpDownSearchToolboxController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL UpDownSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL UpDownSearchToolboxController::getSupportedServiceNames() { css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } // XComponent -void SAL_CALL UpDownSearchToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL UpDownSearchToolboxController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -684,14 +684,14 @@ void SAL_CALL UpDownSearchToolboxController::dispose() throw ( css::uno::Runtime } // XInitialization -void SAL_CALL UpDownSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) +void SAL_CALL UpDownSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { svt::ToolboxController::initialize( aArguments ); SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); } // XToolbarController -void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) { if ( m_bDisposed ) throw css::lang::DisposedException(); @@ -709,7 +709,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ } // XStatusListener -void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) { } @@ -720,26 +720,26 @@ public: MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; private: VclPtr<CheckBox> m_pMatchCaseControl; @@ -754,7 +754,7 @@ MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Referenc } // XInterface -css::uno::Any SAL_CALL MatchCaseToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL MatchCaseToolboxController::queryInterface( const css::uno::Type& aType ) { css::uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -774,24 +774,24 @@ void SAL_CALL MatchCaseToolboxController::release() throw () } // XServiceInfo -OUString SAL_CALL MatchCaseToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL MatchCaseToolboxController::getImplementationName() { return OUString( "com.sun.star.svx.MatchCaseToolboxController" ); } -sal_Bool SAL_CALL MatchCaseToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL MatchCaseToolboxController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL MatchCaseToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL MatchCaseToolboxController::getSupportedServiceNames() { css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } // XComponent -void SAL_CALL MatchCaseToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL MatchCaseToolboxController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -803,14 +803,14 @@ void SAL_CALL MatchCaseToolboxController::dispose() throw ( css::uno::RuntimeExc } // XInitialization -void SAL_CALL MatchCaseToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) +void SAL_CALL MatchCaseToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { svt::ToolboxController::initialize(aArguments); SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); } -css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) { css::uno::Reference< css::awt::XWindow > xItemWindow; @@ -829,7 +829,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::cr } // XStatusListener -void SAL_CALL MatchCaseToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL MatchCaseToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) { } @@ -840,26 +840,26 @@ public: SearchFormattedToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; private: VclPtr<CheckBox> m_pSearchFormattedControl; @@ -874,7 +874,7 @@ SearchFormattedToolboxController::SearchFormattedToolboxController( const css::u } // XInterface -css::uno::Any SAL_CALL SearchFormattedToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL SearchFormattedToolboxController::queryInterface( const css::uno::Type& aType ) { css::uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -894,24 +894,24 @@ void SAL_CALL SearchFormattedToolboxController::release() throw () } // XServiceInfo -OUString SAL_CALL SearchFormattedToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL SearchFormattedToolboxController::getImplementationName() { return OUString( "com.sun.star.svx.SearchFormattedToolboxController" ); } -sal_Bool SAL_CALL SearchFormattedToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SearchFormattedToolboxController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL SearchFormattedToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL SearchFormattedToolboxController::getSupportedServiceNames() { css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } // XComponent -void SAL_CALL SearchFormattedToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL SearchFormattedToolboxController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -923,14 +923,14 @@ void SAL_CALL SearchFormattedToolboxController::dispose() throw ( css::uno::Runt } // XInitialization -void SAL_CALL SearchFormattedToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) +void SAL_CALL SearchFormattedToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { svt::ToolboxController::initialize(aArguments); SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); } -css::uno::Reference< css::awt::XWindow > SAL_CALL SearchFormattedToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Reference< css::awt::XWindow > SAL_CALL SearchFormattedToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& xParent ) { css::uno::Reference< css::awt::XWindow > xItemWindow; @@ -949,7 +949,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL SearchFormattedToolboxControll } // XStatusListener -void SAL_CALL SearchFormattedToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL SearchFormattedToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) { } @@ -960,26 +960,26 @@ public: FindAllToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; }; FindAllToolboxController::FindAllToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -990,7 +990,7 @@ FindAllToolboxController::FindAllToolboxController( const css::uno::Reference< c } // XInterface -css::uno::Any SAL_CALL FindAllToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL FindAllToolboxController::queryInterface( const css::uno::Type& aType ) { css::uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -1010,25 +1010,25 @@ void SAL_CALL FindAllToolboxController::release() throw () } // XServiceInfo -OUString SAL_CALL FindAllToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL FindAllToolboxController::getImplementationName() { return OUString( "com.sun.star.svx.FindAllToolboxController" ); } -sal_Bool SAL_CALL FindAllToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL FindAllToolboxController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL FindAllToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL FindAllToolboxController::getSupportedServiceNames() { css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } // XComponent -void SAL_CALL FindAllToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL FindAllToolboxController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -1038,14 +1038,14 @@ void SAL_CALL FindAllToolboxController::dispose() throw ( css::uno::RuntimeExcep } // XInitialization -void SAL_CALL FindAllToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) +void SAL_CALL FindAllToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { svt::ToolboxController::initialize( aArguments ); SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); } // XToolbarController -void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ ) { if ( m_bDisposed ) throw css::lang::DisposedException(); @@ -1057,7 +1057,7 @@ void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ ) thr } // XStatusListener -void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) { } @@ -1068,26 +1068,26 @@ public: ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; }; ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -1098,7 +1098,7 @@ ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Refere } // XInterface -css::uno::Any SAL_CALL ExitSearchToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL ExitSearchToolboxController::queryInterface( const css::uno::Type& aType ) { css::uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -1118,25 +1118,25 @@ void SAL_CALL ExitSearchToolboxController::release() throw () } // XServiceInfo -OUString SAL_CALL ExitSearchToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL ExitSearchToolboxController::getImplementationName() { return OUString( "com.sun.star.svx.ExitFindbarToolboxController" ); } -sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ExitSearchToolboxController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL ExitSearchToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL ExitSearchToolboxController::getSupportedServiceNames() { css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } // XComponent -void SAL_CALL ExitSearchToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL ExitSearchToolboxController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -1146,14 +1146,14 @@ void SAL_CALL ExitSearchToolboxController::dispose() throw ( css::uno::RuntimeEx } // XInitialization -void SAL_CALL ExitSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) +void SAL_CALL ExitSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { svt::ToolboxController::initialize( aArguments ); SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); } // XToolbarController -void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) { vcl::Window *pFocusWindow = Application::GetFocusWindow(); if ( pFocusWindow ) @@ -1176,7 +1176,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) } // XStatusListener -void SAL_CALL ExitSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL ExitSearchToolboxController::statusChanged( const css::frame::FeatureStateEvent& /*rEvent*/ ) { } @@ -1187,26 +1187,26 @@ public: SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; }; SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -1217,7 +1217,7 @@ SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Refe } // XInterface -css::uno::Any SAL_CALL SearchLabelToolboxController::queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL SearchLabelToolboxController::queryInterface( const css::uno::Type& aType ) { css::uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -1237,25 +1237,25 @@ void SAL_CALL SearchLabelToolboxController::release() throw () } // XServiceInfo -OUString SAL_CALL SearchLabelToolboxController::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL SearchLabelToolboxController::getImplementationName() { return OUString( "com.sun.star.svx.SearchLabelToolboxController" ); } -sal_Bool SAL_CALL SearchLabelToolboxController::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SearchLabelToolboxController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL SearchLabelToolboxController::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL SearchLabelToolboxController::getSupportedServiceNames() { css::uno::Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } // XComponent -void SAL_CALL SearchLabelToolboxController::dispose() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL SearchLabelToolboxController::dispose() { SolarMutexGuard aSolarMutexGuard; @@ -1265,18 +1265,18 @@ void SAL_CALL SearchLabelToolboxController::dispose() throw ( css::uno::RuntimeE } // XInitialization -void SAL_CALL SearchLabelToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) +void SAL_CALL SearchLabelToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { svt::ToolboxController::initialize( aArguments ); SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL); } // XStatusListener -void SAL_CALL SearchLabelToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL SearchLabelToolboxController::statusChanged( const css::frame::FeatureStateEvent& ) { } -css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) +css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) { VclPtr<vcl::Window> pSL = VclPtr<FixedText>::Create(VCLUnoHelper::GetWindow( Parent )); pSL->SetSizePixel(Size(250, 25)); @@ -1297,26 +1297,26 @@ public: virtual ~FindbarDispatcher() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) override; private: @@ -1334,7 +1334,7 @@ FindbarDispatcher::~FindbarDispatcher() } // XInterface -css::uno::Any SAL_CALL FindbarDispatcher::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL FindbarDispatcher::queryInterface( const css::uno::Type& aType ) { css::uno::Any aReturn( ::cppu::queryInterface( aType, static_cast< css::lang::XServiceInfo* >(this), @@ -1359,17 +1359,17 @@ void SAL_CALL FindbarDispatcher::release() throw() } // XServiceInfo -OUString SAL_CALL FindbarDispatcher::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL FindbarDispatcher::getImplementationName() { return OUString("com.sun.star.comp.svx.Impl.FindbarDispatcher"); } -sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNames() { css::uno::Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.comp.svx.FindbarDispatcher"; @@ -1378,14 +1378,14 @@ css::uno::Sequence< OUString > SAL_CALL FindbarDispatcher::getSupportedServiceNa } // XInitialization -void SAL_CALL FindbarDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) +void SAL_CALL FindbarDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { if ( aArguments.getLength() ) aArguments[0] >>= m_xFrame; } // XDispatchProvider -css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException, std::exception ) +css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) { css::uno::Reference< css::frame::XDispatch > xDispatch; @@ -1395,7 +1395,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL FindbarDispatcher::queryDi return xDispatch; } -css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL FindbarDispatcher::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts ) throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL FindbarDispatcher::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts ) { sal_Int32 nCount = seqDescripts.getLength(); css::uno::Sequence < css::uno::Reference < XDispatch > > lDispatcher( nCount ); @@ -1407,7 +1407,7 @@ css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fin } // XDispatch -void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException, std::exception ) +void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) { //vnd.sun.star.findbar:FocusToFindbar - set cursor to the FindTextFieldControl of the findbar if ( aURL.Path == "FocusToFindbar" ) @@ -1461,11 +1461,11 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css } } -void SAL_CALL FindbarDispatcher::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL FindbarDispatcher::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) { } -void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) { } diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 432e5ec1aefa..2cf2197108c3 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -46,7 +46,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx rTbx.Invalidate(); } -void SAL_CALL SvxTbxCtlDraw::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxTbxCtlDraw::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { svt::ToolboxController::initialize(aArguments); /* diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 39f6079c8fe3..3e4eacd4186a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -62,7 +62,7 @@ void ChineseTranslation_UnoDialog::impl_DeleteDialog() } // lang::XServiceInfo -OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName() { return getImplementationName_Static(); } @@ -72,12 +72,12 @@ OUString ChineseTranslation_UnoDialog::getImplementationName_Static() return OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog"); } -sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL ChineseTranslation_UnoDialog::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } @@ -89,13 +89,13 @@ uno::Sequence< OUString > ChineseTranslation_UnoDialog::getSupportedServiceNames } // ui::dialogs::XExecutableDialog -void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const OUString& ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const OUString& ) { //not implemented - fell free to do so, if you do need this } -void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno::Any >& aArguments ) { SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose ) @@ -116,7 +116,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno } -sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() { sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL; { @@ -148,7 +148,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc // lang::XComponent -void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::dispose() { lang::EventObject aEvt; { @@ -167,7 +167,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeExcepti m_aDisposeEventListeners.disposeAndClear( aEvt ); } -void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) { SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose ) @@ -175,7 +175,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::addEventListener( const uno::Referen m_aDisposeEventListeners.addInterface( xListener ); } -void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) { SolarMutexGuard aSolarGuard; if( m_bDisposed || m_bInDispose ) @@ -186,16 +186,16 @@ void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Refe // XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog::getPropertySetInfo( ) throw (uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog::getPropertySetInfo( ) { return nullptr; } -void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::setPropertyValue( const OUString&, const uno::Any& ) { //only read only properties throw beans::PropertyVetoException(); } -uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString& rPropertyName ) { uno::Any aRet; @@ -229,19 +229,19 @@ uno::Any SAL_CALL ChineseTranslation_UnoDialog::getPropertyValue( const OUString return aRet; } -void SAL_CALL ChineseTranslation_UnoDialog::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) { //only not bound properties -> ignore listener } -void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ChineseTranslation_UnoDialog::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) { //only not bound properties -> ignore listener } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index a65fc2e889de..b0e81e2ba8c6 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -72,40 +72,40 @@ public: virtual ~ChineseTranslation_UnoDialog() override; // lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL - create( css::uno::Reference< css::uno::XComponentContext > const & ) throw(css::uno::Exception) + create( css::uno::Reference< css::uno::XComponentContext > const & ) { return static_cast<cppu::OWeakObject *>( new ChineseTranslation_UnoDialog ); } // lang::XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // ui::dialogs::XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; + virtual sal_Int16 SAL_CALL execute( ) override; // beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // lang::XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; private: diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 3e0e40f4fced..58fd9c773561 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -142,20 +142,20 @@ namespace { GraphicExporter(); // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL cancel( ) throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) override; + virtual void SAL_CALL cancel( ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XMimeTypeInfo - virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) throw (RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMimeType( const OUString& MimeTypeName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) override; VclPtr<VirtualDevice> CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const; @@ -990,7 +990,6 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, // XFilter sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDescriptor ) - throw(RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1071,7 +1070,6 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes } void SAL_CALL GraphicExporter::cancel() - throw(RuntimeException, std::exception) { } @@ -1079,7 +1077,6 @@ void SAL_CALL GraphicExporter::cancel() /** the source 'document' could be a XDrawPage, a XShape or a generic XShapes */ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XComponent >& xComponent ) - throw(IllegalArgumentException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1186,26 +1183,23 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon // XServiceInfo OUString SAL_CALL GraphicExporter::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString( "com.sun.star.comp.Draw.GraphicExporter" ); } sal_Bool SAL_CALL GraphicExporter::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL GraphicExporter::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { Sequence< OUString > aSupportedServiceNames { "com.sun.star.drawing.GraphicExportFilter" }; return aSupportedServiceNames; } // XMimeTypeInfo -sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeName ) { GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nCount = rFilter.GetExportFormatCount(); @@ -1221,7 +1215,7 @@ sal_Bool SAL_CALL GraphicExporter::supportsMimeType( const OUString& rMimeTypeNa return false; } -Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( ) { GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nCount = rFilter.GetExportFormatCount(); diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index cf6e850cdb57..4d38ba0961a3 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -73,7 +73,7 @@ void SvxUnoNameItemTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw( dispose(); } -sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } @@ -91,7 +91,6 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons // XNameContainer void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -105,7 +104,6 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -140,7 +138,6 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) // XNameReplace void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -192,7 +189,6 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons // XNameAccess uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -221,7 +217,6 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName ) } uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -245,7 +240,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( ) } sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -269,7 +263,6 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) } sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 8cd21000a3c0..53d7355cf408 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -63,22 +63,22 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; #endif // INCLUDED_SVX_SOURCE_UNODRAW_UNONAMEITEMTABLE_HXX diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 548865e0d01a..5cbbe59fba18 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -57,18 +57,18 @@ namespace svx NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ); // XNameAccess - virtual Any SAL_CALL getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL getByName( const OUString& aName ) override; + virtual Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; Reference< XInterface > SAL_CALL NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) @@ -186,7 +186,7 @@ NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ) } // XNameAccess -Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); @@ -207,7 +207,7 @@ Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchEleme return makeAny( aURL ); } -Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); @@ -222,7 +222,7 @@ Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeExce return comphelper::containerToSequence(aPrefixSet); } -sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); @@ -241,12 +241,12 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (Runtim } // XElementAccess -Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException, std::exception) +Type SAL_CALL NamespaceMap::getElementType() { return ::cppu::UnoType<OUString>::get(); } -sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL NamespaceMap::hasElements() { NamespaceIteratorImpl aIter( mpWhichIds, mpPool ); @@ -258,19 +258,16 @@ sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exce // XServiceInfo OUString SAL_CALL NamespaceMap::getImplementationName( ) - throw(RuntimeException, std::exception) { return NamespaceMap_getImplementationName(); } sal_Bool SAL_CALL NamespaceMap::supportsService( const OUString& serviceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService( this, serviceName ); } Sequence< OUString > SAL_CALL NamespaceMap::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { return NamespaceMap_getSupportedServiceNames(); } diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 60758c01d382..7dbd98693f8a 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -54,28 +54,28 @@ public: SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw(); /// @throws uno::RuntimeException - virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) = 0; + virtual uno::Any getAny( const XPropertyEntry* pEntry ) const = 0; /// @throws uno::RuntimeException /// @throws lang::IllegalArgumentException - virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException, lang::IllegalArgumentException) = 0; + virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const = 0; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw() @@ -93,14 +93,12 @@ const XPropertyEntry* SvxUnoXPropertyTable::get(long index) const // XServiceInfo sal_Bool SAL_CALL SvxUnoXPropertyTable::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } // XNameContainer void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -120,7 +118,6 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const } void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -143,7 +140,6 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -170,7 +166,6 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const // XNameAccess uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -190,7 +185,6 @@ uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames() - throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -210,7 +204,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames() } sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) - throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -230,7 +223,6 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) // XElementAccess sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( ) - throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -248,11 +240,11 @@ public: virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw() @@ -278,18 +270,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXColorTable::createEntry(const OUString& r // XElementAccess uno::Type SAL_CALL SvxUnoXColorTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return ::cppu::UnoType<sal_Int32>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) { return OUString( "SvxUnoXColorTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.ColorTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -304,14 +295,14 @@ public: // SvxUnoXPropertyTable virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override; - virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(lang::IllegalArgumentException) override; + virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw() @@ -328,7 +319,7 @@ uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw return uno::Any(aBezier); } -std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& rName, const uno::Any& rAny) const throw(lang::IllegalArgumentException) +std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& rName, const uno::Any& rAny) const { auto pCoords = o3tl::tryAccess<drawing::PolyPolygonBezierCoords>(rAny); if( !pCoords ) @@ -346,18 +337,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& // XElementAccess uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::PolyPolygonBezierCoords>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) { return OUString( "SvxUnoXLineEndTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.LineEndTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -375,11 +365,11 @@ public: virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw() @@ -424,18 +414,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXDashTable::createEntry(const OUString& rN // XElementAccess uno::Type SAL_CALL SvxUnoXDashTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::LineDash>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) { return OUString( "SvxUnoXDashTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.DashTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -453,11 +442,11 @@ public: virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw() @@ -497,18 +486,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXHatchTable::createEntry(const OUString& r // XElementAccess uno::Type SAL_CALL SvxUnoXHatchTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::Hatch>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) { return OUString( "SvxUnoXHatchTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.HatchTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -526,11 +514,11 @@ public: virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw() @@ -582,18 +570,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXGradientTable::createEntry(const OUString // XElementAccess uno::Type SAL_CALL SvxUnoXGradientTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<awt::Gradient>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) { return OUString( "SvxUnoXGradientTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.GradientTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -607,15 +594,15 @@ public: explicit SvxUnoXBitmapTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {}; // SvxUnoXPropertyTable - virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) override; - virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException) override; + virtual uno::Any getAny( const XPropertyEntry* pEntry ) const override; + virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override; + virtual uno::Type SAL_CALL getElementType() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw() @@ -624,7 +611,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XP } // SvxUnoXPropertyTable -uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) +uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const { OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); const GraphicObject& rGraphicObject(static_cast<const XBitmapEntry*>(pEntry)->GetGraphicObject()); @@ -633,7 +620,7 @@ uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw( return uno::Any(aURL); } -std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException) +std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& rName, const uno::Any& rAny) const { OUString aURL; if(!(rAny >>= aURL)) @@ -646,18 +633,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& // XElementAccess uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return ::cppu::UnoType<OUString>::get(); } // XServiceInfo -OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) { return OUString( "SvxUnoXBitmapTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.drawing.BitmapTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 150d5beafa34..9f2953b2f039 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -44,33 +44,33 @@ public: explicit SvxUnoGluePointAccess( SdrObject* pObject ) throw(); // XIdentifierContainer - virtual sal_Int32 SAL_CALL insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL insert( const uno::Any& aElement ) override; + virtual void SAL_CALL removeByIdentifier( sal_Int32 Identifier ) override; // XIdentifierReplace - virtual void SAL_CALL replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) override; // XIdentifierReplace - virtual uno::Any SAL_CALL getByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< sal_Int32 > SAL_CALL getIdentifiers( ) throw (uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByIdentifier( sal_Int32 Identifier ) override; + virtual uno::Sequence< sal_Int32 > SAL_CALL getIdentifiers( ) override; /* deprecated */ // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const uno::Any& Element ) throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const uno::Any& Element ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override; /* deprecated */ // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const uno::Any& Element ) throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const uno::Any& Element ) override; /* deprecated */ // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(uno::RuntimeException, std::exception) override; - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; static void convert( const SdrGluePoint& rSdrGlue, drawing::GluePoint2& rUnoGlue ) throw() @@ -196,7 +196,7 @@ SvxUnoGluePointAccess::SvxUnoGluePointAccess( SdrObject* pObject ) throw() } // XIdentifierContainer -sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) { if( mpObject.is() ) { @@ -226,7 +226,7 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) thr return -1; } -void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier ) { if( mpObject.is() && ( Identifier >= NON_USER_DEFINED_GLUE_POINTS )) { @@ -255,7 +255,7 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier ) } // XIdentifierReplace -void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, const uno::Any& aElement ) { if( mpObject.is() && mpObject->IsNode() ) { @@ -289,7 +289,7 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, c } // XIdentifierAccess -uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) { if( mpObject.is() && mpObject->IsNode() ) { @@ -329,7 +329,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) throw container::NoSuchElementException(); } -uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() throw (uno::RuntimeException, std::exception) +uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() { if( mpObject.is() ) { @@ -360,8 +360,6 @@ uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() thro // XIndexContainer void SAL_CALL SvxUnoGluePointAccess::insertByIndex( sal_Int32, const uno::Any& Element ) - throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpObject.is() ) { @@ -391,7 +389,6 @@ void SAL_CALL SvxUnoGluePointAccess::insertByIndex( sal_Int32, const uno::Any& E } void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpObject.is() ) { @@ -417,8 +414,6 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index ) // XIndexReplace void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno::Any& Element ) - throw(lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { drawing::GluePoint2 aUnoGlue; if(!(Element >>= aUnoGlue)) @@ -444,7 +439,6 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno: // XIndexAccess sal_Int32 SAL_CALL SvxUnoGluePointAccess::getCount() - throw(uno::RuntimeException, std::exception) { sal_Int32 nCount = 0; if( mpObject.is() ) @@ -465,7 +459,6 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::getCount() } uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( Index >= 0 && mpObject.is() && mpObject->IsNode() ) { @@ -497,13 +490,11 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SvxUnoGluePointAccess::getElementType() - throw( uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::GluePoint2>::get(); } sal_Bool SAL_CALL SvxUnoGluePointAccess::hasElements() - throw( uno::RuntimeException, std::exception) { return mpObject.is() && mpObject->IsNode(); } diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 90ab28488885..261676b8f4a9 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -80,19 +80,15 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo // css.lang.XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; virtual css::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL, - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; // helper @@ -116,19 +112,16 @@ RecoveryUI::RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& } OUString SAL_CALL RecoveryUI::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.svx.RecoveryUI"); } sal_Bool SAL_CALL RecoveryUI::supportsService(const OUString& sServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL RecoveryUI::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > lServiceNames { "com.sun.star.dialog.RecoveryUI" }; return lServiceNames; @@ -136,7 +129,6 @@ css::uno::Sequence< OUString > SAL_CALL RecoveryUI::getSupportedServiceNames() css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& ) - throw(css::uno::RuntimeException, std::exception) { // Internally we use VCL ... every call into vcl based code must // be guarded by locking the global solar mutex. diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 7bf166292691..a78b6cc13dee 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -30,17 +30,17 @@ class SvxPluginShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; public: explicit SvxPluginShape( SdrObject* pObj ) throw(); virtual ~SvxPluginShape() throw() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; }; @@ -48,17 +48,17 @@ class SvxAppletShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; public: explicit SvxAppletShape( SdrObject* pObj ) throw(); virtual ~SvxAppletShape() throw() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; }; @@ -66,24 +66,20 @@ class SvxFrameShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, - css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; + css::uno::Any& rValue) override; public: explicit SvxFrameShape( SdrObject* pObj ) throw(); virtual ~SvxFrameShape() throw() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) throw (css::uno::RuntimeException, std::exception) override; + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; }; @@ -91,8 +87,8 @@ class SvxTableShape : public SvxShape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; virtual void lock() override; virtual void unlock() override; diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index fcf589cb545d..aa31209b4144 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -49,7 +49,6 @@ bool SvxTableShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -102,7 +101,6 @@ bool SvxTableShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 388c2e49c974..5cb461772193 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -44,11 +44,11 @@ public: virtual bool isValid( const NameOrIndex* pItem ) const override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoBitmapTable::SvxUnoBitmapTable( SdrModel* pModel ) throw() @@ -72,13 +72,12 @@ bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const return false; } -OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() { return OUString("SvxUnoBitmapTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.BitmapTable" }; return aSNS; @@ -91,7 +90,6 @@ NameOrIndex* SvxUnoBitmapTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoBitmapTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return ::cppu::UnoType<OUString>::get(); } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 11bb724ef4b3..d97d081430ea 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -40,27 +40,27 @@ public: SvxUnoColorTable(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw( uno::RuntimeException, std::exception) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames() override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; }; SvxUnoColorTable::SvxUnoColorTable() @@ -70,18 +70,17 @@ SvxUnoColorTable::SvxUnoColorTable() XPropertyListType::Color, SvtPathOptions().GetPalettePath(), "")); } -sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoColorTable::getImplementationName() { return OUString("com.sun.star.drawing.SvxUnoColorTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.ColorTable" }; return aSNS; @@ -89,7 +88,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() // XNameContainer void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( hasByName( aName ) ) throw container::ElementExistException(); @@ -105,7 +103,6 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno:: } void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { long nIndex = pList.is() ? pList->GetIndex( Name ) : -1; if( nIndex == -1 ) @@ -116,7 +113,6 @@ void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { sal_Int32 nColor = 0; if( !(aElement >>= nColor) ) @@ -131,7 +127,6 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno: // XNameAccess uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { long nIndex = pList.is() ? pList->GetIndex( aName ) : -1; if( nIndex == -1 ) @@ -142,7 +137,6 @@ uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames() - throw( uno::RuntimeException, std::exception ) { const long nCount = pList.is() ? pList->Count() : 0; @@ -159,7 +153,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames() } sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName ) - throw( uno::RuntimeException, std::exception ) { long nIndex = pList.is() ? pList->GetIndex( aName ) : -1; return nIndex != -1; @@ -167,13 +160,11 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName ) // XElementAccess uno::Type SAL_CALL SvxUnoColorTable::getElementType() - throw( uno::RuntimeException, std::exception ) { return ::cppu::UnoType<sal_Int32>::get(); } sal_Bool SAL_CALL SvxUnoColorTable::hasElements() - throw( uno::RuntimeException, std::exception ) { return pList.is() && pList->Count() != 0; } diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 5574ec29bf90..786e4d8603d4 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -41,11 +41,11 @@ public: virtual NameOrIndex* createItem() const throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw() @@ -53,13 +53,12 @@ SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw() { } -OUString SAL_CALL SvxUnoDashTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoDashTable::getImplementationName() { return OUString("SvxUnoDashTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.DashTable" }; return aSNS; @@ -74,7 +73,6 @@ NameOrIndex* SvxUnoDashTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoDashTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::LineDash>::get(); } diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 148bc63148c0..2b9b11071398 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -40,11 +40,11 @@ public: virtual NameOrIndex* createItem() const throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw() @@ -52,13 +52,12 @@ SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw() { } -OUString SAL_CALL SvxUnoGradientTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoGradientTable::getImplementationName() { return OUString("SvxUnoGradientTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.GradientTable" }; return aSNS; @@ -73,7 +72,6 @@ NameOrIndex* SvxUnoGradientTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoGradientTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<awt::Gradient>::get(); } diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index dcfda9772a50..5ada87d34f9f 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -40,11 +40,11 @@ public: virtual NameOrIndex* createItem() const throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw() @@ -52,13 +52,12 @@ SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw() { } -OUString SAL_CALL SvxUnoHatchTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoHatchTable::getImplementationName() { return OUString("SvxUnoHatchTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.HatchTable" }; return aSNS; @@ -71,7 +70,6 @@ NameOrIndex* SvxUnoHatchTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoHatchTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::Hatch>::get(); } diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx index e764a10dc35f..bae372d48c73 100644 --- a/svx/source/unodraw/unomlstr.cxx +++ b/svx/source/unodraw/unomlstr.cxx @@ -35,7 +35,7 @@ SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() throw() } // css::util::XModifyListener -void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) { SolarMutexGuard aGuard; if( mpObj ) @@ -46,7 +46,7 @@ void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) thr } // css::lang::XEventListener -void SvxUnoShapeModifyListener::disposing(const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) +void SvxUnoShapeModifyListener::disposing(const lang::EventObject& ) { invalidate(); } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 55033c62f5ac..5f5fbd251f61 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -75,21 +75,21 @@ public: explicit SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw(); // XDrawPages - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; //- @@ -196,18 +196,16 @@ css::uno::Reference<css::uno::XInterface> create( } uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( const OUString& rServiceSpecifier ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { return create(rServiceSpecifier, ""); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) { return SvxUnoTextCreateTextField( ServiceSpecifier ); } uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< css::uno::Any >& Arguments ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { OUString arg; if ((ServiceSpecifier == "com.sun.star.drawing.GraphicObjectShape" @@ -220,7 +218,6 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWi } uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames() - throw( uno::RuntimeException, std::exception ) { return UHashMap::getServiceNames(); } @@ -257,7 +254,7 @@ SvxUnoDrawingModel::~SvxUnoDrawingModel() throw() { } -uno::Any SAL_CALL SvxUnoDrawingModel::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxUnoDrawingModel::queryInterface( const uno::Type & rType ) { uno::Any aAny; @@ -282,7 +279,7 @@ void SAL_CALL SvxUnoDrawingModel::release() throw ( ) } // XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) { if( maTypeSequence.getLength() == 0 ) { @@ -307,20 +304,18 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) throw(uno:: return maTypeSequence; } -uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawingModel::getImplementationId( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawingModel::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } void SAL_CALL SvxUnoDrawingModel::lockControllers( ) - throw(uno::RuntimeException, std::exception) { if( mpDoc ) mpDoc->setLock(true); } void SAL_CALL SvxUnoDrawingModel::unlockControllers( ) - throw(uno::RuntimeException, std::exception) { if( mpDoc && mpDoc->isLocked() ) { @@ -329,14 +324,12 @@ void SAL_CALL SvxUnoDrawingModel::unlockControllers( ) } sal_Bool SAL_CALL SvxUnoDrawingModel::hasControllersLocked( ) - throw(uno::RuntimeException, std::exception) { return mpDoc && mpDoc->isLocked(); } // XDrawPagesSupplier uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -350,7 +343,6 @@ uno::Reference< drawing::XDrawPages > SAL_CALL SvxUnoDrawingModel::getDrawPages( // XMultiServiceFactory ( SvxFmMSFactory ) uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( const OUString& aServiceSpecifier ) - throw(uno::Exception, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -508,7 +500,6 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c } uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames() - throw(uno::RuntimeException, std::exception) { const uno::Sequence< OUString > aSNS_ORG( SvxFmMSFactory::getAvailableServiceNames() ); @@ -546,18 +537,16 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames( // lang::XServiceInfo OUString SAL_CALL SvxUnoDrawingModel::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxUnoDrawingModel"); } sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() { OUString aSN("com.sun.star.drawing.DrawingDocument"); uno::Sequence< OUString > aSeq( &aSN, 1 ); @@ -566,7 +555,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames( // XAnyCompareFactory uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::createAnyCompareByName( const OUString& ) - throw(uno::RuntimeException, std::exception) { return SvxCreateNumRuleCompare(); } @@ -578,7 +566,6 @@ SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) th // XIndexAccess sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -591,7 +578,6 @@ sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount() } uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index ) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -625,13 +611,11 @@ uno::Any SAL_CALL SvxUnoDrawPagesAccess::getByIndex( sal_Int32 Index ) // XElementAccess uno::Type SAL_CALL SvxUnoDrawPagesAccess::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<drawing::XDrawPage>::get(); } sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements() - throw(uno::RuntimeException, std::exception) { return getCount() > 0; } @@ -641,7 +625,6 @@ sal_Bool SAL_CALL SvxUnoDrawPagesAccess::hasElements() // create a new page with model at given position // and return corresponding SdDrawPage uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -664,7 +647,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SvxUnoDrawPagesAccess::insertNewBy } void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDrawPage >& xPage ) - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -687,17 +669,17 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra // XServiceInfo -OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName( ) throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName( ) { return OUString( "SvxUnoDrawPagesAccess" ); } -sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNames( ) { OUString aService( "com.sun.star.drawing.DrawPages" ); uno::Sequence< OUString > aSeq( &aService, 1 ); diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index ef6ec0776cb0..0796fc768308 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -71,25 +71,25 @@ public: void SAL_CALL ImplInsertByName( const OUString& aName, const uno::Any& aElement ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; SvxUnoMarkerTable::SvxUnoMarkerTable( SdrModel* pModel ) throw() @@ -129,18 +129,17 @@ void SvxUnoMarkerTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw() dispose(); } -sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() { return OUString("SvxUnoMarkerTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.MarkerTable" }; return aSNS; @@ -166,7 +165,6 @@ void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const // XNameContainer void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -179,7 +177,6 @@ void SAL_CALL SvxUnoMarkerTable::insertByName( const OUString& aApiName, const u } void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -214,7 +211,6 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName ) // XNameReplace void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -298,7 +294,6 @@ static bool getByNameFromPool( const OUString& rSearchName, SfxItemPool* pPool, // XNameAccess uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -341,7 +336,6 @@ static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< } uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -357,7 +351,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames() } sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -392,13 +385,11 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) // XElementAccess uno::Type SAL_CALL SvxUnoMarkerTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::PointSequence>::get(); } sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index ac4ed1e44a87..2e5868465298 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -104,7 +104,6 @@ void SvxDrawPage::disposing() throw() // XComponent void SvxDrawPage::dispose() - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -159,7 +158,7 @@ void SvxDrawPage::dispose() } -void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) { SolarMutexGuard aGuard; @@ -169,7 +168,7 @@ void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lan mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener ); } -void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) { SolarMutexGuard aGuard; @@ -180,7 +179,6 @@ void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css:: } void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -218,13 +216,11 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape } void SAL_CALL SvxDrawPage::addTop( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { add(xShape); } void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -262,7 +258,6 @@ void SAL_CALL SvxDrawPage::addBottom( const uno::Reference< drawing::XShape >& x } void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -312,7 +307,6 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) // css::container::XIndexAccess sal_Int32 SAL_CALL SvxDrawPage::getCount() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -323,7 +317,6 @@ sal_Int32 SAL_CALL SvxDrawPage::getCount() } uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -343,13 +336,11 @@ uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) // css::container::XElementAccess uno::Type SAL_CALL SvxDrawPage::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::XShape>::get(); } sal_Bool SAL_CALL SvxDrawPage::hasElements() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -412,7 +403,6 @@ void SvxDrawPage::SelectObjectInView( const Reference< drawing::XShape > & xShap } Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< drawing::XShapes >& xShapes ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -450,7 +440,6 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< } void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGroup ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -476,7 +465,6 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr } SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xShape) - throw (css::uno::RuntimeException, std::exception) { sal_uInt16 nType = 0; SdrInventor nInventor; @@ -587,7 +575,6 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor, } SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & referer ) - throw (css::uno::RuntimeException) { SvxShape* pRet = nullptr; switch( nInventor ) @@ -810,7 +797,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent } Reference< drawing::XShape > SvxDrawPage::CreateShape( SdrObject *pObj ) const - throw (css::uno::RuntimeException, std::exception) { Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(), pObj->GetObjInventor(), @@ -838,25 +824,23 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS } // css::lang::XServiceInfo -OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxDrawPage::getImplementationName() { return OUString("SvxDrawPage"); } sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() { uno::Sequence<OUString> aSeq { "com.sun.star.drawing.ShapeCollection" }; return aSeq; } SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer) - throw (css::uno::RuntimeException, std::exception) { return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor, nullptr, nullptr, referer ); } diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 2a56da4fbcca..2bcab15bb261 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -93,7 +93,6 @@ SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw() } void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, uno::Any& rValue ) - throw(beans::UnknownPropertyException) { switch( pEntry->mnHandle ) { @@ -148,7 +147,6 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn } void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const uno::Any& rValue ) - throw(beans::UnknownPropertyException, lang::IllegalArgumentException, uno::RuntimeException, std::exception) { uno::Any aValue( rValue ); @@ -199,7 +197,6 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn } void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { SolarMutexGuard aGuard; @@ -214,7 +211,6 @@ void SvxUnoDrawPool::_setPropertyValues( const comphelper::PropertyMapEntry** pp } void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException ) { SolarMutexGuard aGuard; @@ -229,7 +225,6 @@ void SvxUnoDrawPool::_getPropertyValues( const comphelper::PropertyMapEntry** pp } void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, beans::PropertyState* pStates ) - throw(beans::UnknownPropertyException ) { SolarMutexGuard aGuard; @@ -292,7 +287,6 @@ void SvxUnoDrawPool::_getPropertyStates( const comphelper::PropertyMapEntry** pp } void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) - throw(beans::UnknownPropertyException ) { SolarMutexGuard aGuard; @@ -311,7 +305,6 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* } uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException ) { SolarMutexGuard aGuard; @@ -332,13 +325,11 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry // XInterface uno::Any SAL_CALL SvxUnoDrawPool::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } uno::Any SAL_CALL SvxUnoDrawPool::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -369,7 +360,6 @@ void SAL_CALL SvxUnoDrawPool::release() throw ( ) } uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes() - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 6 ); uno::Type* pTypes = aTypes.getArray(); @@ -385,24 +375,22 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawPool::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoDrawPool::getImplementationName() { return OUString("SvxUnoDrawPool"); } uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.Defaults" }; return aSNS; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 71f911202dd5..c92b945cfd73 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1117,7 +1117,7 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI } /// @throws std::exception -bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) throw(std::exception) +bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) { // first, calculate the search string length without an optional number behind the name sal_Int32 nLength = rString.getLength(); @@ -1271,7 +1271,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] = }; /// @throws std::exception -bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw (std::exception) +bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't //replace "Red Hat 1" with the translation of Red :-) @@ -1302,7 +1302,7 @@ bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uIn /** if the given name is a predefined name for the current language it is replaced by the corresponding api name. */ -OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(std::exception) +OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) { OUString aNew = rInternalName; @@ -1335,7 +1335,7 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern /** if the given name is a predefined api name it is replaced by the predefined name for the current language. */ -OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(std::exception) +OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) { OUString aNew = rApiName; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 00d1b62f4030..3c75438f99e6 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -101,12 +101,11 @@ void SvxShapeGroup::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) uno::Any SAL_CALL SvxShapeGroup::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return SvxShape::queryInterface( rType ); } -uno::Any SAL_CALL SvxShapeGroup::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShapeGroup::queryAggregation( const uno::Type & rType ) { uno::Any aAny; @@ -132,7 +131,6 @@ void SAL_CALL SvxShapeGroup::release() throw ( ) } uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -141,31 +139,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId() OUString SAL_CALL SvxShapeGroup::getShapeType() - throw( uno::RuntimeException, std::exception ) { return SvxShape::getShapeType(); } -awt::Point SAL_CALL SvxShapeGroup::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxShapeGroup::getPosition() { return SvxShape::getPosition(); } -void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) { SvxShape::setPosition(Position); } -awt::Size SAL_CALL SvxShapeGroup::getSize() throw(uno::RuntimeException, std::exception) +awt::Size SAL_CALL SvxShapeGroup::getSize() { return SvxShape::getSize(); } void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { SvxShape::setSize( rSize ); } @@ -173,14 +169,14 @@ void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize ) // drawing::XShapeGroup -void SAL_CALL SvxShapeGroup::enterGroup( ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeGroup::enterGroup( ) { // Todo // pDrView->EnterMarkedGroup(); } -void SAL_CALL SvxShapeGroup::leaveGroup( ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeGroup::leaveGroup( ) { // Todo // pDrView->LeaveOneGroup(); @@ -230,7 +226,6 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape // XShapes void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -240,7 +235,6 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -292,7 +286,6 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS } void SAL_CALL SvxShapeGroup::addTop( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -301,7 +294,6 @@ void SAL_CALL SvxShapeGroup::addTop( const uno::Reference< drawing::XShape >& xS } void SAL_CALL SvxShapeGroup::addBottom( const uno::Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -312,7 +304,7 @@ void SAL_CALL SvxShapeGroup::addBottom( const uno::Reference< drawing::XShape >& // XIndexAccess -sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxShapeGroup::getCount() { ::SolarMutexGuard aGuard; @@ -328,7 +320,6 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException, std:: uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -350,13 +341,13 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) // css::container::XElementAccess -uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SvxShapeGroup::getElementType() { return cppu::UnoType<drawing::XShape>::get(); } -sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxShapeGroup::hasElements() { ::SolarMutexGuard aGuard; @@ -375,13 +366,11 @@ SvxShapeConnector::~SvxShapeConnector() throw() uno::Any SAL_CALL SvxShapeConnector::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return SvxShapeText::queryInterface( rType ); } uno::Any SAL_CALL SvxShapeConnector::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -404,13 +393,11 @@ void SAL_CALL SvxShapeConnector::release() throw ( ) // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxShapeConnector::getTypes() - throw (uno::RuntimeException, std::exception) { return SvxShape::getTypes(); } uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -419,31 +406,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId() OUString SAL_CALL SvxShapeConnector::getShapeType() - throw( uno::RuntimeException, std::exception ) { return SvxShapeText::getShapeType(); } -awt::Point SAL_CALL SvxShapeConnector::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxShapeConnector::getPosition() { return SvxShapeText::getPosition(); } -void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) { SvxShapeText::setPosition(Position); } -awt::Size SAL_CALL SvxShapeConnector::getSize() throw(uno::RuntimeException, std::exception) +awt::Size SAL_CALL SvxShapeConnector::getSize() { return SvxShapeText::getSize(); } void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { SvxShapeText::setSize( rSize ); } @@ -451,7 +436,7 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize ) // XConnectorShape -void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) { ::SolarMutexGuard aGuard; @@ -467,7 +452,6 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -483,7 +467,6 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >& ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -496,7 +479,6 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing: void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -520,12 +502,11 @@ SvxShapeControl::~SvxShapeControl() throw() uno::Any SAL_CALL SvxShapeControl::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return SvxShapeText::queryInterface( rType ); } -uno::Any SAL_CALL SvxShapeControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShapeControl::queryAggregation( const uno::Type & rType ) { uno::Any aAny; @@ -548,13 +529,11 @@ void SAL_CALL SvxShapeControl::release() throw ( ) // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxShapeControl::getTypes() - throw (uno::RuntimeException, std::exception) { return SvxShape::getTypes(); } uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -563,31 +542,29 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId() OUString SAL_CALL SvxShapeControl::getShapeType() - throw( uno::RuntimeException, std::exception ) { return SvxShapeText::getShapeType(); } -awt::Point SAL_CALL SvxShapeControl::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxShapeControl::getPosition() { return SvxShapeText::getPosition(); } -void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) { SvxShapeText::setPosition(Position); } -awt::Size SAL_CALL SvxShapeControl::getSize() throw(uno::RuntimeException, std::exception) +awt::Size SAL_CALL SvxShapeControl::getSize() { return SvxShapeText::getSize(); } void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { SvxShapeText::setSize( rSize ); } @@ -596,7 +573,6 @@ void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize ) // XControlShape Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl() - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -611,7 +587,6 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl() void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl ) - throw( uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -783,7 +758,6 @@ namespace } void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { OUString aFormsName; if ( lcl_convertPropertyName( aPropertyName, aFormsName ) ) @@ -822,7 +796,6 @@ void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName, } uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OUString aFormsName; if ( lcl_convertPropertyName( aPropertyName, aFormsName ) ) @@ -871,7 +844,7 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyValue( const OUString& aPropertyNa } // XPropertyState -beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) +beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& PropertyName ) { OUString aFormsName; if ( lcl_convertPropertyName( PropertyName, aFormsName ) ) @@ -896,7 +869,7 @@ beans::PropertyState SAL_CALL SvxShapeControl::getPropertyState( const OUString& } } -void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyName ) throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception ) +void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyName ) { OUString aFormsName; if ( lcl_convertPropertyName( PropertyName, aFormsName ) ) @@ -920,7 +893,6 @@ void SAL_CALL SvxShapeControl::setPropertyToDefault( const OUString& PropertyNam } uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { OUString aFormsName; if ( lcl_convertPropertyName( aPropertyName, aFormsName ) ) @@ -976,7 +948,6 @@ SvxShapeCircle::~SvxShapeCircle() throw() } SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew ) - throw( css::beans::PropertyVetoException, css::lang::IllegalArgumentException) : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGON), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) ) , mePolygonKind( eNew ) { @@ -1020,7 +991,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c } -bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) +bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1128,9 +1099,6 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1201,7 +1169,7 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx } -void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) +void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) { ::SolarMutexGuard aGuard; @@ -1236,7 +1204,7 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw() } -bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) +bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1277,7 +1245,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con } -bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) +bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1315,7 +1283,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con } -void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) +void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) { ::SolarMutexGuard aGuard; @@ -1347,7 +1315,7 @@ SvxGraphicObject::~SvxGraphicObject() throw() { } -bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { bool bOk = false; switch( pProperty->nWID ) @@ -1495,7 +1463,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte return true; } -bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1601,13 +1569,11 @@ SvxCustomShape::~SvxCustomShape() throw() uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return SvxShapeText::queryInterface( rType ); } uno::Any SAL_CALL SvxCustomShape::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { css::uno::Any aReturn = SvxShapeText::queryAggregation( rType ); if ( !aReturn.hasValue() ) @@ -1627,13 +1593,11 @@ void SAL_CALL SvxCustomShape::release() throw ( ) uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes() - throw (uno::RuntimeException, std::exception) { return SvxShapeText::getTypes(); } uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1641,7 +1605,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId() // css::drawing::XShape -awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxCustomShape::getPosition() { ::SolarMutexGuard aGuard; if ( mpModel && mpObj.is() ) @@ -1724,7 +1688,6 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { ::SolarMutexGuard aGuard; @@ -1805,7 +1768,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c } } -bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1822,7 +1785,7 @@ bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } -void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (css::uno::RuntimeException, std::exception) +void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) { static_cast<SdrObjCustomShape*>(mpObj.get())->MergeDefaultAttributes( &rValueType ); } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 8a59d737184e..3af24f0f1fb2 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -76,7 +76,7 @@ void Svx3DSceneObject::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) } -uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) { uno::Any aAny; @@ -89,7 +89,7 @@ uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) return aAny; } -uno::Any SAL_CALL Svx3DSceneObject::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL Svx3DSceneObject::queryInterface( const uno::Type & rType ) { return SvxShape::queryInterface( rType ); } @@ -107,14 +107,12 @@ void SAL_CALL Svx3DSceneObject::release() throw ( ) // XTypeProvider uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -143,7 +141,6 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xShape ) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -184,7 +181,6 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha sal_Int32 SAL_CALL Svx3DSceneObject::getCount() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -197,7 +193,6 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount() uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -219,14 +214,12 @@ uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) // css::container::XElementAccess uno::Type SAL_CALL Svx3DSceneObject::getElementType() - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::XShape>::get(); } sal_Bool SAL_CALL Svx3DSceneObject::hasElements() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -292,7 +285,7 @@ struct ImpRememberTransAndRect Rectangle maRect; }; -bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -405,10 +398,6 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) { switch( pProperty->nWID ) { @@ -453,7 +442,6 @@ bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItem // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3DScene"} ); @@ -469,7 +457,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw() { } -bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { SolarMutexGuard aGuard; @@ -524,7 +512,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem throw IllegalArgumentException(); } -bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -574,7 +562,6 @@ bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItem // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", @@ -591,7 +578,7 @@ Svx3DSphereObject::~Svx3DSphereObject() throw() { } -bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -635,7 +622,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt throw IllegalArgumentException(); } -bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -680,7 +667,6 @@ bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxIt // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", @@ -785,7 +771,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& rValue <<= aRetval; } -bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -831,7 +817,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte throw IllegalArgumentException(); } -bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -879,7 +865,6 @@ bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxIte // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", @@ -896,7 +881,7 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() { } -bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -931,7 +916,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI throw IllegalArgumentException(); } -bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -981,7 +966,6 @@ bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxI // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", @@ -998,7 +982,7 @@ Svx3DPolygonObject::~Svx3DPolygonObject() throw() { } -bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1071,7 +1055,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI throw IllegalArgumentException(); } -bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1118,7 +1102,6 @@ bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxI // css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { Sequence< OUString > aSeq( SvxShape::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.drawing.Shape3D", diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index c806e75e27e2..d9c43b7d2353 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -80,7 +80,7 @@ SvxOle2Shape::~SvxOle2Shape() throw() } //XPropertySet -bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -198,7 +198,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro throw IllegalArgumentException(); } -bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -577,19 +577,19 @@ void SvxAppletShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SetShapeType( "com.sun.star.drawing.AppletShape" ); } -void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxAppletShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxAppletShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -610,7 +610,7 @@ bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemP } } -bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -649,19 +649,19 @@ void SvxPluginShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SetShapeType( "com.sun.star.drawing.PluginShape" ); } -void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -682,7 +682,7 @@ bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemP } } -bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -713,7 +713,7 @@ SvxFrameShape::~SvxFrameShape() throw() { } -void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (uno::RuntimeException, std::exception) +void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) { SvxShape::Create( pNewObj, pNewPage ); const SvGlobalName aIFrameClassId( SO3_IFRAME_CLASSID ); @@ -721,19 +721,19 @@ void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (u SetShapeType( "com.sun.star.drawing.FrameShape" ); } -void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -756,10 +756,6 @@ bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr bool SvxFrameShape::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -791,7 +787,7 @@ SvxMediaShape::~SvxMediaShape() throw() } -bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { if( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) || (pProperty->nWID == OWN_ATTR_MEDIA_STREAM) @@ -917,7 +913,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } -bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index bf54674e563c..d20eaef09261 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -171,7 +171,7 @@ protected: } }; -SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException ) +SvxShape::SvxShape( SdrObject* pObject ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) @@ -185,7 +185,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw( uno::RuntimeException ) } -SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw( uno::RuntimeException ) +SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) @@ -199,7 +199,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, } -SvxShape::SvxShape() throw( uno::RuntimeException ) +SvxShape::SvxShape() : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) , mbIsMultiPropertyCall(false) @@ -273,7 +273,7 @@ void SvxShape::setMaster( SvxShapeMaster* pMaster ) } -uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) { if( mpImpl->mpMaster ) { @@ -306,7 +306,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& } -sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { @@ -651,7 +651,6 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet) } uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const - throw (uno::RuntimeException, std::exception) { DBG_TESTSOLARMUTEX(); uno::Any aAny; @@ -702,7 +701,6 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const } uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() - throw (uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -716,7 +714,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() - throw(uno::RuntimeException) { switch( mpImpl->mnObjId ) { @@ -994,7 +991,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1113,7 +1109,7 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) } -awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::exception) +awt::Point SAL_CALL SvxShape::getPosition() { ::SolarMutexGuard aGuard; @@ -1136,7 +1132,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::ex } -void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) { ::SolarMutexGuard aGuard; @@ -1166,7 +1162,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run } -awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException, std::exception) +awt::Size SAL_CALL SvxShape::getSize() { ::SolarMutexGuard aGuard; @@ -1183,7 +1179,6 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException, std::excepti void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1234,7 +1229,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) // XNamed -OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL SvxShape::getName( ) { ::SolarMutexGuard aGuard; if( mpObj.is() ) @@ -1248,7 +1243,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::e } -void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::setName( const OUString& aName ) { ::SolarMutexGuard aGuard; if( mpObj.is() ) @@ -1264,7 +1259,7 @@ void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::Runtime // XShapeDescriptor -OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxShape::getShapeType() { if( !maShapeType.getLength() ) return UHashMap::getNameFromId( mpImpl->mnObjId ); @@ -1275,7 +1270,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException, std::exc // XComponent -void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::dispose() { ::SolarMutexGuard aGuard; @@ -1334,13 +1329,12 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception) void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException, std::exception) { mpImpl->maDisposeListeners.addInterface(xListener); } -void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) { mpImpl->maDisposeListeners.removeInterface(aListener); } @@ -1349,7 +1343,7 @@ void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListen Reference< beans::XPropertySetInfo > SAL_CALL - SvxShape::getPropertySetInfo() throw(uno::RuntimeException, std::exception) + SvxShape::getPropertySetInfo() { if( mpImpl->mpMaster ) { @@ -1362,33 +1356,33 @@ Reference< beans::XPropertySetInfo > SAL_CALL } Reference< beans::XPropertySetInfo > SAL_CALL - SvxShape::_getPropertySetInfo() throw(uno::RuntimeException) + SvxShape::_getPropertySetInfo() { return mpPropSet->getPropertySetInfo(); } -void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) { ::osl::MutexGuard aGuard( maMutex ); mpImpl->maPropertyNotifier.addPropertyChangeListener( _propertyName, _listener ); } -void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) { ::osl::MutexGuard aGuard( maMutex ); mpImpl->maPropertyNotifier.removePropertyChangeListener( _propertyName, _listener ); } -void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) { OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } -void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) { OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } @@ -1574,7 +1568,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -1587,7 +1580,6 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u } void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1701,7 +1693,6 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( mpImpl->mpMaster ) return mpImpl->mpMaster->getPropertyValue( PropertyName ); @@ -1711,7 +1702,6 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1769,7 +1759,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) // XMultiPropertySet -void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) { ::SolarMutexGuard aSolarGuard; @@ -1840,7 +1830,7 @@ void SvxShape::endSetPropertyValues() } -css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) { const sal_Int32 nCount = aPropertyNames.getLength(); const OUString* pNames = aPropertyNames.getConstArray(); @@ -1883,15 +1873,15 @@ css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const return aRet; } -void SAL_CALL SvxShape::addPropertiesChangeListener( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addPropertiesChangeListener( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SvxShape::removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) { } @@ -1978,7 +1968,6 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE // XPropertyState beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -1991,7 +1980,6 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper } beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -2058,7 +2046,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope return eState; } -bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -2501,7 +2489,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } -bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -2888,7 +2876,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } -bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) +bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) { @@ -2918,7 +2906,7 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty } -bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) +bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) { @@ -2939,7 +2927,6 @@ bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProp uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyName.getLength(); const OUString* pNames = aPropertyName.getConstArray(); @@ -2955,7 +2942,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -2968,7 +2954,6 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) } void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -2987,7 +2972,6 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -3000,7 +2984,6 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) } uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -3026,7 +3009,7 @@ uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) } // XMultiPropertyStates -void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException, std::exception) +void SvxShape::setAllPropertiesToDefault() { ::SolarMutexGuard aGuard; @@ -3056,7 +3039,6 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException, std::ex void SvxShape::setPropertiesToDefault( const uno::Sequence<OUString>& aPropertyNames ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for ( sal_Int32 pos = 0; pos < aPropertyNames.getLength(); ++pos ) setPropertyToDefault( aPropertyNames[pos] ); @@ -3064,8 +3046,6 @@ void SvxShape::setPropertiesToDefault( uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( const uno::Sequence<OUString>& aPropertyNames ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { ::std::vector<uno::Any> ret; for ( sal_Int32 pos = 0; pos < aPropertyNames.getLength(); ++pos ) @@ -3077,7 +3057,6 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( // XServiceInfo OUString SAL_CALL SvxShape::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxShape"); } @@ -3130,7 +3109,6 @@ const char sUNO_service_drawing_MediaShape[] = STAR_NAMESPACE "d uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) { @@ -3143,7 +3121,6 @@ uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames() } uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() - throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -3697,14 +3674,13 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() return aSeq; } -sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxShape::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } // XGluePointsSupplier uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; uno::Reference< container::XIndexContainer > xGluePoints( mxGluePoints ); @@ -3720,7 +3696,6 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints() // XChild uno::Reference<uno::XInterface> SAL_CALL SvxShape::getParent() - throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3749,7 +3724,6 @@ uno::Reference<uno::XInterface> SAL_CALL SvxShape::getParent() } void SAL_CALL SvxShape::setParent( const css::uno::Reference< css::uno::XInterface >& ) - throw(lang::NoSupportException, uno::RuntimeException, std::exception) { throw lang::NoSupportException(); } @@ -3768,7 +3742,7 @@ void SvxShape::unlock() // XActionLockable -sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxShape::isActionLocked( ) { ::SolarMutexGuard aGuard; @@ -3776,7 +3750,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (css::uno::RuntimeException } -void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addActionLock( ) { ::SolarMutexGuard aGuard; @@ -3788,7 +3762,7 @@ void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std } -void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removeActionLock( ) { ::SolarMutexGuard aGuard; @@ -3800,7 +3774,7 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, } -void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::RuntimeException, std::exception ) +void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) { ::SolarMutexGuard aGuard; @@ -3814,7 +3788,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::Runti } -sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (css::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) { ::SolarMutexGuard aGuard; @@ -3892,14 +3866,12 @@ void SvxShapeText::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) // XInterface uno::Any SAL_CALL SvxShapeText::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { return SvxShape::queryInterface( rType ); } uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aAny( SvxShape::queryAggregation( rType ) ); if( aAny.hasValue() ) @@ -3922,19 +3894,19 @@ void SAL_CALL SvxShapeText::release() throw() // XServiceInfo -OUString SAL_CALL SvxShapeText::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxShapeText::getImplementationName() { return OUString("SvxShapeText"); } -uno::Sequence< OUString > SAL_CALL SvxShapeText::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SvxShapeText::getSupportedServiceNames() { return SvxShape::getSupportedServiceNames(); } -sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) { return cppu::supportsService(static_cast<SvxShape*>(this), ServiceName); } @@ -3942,12 +3914,11 @@ sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) t // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxShapeText::getTypes() - throw( uno::RuntimeException, std::exception ) { return SvxShape::getTypes(); } -sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { const sal_Int64 nReturn = SvxShape::getSomething( rId ); if( nReturn ) @@ -3958,7 +3929,6 @@ sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -3982,7 +3952,7 @@ void SvxShapeText::unlock() } // css::text::XTextRange -uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() { ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; @@ -3992,7 +3962,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno:: } -uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() { ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; @@ -4001,7 +3971,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getEnd() throw(uno::Ru return SvxUnoTextBase::getEnd(); } -OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxShapeText::getString() { ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; @@ -4011,7 +3981,7 @@ OUString SAL_CALL SvxShapeText::getString() throw(uno::RuntimeException, std::ex } -void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeText::setString( const OUString& aString ) { ::SolarMutexGuard aGuard; SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; @@ -4021,7 +3991,7 @@ void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::Runt } // override these for special property handling in subcasses. Return true if property is handled -bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { // HACK-fix #99090# // since SdrTextObj::SetVerticalWriting exchanges @@ -4044,7 +4014,7 @@ bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPro return SvxShape::setPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) { if( pProperty->nWID == SDRATTR_TEXTDIRECTION ) { @@ -4059,12 +4029,12 @@ bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPro return SvxShape::getPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) +bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) { return SvxShape::getPropertyStateImpl( pProperty, rState ); } -bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) +bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) { return SvxShape::setPropertyToDefaultImpl( pProperty ); } @@ -4078,12 +4048,12 @@ SvxShapeRect::~SvxShapeRect() throw() { } -uno::Any SAL_CALL SvxShapeRect::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShapeRect::queryInterface( const uno::Type & rType ) { return SvxShapeText::queryInterface( rType ); } -uno::Any SAL_CALL SvxShapeRect::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SvxShapeRect::queryAggregation( const uno::Type & rType ) { return SvxShapeText::queryAggregation( rType ); } @@ -4100,7 +4070,7 @@ void SAL_CALL SvxShapeRect::release() throw() // XServiceInfo -uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames() { return SvxShape::getSupportedServiceNames(); } diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index d370a9c8aab8..a8754dbbb9c9 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -58,26 +58,26 @@ public: virtual void SAL_CALL release() throw() override; // XComponent - virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XShapes - virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; SvxShapeCollection::SvxShapeCollection() throw() @@ -120,7 +120,6 @@ void SvxShapeCollection::release() throw() // XComponent void SvxShapeCollection::dispose() - throw(css::uno::RuntimeException, std::exception) { // An frequently programming error is to release the last // reference to this object in the disposing message. @@ -178,39 +177,38 @@ void SvxShapeCollection::dispose() } // XComponent -void SAL_CALL SvxShapeCollection::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeCollection::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) { mrBHelper.addListener( cppu::UnoType<decltype(aListener)>::get() , aListener ); } // XComponent -void SAL_CALL SvxShapeCollection::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeCollection::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) { mrBHelper.removeListener( cppu::UnoType<decltype(aListener)>::get() , aListener ); } // XShapes -void SAL_CALL SvxShapeCollection::add( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SvxShapeCollection::add( const Reference< drawing::XShape >& xShape ) { maShapeContainer.addInterface( xShape ); } -void SAL_CALL SvxShapeCollection::remove( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL SvxShapeCollection::remove( const uno::Reference< drawing::XShape >& xShape ) { maShapeContainer.removeInterface( xShape ); } -sal_Int32 SAL_CALL SvxShapeCollection::getCount() throw( uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxShapeCollection::getCount() { return maShapeContainer.getLength(); } uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index ) - throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -222,30 +220,28 @@ uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index ) } // XElementAccess -uno::Type SAL_CALL SvxShapeCollection::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SvxShapeCollection::getElementType() { return cppu::UnoType<drawing::XShape>::get(); } -sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxShapeCollection::hasElements() { return getCount() != 0; } // XServiceInfo OUString SAL_CALL SvxShapeCollection::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.drawing.SvxShapeCollection"); } sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName); } -uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() { uno::Sequence< OUString > aSeq(2); aSeq.getArray()[0] = "com.sun.star.drawing.Shapes"; diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index f2f9f58a1e61..3f29ce5b39eb 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -40,11 +40,11 @@ public: virtual NameOrIndex* createItem() const throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw( uno::RuntimeException, std::exception) override; + virtual uno::Type SAL_CALL getElementType( ) override; }; SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw() @@ -52,13 +52,12 @@ SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw() { } -OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() { return OUString("SvxUnoTransGradientTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedServiceNames( ) - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.drawing.TransparencyGradientTable" }; return aSNS; @@ -73,7 +72,6 @@ NameOrIndex* SvxUnoTransGradientTable::createItem() const throw() // XElementAccess uno::Type SAL_CALL SvxUnoTransGradientTable::getElementType( ) - throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<awt::Gradient>::get(); } diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 195b09c33245..aebe96aaabb4 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -73,7 +73,6 @@ bool GalleryItem::isValid() const uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aAny; @@ -97,7 +96,6 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } @@ -118,25 +116,21 @@ void SAL_CALL GalleryItem::release() OUString SAL_CALL GalleryItem::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.gallery.GalleryItem" ); } sal_Bool SAL_CALL GalleryItem::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL GalleryItem::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { return { "com.sun.star.gallery.GalleryItem" }; } uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 6 ); uno::Type* pTypes = aTypes.getArray(); @@ -152,14 +146,12 @@ uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } sal_Int8 SAL_CALL GalleryItem::getType() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; sal_Int8 nRet = gallery::GalleryItemType::EMPTY; @@ -222,12 +214,6 @@ sal_Int8 SAL_CALL GalleryItem::getType() } void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) - throw (beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { const SolarMutexGuard aGuard; @@ -267,10 +253,6 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt } void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) { const SolarMutexGuard aGuard; diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index d36754be8243..54dbcd2369b9 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -52,30 +52,26 @@ public: protected: // XInterface - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XGalleryItem - virtual ::sal_Int8 SAL_CALL getType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL getType( ) override; // PropertySetHelper - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) override; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) override; protected: diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 4cee8ce8ea20..ea3181bdc6b2 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -68,25 +68,21 @@ GalleryTheme::~GalleryTheme() OUString SAL_CALL GalleryTheme::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.gallery.GalleryTheme" ); } sal_Bool SAL_CALL GalleryTheme::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL GalleryTheme::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { return { "com.sun.star.gallery.GalleryTheme" }; } uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 5 ); uno::Type* pTypes = aTypes.getArray(); @@ -101,21 +97,18 @@ uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } uno::Type SAL_CALL GalleryTheme::getElementType() - throw (uno::RuntimeException, std::exception) { return cppu::UnoType<gallery::XGalleryItem>::get(); } sal_Bool SAL_CALL GalleryTheme::hasElements() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; @@ -124,7 +117,6 @@ sal_Bool SAL_CALL GalleryTheme::hasElements() sal_Int32 SAL_CALL GalleryTheme::getCount() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; @@ -133,7 +125,6 @@ sal_Int32 SAL_CALL GalleryTheme::getCount() uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; uno::Any aRet; @@ -158,7 +149,6 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) OUString SAL_CALL GalleryTheme::getName( ) - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; OUString aRet; @@ -171,7 +161,6 @@ OUString SAL_CALL GalleryTheme::getName( ) void SAL_CALL GalleryTheme::update( ) - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; @@ -185,7 +174,6 @@ void SAL_CALL GalleryTheme::update( ) ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex( const OUString& rURL, ::sal_Int32 nIndex ) - throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; sal_Int32 nRet = -1; @@ -217,7 +205,6 @@ void SAL_CALL GalleryTheme::update( ) ::sal_Int32 SAL_CALL GalleryTheme::insertGraphicByIndex( const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex ) - throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; sal_Int32 nRet = -1; @@ -244,7 +231,6 @@ void SAL_CALL GalleryTheme::update( ) ::sal_Int32 SAL_CALL GalleryTheme::insertDrawingByIndex( const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex ) - throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; sal_Int32 nRet = -1; @@ -298,7 +284,6 @@ void SAL_CALL GalleryTheme::update( ) void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index daf53d57ef47..a8f78d6aafab 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -50,29 +50,29 @@ public: protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override; // XGalleryThemes - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL insertURLByIndex( const OUString& URL, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL insertGraphicByIndex( const css::uno::Reference< css::graphic::XGraphic >& Graphic, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL insertDrawingByIndex( const css::uno::Reference< css::lang::XComponent >& Drawing, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL update( ) override; + virtual ::sal_Int32 SAL_CALL insertURLByIndex( const OUString& URL, ::sal_Int32 Index ) override; + virtual ::sal_Int32 SAL_CALL insertGraphicByIndex( const css::uno::Reference< css::graphic::XGraphic >& Graphic, ::sal_Int32 Index ) override; + virtual ::sal_Int32 SAL_CALL insertDrawingByIndex( const css::uno::Reference< css::lang::XComponent >& Drawing, ::sal_Int32 Index ) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) override; // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 926aba8e21c1..755979493096 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -50,29 +50,29 @@ public: protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XGalleryThemeProvider - virtual css::uno::Reference< css::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) throw (css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& ThemeName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) override; + virtual void SAL_CALL removeByName( const OUString& ThemeName ) override; private: @@ -87,26 +87,22 @@ GalleryThemeProvider::GalleryThemeProvider() : } OUString SAL_CALL GalleryThemeProvider::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" ); } sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSeq { "com.sun.star.gallery.GalleryThemeProvider" }; return aSeq; } uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 6 ); uno::Type* pTypes = aTypes.getArray(); @@ -122,13 +118,11 @@ uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL GalleryThemeProvider::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& rArguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) { uno::Sequence< beans::PropertyValue > aParams; sal_Int32 i; @@ -150,14 +144,12 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& uno::Type SAL_CALL GalleryThemeProvider::getElementType() - throw (uno::RuntimeException, std::exception) { return cppu::UnoType<gallery::XGalleryTheme>::get(); } sal_Bool SAL_CALL GalleryThemeProvider::hasElements() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; @@ -166,7 +158,6 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements() uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) - throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; uno::Any aRet; @@ -185,7 +176,6 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; sal_uInt32 i = 0, nCount = ( mpGallery ? mpGallery->GetThemeCount() : 0 ), nRealCount = 0; @@ -206,7 +196,6 @@ uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; @@ -220,7 +209,6 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const OUString& rThemeName ) - throw (container::ElementExistException, uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; uno::Reference< gallery::XGalleryTheme > xRet; @@ -242,7 +230,6 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) - throw (container::NoSuchElementException, uno::RuntimeException, std::exception) { const SolarMutexGuard aGuard; diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 432a786f5b56..3b6af7b87fa4 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -75,9 +75,9 @@ public: OutputStorageWrapper_Impl(); // css::io::XOutputStream - virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; - virtual void SAL_CALL flush() throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput() throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; SvStream* GetStream(); }; @@ -100,21 +100,18 @@ SvStream *OutputStorageWrapper_Impl::GetStream() void SAL_CALL OutputStorageWrapper_Impl::writeBytes( const Sequence< sal_Int8 >& aData) - throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); xOut->writeBytes( aData ); } void SAL_CALL OutputStorageWrapper_Impl::flush() - throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); xOut->flush(); } void SAL_CALL OutputStorageWrapper_Impl::closeOutput() - throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); xOut->closeOutput(); @@ -588,7 +585,6 @@ void SvXMLEmbeddedObjectHelper::Destroy( // XGraphicObjectResolver: alien objects! OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL(const OUString& rURL) - throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -613,7 +609,6 @@ OUString SAL_CALL SvXMLEmbeddedObjectHelper::resolveEmbeddedObjectURL(const OUSt // XNameAccess: alien objects! Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( const OUString& rURLStr ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); Any aRet; @@ -711,13 +706,11 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( } Sequence< OUString > SAL_CALL SvXMLEmbeddedObjectHelper::getElementNames() - throw (RuntimeException, std::exception) { return Sequence< OUString >(0); } sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode ) @@ -740,7 +733,6 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr // XNameAccess Type SAL_CALL SvXMLEmbeddedObjectHelper::getElementType() - throw (RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode ) @@ -750,7 +742,6 @@ Type SAL_CALL SvXMLEmbeddedObjectHelper::getElementType() } sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasElements() - throw (RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); if( SvXMLEmbeddedObjectHelperMode::Read == meCreateMode ) diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 4ef3bfe43dff..bb922a2b2cbd 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -75,11 +75,11 @@ class SvXMLGraphicInputStream: { private: - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() throw(NotConnectedException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() throw(NotConnectedException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override; + virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override; + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override; + virtual sal_Int32 SAL_CALL available() override; + virtual void SAL_CALL closeInput() override; private: @@ -151,7 +151,6 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId ) } sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException(); @@ -160,7 +159,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rDa } sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -169,7 +167,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& } void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -177,7 +174,7 @@ void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip ) mxStmWrapper->skipBytes( nBytesToSkip ); } -sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedException, RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -185,7 +182,7 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedExcep return mxStmWrapper->available(); } -void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException, RuntimeException, std::exception ) +void SAL_CALL SvXMLGraphicInputStream::closeInput() { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -199,9 +196,9 @@ class SvXMLGraphicOutputStream: private: // XOutputStream - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; - virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; - virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; private: @@ -242,7 +239,6 @@ SvXMLGraphicOutputStream::~SvXMLGraphicOutputStream() } void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -251,7 +247,6 @@ void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >& } void SAL_CALL SvXMLGraphicOutputStream::flush() - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -260,7 +255,6 @@ void SAL_CALL SvXMLGraphicOutputStream::flush() } void SAL_CALL SvXMLGraphicOutputStream::closeOutput() - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -799,7 +793,6 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) // XGraphicObjectResolver OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& rURL ) - throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); const sal_Int32 nIndex = maGrfURLs.size(); @@ -843,7 +836,6 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& r // XBinaryStreamResolver Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUString& rURL ) - throw( RuntimeException, std::exception ) { Reference< XInputStream > xRet; OUString aPictureStorageName, aGraphicId; @@ -864,7 +856,6 @@ Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUS } Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() - throw( RuntimeException, std::exception ) { Reference< XOutputStream > xRet; @@ -882,7 +873,6 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() } OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOutputStream >& rxBinaryStream ) - throw( RuntimeException, std::exception ) { OUString aRet; @@ -947,29 +937,20 @@ protected: // ____ XInitialization ____ // one argument is allowed, which is the XStorage - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw (Exception, - RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // ____ XGraphicObjectResolver ____ - virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) override; // ____ XBinaryStreamResolver ____ - virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL ) - throw (RuntimeException, std::exception) override; - virtual Reference< io::XOutputStream > SAL_CALL createOutputStream() - throw (RuntimeException, std::exception) override; - virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) - throw (RuntimeException, std::exception) override; + virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL ) override; + virtual Reference< io::XOutputStream > SAL_CALL createOutputStream() override; + virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: SvXMLGraphicHelperMode m_eGraphicHelperMode; @@ -995,7 +976,6 @@ void SAL_CALL SvXMLGraphicImportExportHelper::disposing() // ____ XInitialization ____ void SAL_CALL SvXMLGraphicImportExportHelper::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { Reference< embed::XStorage > xStorage; if( aArguments.getLength() > 0 ) @@ -1011,7 +991,6 @@ void SAL_CALL SvXMLGraphicImportExportHelper::initialize( // ____ XGraphicObjectResolver ____ OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const OUString& aURL ) - throw (uno::RuntimeException, std::exception) { return m_xGraphicObjectResolver->resolveGraphicObjectURL( aURL ); } @@ -1019,24 +998,20 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const // ____ XBinaryStreamResolver ____ Reference< io::XInputStream > SAL_CALL SvXMLGraphicImportExportHelper::getInputStream( const OUString& aURL ) - throw (uno::RuntimeException, std::exception) { return m_xBinaryStreamResolver->getInputStream( aURL ); } Reference< io::XOutputStream > SAL_CALL SvXMLGraphicImportExportHelper::createOutputStream() - throw (uno::RuntimeException, std::exception) { return m_xBinaryStreamResolver->createOutputStream(); } OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) - throw (uno::RuntimeException, std::exception) { return m_xBinaryStreamResolver->resolveOutputStream( aBinaryStream ); } // ____ XServiceInfo ____ OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName() - throw (uno::RuntimeException, std::exception) { if( m_eGraphicHelperMode == SvXMLGraphicHelperMode::Read ) return OUString("com.sun.star.comp.Svx.GraphicImportHelper"); @@ -1044,13 +1019,11 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName() } sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service Sequence< OUString > aSupportedServiceNames( 2 ); diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 23391317e81f..62732b87671d 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -195,7 +195,6 @@ bool SvxXMLXTableExportComponent::save( const uno::Reference<container::XNameContainer >& xTable, const uno::Reference<embed::XStorage >& xStorage, OUString *pOptName ) - throw (css::uno::RuntimeException, std::exception) { bool bRet = false; SfxMedium* pMedium = nullptr; |