diff options
Diffstat (limited to 'svtools')
54 files changed, 855 insertions, 1110 deletions
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx index 798637c6b924..919cba36bd1d 100644 --- a/svtools/inc/vclxaccessibleheaderbar.hxx +++ b/svtools/inc/vclxaccessibleheaderbar.hxx @@ -42,14 +42,14 @@ public: VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow ); // 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 sal_Int16 SAL_CALL getAccessibleRole( ) 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 sal_Int16 SAL_CALL getAccessibleRole( ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override; public: virtual void SAL_CALL disposing() override; diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/svtools/inc/vclxaccessibleheaderbaritem.hxx index 182205144020..5bdb0ac7de46 100644 --- a/svtools/inc/vclxaccessibleheaderbaritem.hxx +++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx @@ -60,7 +60,7 @@ protected: void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; public: VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar, sal_Int32 _nIndexInParent ); @@ -73,35 +73,35 @@ public: DECLARE_XTYPEPROVIDER() // 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; // 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::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 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( ) 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 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) 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; }; #endif // INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 080c70f1aafc..81cc65621965 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -86,7 +86,6 @@ void ItemHolder2::holdConfigItem(EItem eItem) void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&) - throw(css::uno::RuntimeException, std::exception) { impl_releaseAllItems(); } diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx index a94a3dc77acb..e4bc8c3ca17b 100644 --- a/svtools/source/config/itemholder2.hxx +++ b/svtools/source/config/itemholder2.hxx @@ -48,8 +48,7 @@ class ItemHolder2 : private ItemHolderMutexBase // uno interface public: - 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 diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index f528ca65a505..e3fd1b0b2041 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -67,21 +67,21 @@ SvtRulerAccessible::~SvtRulerAccessible() //===== XAccessible ========================================================= -uno::Reference< XAccessibleContext > SAL_CALL SvtRulerAccessible::getAccessibleContext() throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleContext > SAL_CALL SvtRulerAccessible::getAccessibleContext() { return this; } //===== XAccessibleComponent ================================================ -sal_Bool SAL_CALL SvtRulerAccessible::containsPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvtRulerAccessible::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 SvtRulerAccessible::getAccessibleAtPoint( const awt::Point& ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleAtPoint( const awt::Point& ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -93,31 +93,31 @@ uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleAtPoint( return xRet; } -awt::Rectangle SAL_CALL SvtRulerAccessible::getBounds() throw( RuntimeException, std::exception ) +awt::Rectangle SAL_CALL SvtRulerAccessible::getBounds() { // no guard -> done in GetBoundingBox() return AWTRectangle( GetBoundingBox() ); } -awt::Point SAL_CALL SvtRulerAccessible::getLocation() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvtRulerAccessible::getLocation() { // no guard -> done in GetBoundingBox() return AWTPoint( GetBoundingBox().TopLeft() ); } -awt::Point SAL_CALL SvtRulerAccessible::getLocationOnScreen() throw( RuntimeException, std::exception ) +awt::Point SAL_CALL SvtRulerAccessible::getLocationOnScreen() { // no guard -> done in GetBoundingBoxOnScreen() return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } -awt::Size SAL_CALL SvtRulerAccessible::getSize() throw( RuntimeException, std::exception ) +awt::Size SAL_CALL SvtRulerAccessible::getSize() { // no guard -> done in GetBoundingBox() return AWTSize( GetBoundingBox().GetSize() ); } -bool SAL_CALL SvtRulerAccessible::isVisible() throw( RuntimeException ) +bool SAL_CALL SvtRulerAccessible::isVisible() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -127,7 +127,7 @@ bool SAL_CALL SvtRulerAccessible::isVisible() throw( RuntimeException ) } //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -137,19 +137,18 @@ sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() throw( RuntimeE } uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleChild( sal_Int32 ) - throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { uno::Reference< XAccessible > xChild ; return xChild; } -uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleParent() throw( RuntimeException, std::exception ) +uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleParent() { return mxParent; } -sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() { ::osl::MutexGuard aGuard( m_aMutex ); // Use a simple but slow solution for now. Optimize later. @@ -175,18 +174,18 @@ sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() throw( Runti return -1; } -sal_Int16 SAL_CALL SvtRulerAccessible::getAccessibleRole() throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvtRulerAccessible::getAccessibleRole() { return AccessibleRole::RULER; } -OUString SAL_CALL SvtRulerAccessible::getAccessibleDescription() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtRulerAccessible::getAccessibleDescription() { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription; } -OUString SAL_CALL SvtRulerAccessible::getAccessibleName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtRulerAccessible::getAccessibleName() { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -195,13 +194,13 @@ OUString SAL_CALL SvtRulerAccessible::getAccessibleName() throw( RuntimeExceptio /** Return empty uno::Reference to indicate that the relation set is not supported. */ -uno::Reference< XAccessibleRelationSet > SAL_CALL SvtRulerAccessible::getAccessibleRelationSet() throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleRelationSet > SAL_CALL SvtRulerAccessible::getAccessibleRelationSet() { return uno::Reference< XAccessibleRelationSet >(); } -uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessibleStateSet() throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessibleStateSet() { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -231,7 +230,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessible return pStateSetHelper; } -lang::Locale SAL_CALL SvtRulerAccessible::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvtRulerAccessible::getLocale() { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -246,7 +245,6 @@ lang::Locale SAL_CALL SvtRulerAccessible::getLocale() throw( IllegalAccessibleCo } void SAL_CALL SvtRulerAccessible::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is()) { @@ -258,7 +256,6 @@ void SAL_CALL SvtRulerAccessible::addAccessibleEventListener( const uno::Referen } void SAL_CALL SvtRulerAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) - throw( RuntimeException, std::exception ) { if (xListener.is() && mnClientId) { @@ -277,7 +274,7 @@ void SAL_CALL SvtRulerAccessible::removeAccessibleEventListener( const uno::Refe } } -void SAL_CALL SvtRulerAccessible::grabFocus() throw( RuntimeException, std::exception ) +void SAL_CALL SvtRulerAccessible::grabFocus() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -288,7 +285,6 @@ void SAL_CALL SvtRulerAccessible::grabFocus() throw( RuntimeException, std::exce } sal_Int32 SvtRulerAccessible::getForeground( ) - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -297,7 +293,6 @@ sal_Int32 SvtRulerAccessible::getForeground( ) return mpRepr->GetControlForeground().GetColor(); } sal_Int32 SvtRulerAccessible::getBackground( ) - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -307,23 +302,23 @@ sal_Int32 SvtRulerAccessible::getBackground( ) } // XServiceInfo -OUString SAL_CALL SvtRulerAccessible::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtRulerAccessible::getImplementationName() { return OUString( "com.sun.star.comp.ui.SvtRulerAccessible" ); } -sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName ) { return cppu::supportsService( this, sServiceName ); } -Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames() { return Sequence< OUString > { OUString("com.sun.star.accessibility.AccessibleContext") }; } //===== XTypeProvider ======================================================= -Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -345,7 +340,7 @@ void SAL_CALL SvtRulerAccessible::disposing() } } -Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen() throw( RuntimeException ) +Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -354,7 +349,7 @@ Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen() throw( RuntimeException ) return Rectangle( mpRepr->GetParent()->OutputToAbsoluteScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() ); } -Rectangle SvtRulerAccessible::GetBoundingBox() throw( RuntimeException ) +Rectangle SvtRulerAccessible::GetBoundingBox() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -364,7 +359,7 @@ Rectangle SvtRulerAccessible::GetBoundingBox() throw( RuntimeException ) return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() ); } -void SvtRulerAccessible::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) +void SvtRulerAccessible::ThrowExceptionIfNotAlive() { if( rBHelper.bDisposed || rBHelper.bInDispose ) throw lang::DisposedException(); diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index ad4eaef311b7..74e4df249562 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -147,7 +147,7 @@ const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible() } -sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() { if( mpControl ) { @@ -161,7 +161,7 @@ sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException) } -Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) { const Reference< XAccessibleContext >& xContext = GetAccessible(); if( mpControl ) @@ -219,7 +219,7 @@ void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const css::uno::Any& } -sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() { sal_Int32 nCount = 0; for( const auto& pEntry : maEntryVector ) @@ -241,7 +241,7 @@ sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) } -Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) { for( const auto& pEntry : maEntryVector ) { @@ -260,7 +260,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) } -Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) { for( const auto& pEntry : maEntryVector ) { @@ -274,7 +274,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl } -void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) { const int nEntryCount = maEntryVector.size(); for( int nEntry = 0; nEntry < nEntryCount; nEntry++ ) @@ -304,7 +304,7 @@ void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (Ind } -bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) { const int nEntryCount = maEntryVector.size(); for( int nEntry = 0; nEntry < nEntryCount; nEntry++ ) @@ -1397,8 +1397,8 @@ public: ToolbarPopupStatusListener( const css::uno::Reference< css::frame::XFrame >& xFrame, ToolbarPopup& rToolbarPopup ); - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; VclPtr<ToolbarPopup> mpPopup; }; @@ -1413,14 +1413,14 @@ ToolbarPopupStatusListener::ToolbarPopupStatusListener( } -void SAL_CALL ToolbarPopupStatusListener::dispose() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ToolbarPopupStatusListener::dispose() { mpPopup.clear(); svt::FrameStatusListener::dispose(); } -void SAL_CALL ToolbarPopupStatusListener::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL ToolbarPopupStatusListener::statusChanged( const css::frame::FeatureStateEvent& Event ) { if( mpPopup ) mpPopup->statusChanged( Event ); @@ -1464,7 +1464,7 @@ void ToolbarPopup::AddStatusListener( const OUString& rCommandURL ) mxStatusListener->addStatusListener( rCommandURL ); } -void ToolbarPopup::statusChanged( const css::frame::FeatureStateEvent& /*Event*/ ) throw ( css::uno::RuntimeException, std::exception ) +void ToolbarPopup::statusChanged( const css::frame::FeatureStateEvent& /*Event*/ ) { } diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 2a3e2759b82c..5d472a1b8746 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -129,14 +129,14 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue, } -Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() { ThrowIfDisposed(); return this; } -sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeExcep } -Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i ) { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -154,7 +154,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 } -Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -169,7 +169,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R } -sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -188,21 +188,21 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx } -sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() { ThrowIfDisposed(); return AccessibleRole::LIST; } -OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException, std::exception) +OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() { ThrowIfDisposed(); return OUString( "ToolbarMenu" ); } -OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, std::exception) +OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -222,14 +222,14 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, s } -Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelationSet() throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelationSet() { ThrowIfDisposed(); return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet() throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet() { ThrowIfDisposed(); ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper(); @@ -248,7 +248,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet( } -Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale SAL_CALL ToolbarMenuAcc::getLocale() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -267,7 +267,7 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta } -void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) { ThrowIfDisposed(); ::osl::MutexGuard aGuard(m_aMutex); @@ -291,7 +291,7 @@ void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAcce } -void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) { ThrowIfDisposed(); ::osl::MutexGuard aGuard(m_aMutex); @@ -305,7 +305,7 @@ void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XA } -sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -316,7 +316,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) thro } -Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint ) { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -347,7 +347,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw } -awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException, std::exception) +awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -364,7 +364,7 @@ awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException, std } -awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException, std::exception) +awt::Point SAL_CALL ToolbarMenuAcc::getLocation() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -373,7 +373,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException, std:: } -awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() throw (RuntimeException, std::exception) +awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -382,7 +382,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() throw (RuntimeExcepti } -awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException, std::exception) +awt::Size SAL_CALL ToolbarMenuAcc::getSize() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -390,28 +390,28 @@ awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException, std::excep return awt::Size( aOutSize.Width(), aOutSize.Height() ); } -void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException, std::exception) +void SAL_CALL ToolbarMenuAcc::grabFocus() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; mpParent->mrMenu.GrabFocus(); } -sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() { ThrowIfDisposed(); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetMenuTextColor().GetColor(); return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() { ThrowIfDisposed(); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetMenuColor().GetColor(); return static_cast<sal_Int32>(nColor); } -void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -419,7 +419,7 @@ void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) thr mpParent->selectAccessibleChild( nChildIndex ); } -sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -427,7 +427,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildInd } -void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException, std::exception) +void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -435,14 +435,14 @@ void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException } -void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeException, std::exception) +void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() { ThrowIfDisposed(); // unsupported due to single selection only } -sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -451,7 +451,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (Runt } -Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -475,7 +475,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sa } -void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -520,7 +520,7 @@ void SAL_CALL ToolbarMenuAcc::disposing() } } -void ToolbarMenuAcc::ThrowIfDisposed() throw (DisposedException) +void ToolbarMenuAcc::ThrowIfDisposed() { if(rBHelper.bDisposed || rBHelper.bInDispose || !mpParent) { @@ -576,25 +576,25 @@ void SAL_CALL ToolbarMenuEntryAcc::disposing() } -Reference< XAccessibleContext > SAL_CALL ToolbarMenuEntryAcc::getAccessibleContext() throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL ToolbarMenuEntryAcc::getAccessibleContext() { return this; } -sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleChildCount() { return 0; } -Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_Int32 ) { throw IndexOutOfBoundsException(); } -Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() { const SolarMutexGuard aSolarGuard; Reference< XAccessible > xRet; @@ -606,7 +606,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() thr } -sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() { const SolarMutexGuard aSolarGuard; // The index defaults to -1 to indicate the child does not belong to its @@ -637,19 +637,19 @@ sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (Runt } -sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() { return AccessibleRole::LIST_ITEM; } -OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException, std::exception) +OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() { return OUString(); } -OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException, std::exception) +OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() { const SolarMutexGuard aSolarGuard; OUString aRet; @@ -669,13 +669,13 @@ OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeExcepti } -Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleRelationSet() throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleRelationSet() { return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet() throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet() { const SolarMutexGuard aSolarGuard; ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper; @@ -701,7 +701,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat } -Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() { Locale aRet( "", "", "" ); @@ -718,7 +718,7 @@ Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleCompone } -void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) { const ::osl::MutexGuard aGuard( maMutex ); @@ -736,7 +736,7 @@ void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< } -void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) { const ::osl::MutexGuard aGuard( maMutex ); @@ -749,7 +749,7 @@ void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Referenc } -sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) { const awt::Rectangle aRect( getBounds() ); const Point aSize( aRect.Width, aRect.Height ); @@ -759,14 +759,14 @@ sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) } -Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( const awt::Point& ) { Reference< XAccessible > xRet; return xRet; } -awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException, std::exception) +awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() { const SolarMutexGuard aSolarGuard; awt::Rectangle aRet; @@ -789,14 +789,14 @@ awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException } -awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException, std::exception) +awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() { const awt::Rectangle aRect( getBounds() ); return awt::Point( aRect.X, aRect.Y ); } -awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeException, std::exception) +awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() { const SolarMutexGuard aSolarGuard; awt::Point aRet; @@ -813,7 +813,7 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeExc } -awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException, std::exception) +awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() { const awt::Rectangle aRect( getBounds() ); awt::Size aRet; @@ -824,17 +824,17 @@ awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException, std:: return aRet; } -void SAL_CALL ToolbarMenuEntryAcc::grabFocus() throw (RuntimeException, std::exception) +void SAL_CALL ToolbarMenuEntryAcc::grabFocus() { // nothing to do } -sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getForeground( ) { return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetMenuTextColor().GetColor()); } -sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getBackground( ) { return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetMenuColor().GetColor()); } diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 5a43ba8b1cf9..776dd5548886 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -87,10 +87,10 @@ public: const css::uno::Reference< css::accessibility::XAccessibleContext >& GetAccessible(); /// @throws css::uno::RuntimeException - sal_Int32 getAccessibleChildCount() throw (css::uno::RuntimeException); + sal_Int32 getAccessibleChildCount(); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ); bool HasCheck() const { @@ -122,43 +122,43 @@ public: public: // 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; // 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; // 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::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; // 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; DECL_LINK( WindowEventListener, VclWindowEvent&, void ); @@ -180,7 +180,7 @@ private: @throws css::lang::DisposedException */ - void ThrowIfDisposed() throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; @@ -197,34 +197,34 @@ public: virtual ~ToolbarMenuEntryAcc() 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; // 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; // 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::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; private: EventListenerVector mxEventListeners; @@ -267,20 +267,20 @@ struct ToolbarMenu_Impl void fireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); /// @throws css::uno::RuntimeException - sal_Int32 getAccessibleChildCount() throw (css::uno::RuntimeException); + sal_Int32 getAccessibleChildCount(); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( sal_Int32 index ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( Control* pControl, sal_Int32 childIndex ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - void selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + void selectAccessibleChild( sal_Int32 nChildIndex ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - bool isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + bool isAccessibleChildSelected( sal_Int32 nChildIndex ); void clearAccessibleSelection(); ToolbarMenuEntry* implGetEntry( int nEntry ) const; diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 74b955e3b9d9..088060b2fc4e 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -153,7 +153,6 @@ void ValueSetAcc::LoseFocus() uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAccessibleContext() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return this; @@ -161,7 +160,6 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAcc sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -174,7 +172,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -191,7 +188,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -206,7 +202,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -232,7 +227,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return accessibility::AccessibleRole::LIST; @@ -240,7 +234,6 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() OUString SAL_CALL ValueSetAcc::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -251,7 +244,6 @@ OUString SAL_CALL ValueSetAcc::getAccessibleDescription() OUString SAL_CALL ValueSetAcc::getAccessibleName() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -277,7 +269,6 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName() uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); SolarMutexGuard g; @@ -307,7 +298,6 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper(); @@ -327,7 +317,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAc lang::Locale SAL_CALL ValueSetAcc::getLocale() - throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -347,7 +336,6 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale() void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -372,7 +360,6 @@ void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< acc void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -389,7 +376,6 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -401,7 +387,6 @@ sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -424,7 +409,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible awt::Rectangle SAL_CALL ValueSetAcc::getBounds() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -442,7 +426,6 @@ awt::Rectangle SAL_CALL ValueSetAcc::getBounds() awt::Point SAL_CALL ValueSetAcc::getLocation() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -456,7 +439,6 @@ awt::Point SAL_CALL ValueSetAcc::getLocation() awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -471,7 +453,6 @@ awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() awt::Size SAL_CALL ValueSetAcc::getSize() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -484,7 +465,6 @@ awt::Size SAL_CALL ValueSetAcc::getSize() } void SAL_CALL ValueSetAcc::grabFocus() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -492,7 +472,6 @@ void SAL_CALL ValueSetAcc::grabFocus() } sal_Int32 SAL_CALL ValueSetAcc::getForeground( ) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor(); @@ -500,7 +479,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getForeground( ) } sal_Int32 SAL_CALL ValueSetAcc::getBackground( ) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -508,7 +486,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getBackground( ) } void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -525,7 +502,6 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -542,7 +518,6 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex void SAL_CALL ValueSetAcc::clearAccessibleSelection() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -551,7 +526,6 @@ void SAL_CALL ValueSetAcc::clearAccessibleSelection() void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); // unsupported due to single selection only @@ -559,7 +533,6 @@ void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -578,7 +551,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -597,7 +569,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -608,7 +579,7 @@ void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) } -sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; @@ -689,7 +660,6 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const void ValueSetAcc::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -774,28 +744,24 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAccessibleContext() - throw (uno::RuntimeException, std::exception) { return this; } sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { return 0; } uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; uno::Reference< accessibility::XAccessible > xRet; @@ -808,7 +774,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; // The index defaults to -1 to indicate the child does not belong to its @@ -858,21 +823,18 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { return accessibility::AccessibleRole::LIST_ITEM; } OUString SAL_CALL ValueItemAcc::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { return OUString(); } OUString SAL_CALL ValueItemAcc::getAccessibleName() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; OUString aRet; @@ -894,14 +856,12 @@ OUString SAL_CALL ValueItemAcc::getAccessibleName() uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { return uno::Reference< accessibility::XAccessibleRelationSet >(); } uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper; @@ -932,7 +892,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA lang::Locale SAL_CALL ValueItemAcc::getLocale() - throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); @@ -951,7 +910,6 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); @@ -975,7 +933,6 @@ void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< ac void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); @@ -991,7 +948,6 @@ void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); const Point aSize( aRect.Width, aRect.Height ); @@ -1001,14 +957,12 @@ sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint ) } uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleAtPoint( const awt::Point& ) - throw (uno::RuntimeException, std::exception) { uno::Reference< accessibility::XAccessible > xRet; return xRet; } awt::Rectangle SAL_CALL ValueItemAcc::getBounds() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; awt::Rectangle aRet; @@ -1031,7 +985,6 @@ awt::Rectangle SAL_CALL ValueItemAcc::getBounds() } awt::Point SAL_CALL ValueItemAcc::getLocation() - throw (uno::RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); awt::Point aRet; @@ -1043,7 +996,6 @@ awt::Point SAL_CALL ValueItemAcc::getLocation() } awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; awt::Point aRet; @@ -1061,7 +1013,6 @@ awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen() } awt::Size SAL_CALL ValueItemAcc::getSize() - throw (uno::RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); awt::Size aRet; @@ -1073,20 +1024,17 @@ awt::Size SAL_CALL ValueItemAcc::getSize() } void SAL_CALL ValueItemAcc::grabFocus() - throw (uno::RuntimeException, std::exception) { // nothing to do } sal_Int32 SAL_CALL ValueItemAcc::getForeground( ) - throw (uno::RuntimeException, std::exception) { sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor(); return static_cast<sal_Int32>(nColor); } sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) - throw (uno::RuntimeException, std::exception) { sal_uInt32 nColor; if (mpParent && mpParent->meType == VALUESETITEM_COLOR) @@ -1096,7 +1044,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } -sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 3a05b9a5656c..b791b4243672 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -104,46 +104,46 @@ public: void LoseFocus(); // 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; // 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; // 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::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; // 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; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; private: ::std::vector< css::uno::Reference< @@ -180,8 +180,7 @@ private: foul deed. @throws css::lang::DisposedException */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); /** Check whether the value set has a 'none' field, i.e. a field (button) that deselects any items (selects none of them). @@ -222,37 +221,37 @@ public: public: // 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; // 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; // 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::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; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; }; #endif // INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index 4185be0ab2f8..1967f4ba4092 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -68,13 +68,13 @@ VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar() // XServiceInfo -::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName() throw (RuntimeException, std::exception) +::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleHeaderBar" ); } -Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() { Sequence<OUString> aNames { "com.sun.star.awt.AccessibleHeaderBar" }; return aNames; @@ -83,7 +83,6 @@ Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() // =======XAccessibleContext======= sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount( ) - throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -94,7 +93,7 @@ sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount( ) return nCount; } css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i ) { SolarMutexGuard g; @@ -114,7 +113,7 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL return xChild; } -sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole( ) { return css::accessibility::AccessibleRole::LIST; } diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 3d7ed2a610dc..3885b0111e55 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -77,7 +77,7 @@ void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSe } // OCommonAccessibleComponent -awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeException) +awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() { awt::Rectangle aBounds; OExternalLockGuard aGuard( this ); @@ -102,24 +102,24 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, OAccessibleExtend // XServiceInfo -OUString VCLXAccessibleHeaderBarItem::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleHeaderBarItem::getImplementationName() { return OUString("com.sun.star.comp.svtools.AccessibleHeaderBarItem"); } -sal_Bool VCLXAccessibleHeaderBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleHeaderBarItem::supportsService( const OUString& rServiceName ) { return cppu::supportsService( this, rServiceName ); } -Sequence< OUString > VCLXAccessibleHeaderBarItem::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleHeaderBarItem::getSupportedServiceNames() { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleHeaderBarItem" }; return aNames; } // XAccessible -Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContext() throw (RuntimeException, std::exception) +Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContext() { OExternalLockGuard aGuard( this ); @@ -130,7 +130,7 @@ Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContex // XAccessibleContext -sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -138,7 +138,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeE } -Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -149,7 +149,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_In } -Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() { OExternalLockGuard aGuard( this ); @@ -163,14 +163,14 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() thro } -sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() { OExternalLockGuard aGuard( this ); return m_nIndexInParent - 1; } -sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() { OExternalLockGuard aGuard( this ); @@ -178,7 +178,7 @@ sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeExcepti } -OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeException, std::exception) +OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() { OExternalLockGuard aGuard( this ); OUString sDescription; @@ -186,7 +186,7 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeE } -OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleHeaderBarItem::getAccessibleName() { OExternalLockGuard aGuard( this ); @@ -197,7 +197,7 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeExceptio } -Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -207,7 +207,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRe } -Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -227,7 +227,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleState } -css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() { OExternalLockGuard aGuard( this ); @@ -238,7 +238,7 @@ css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessi // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( const awt::Point& ) { OExternalLockGuard aGuard( this ); @@ -246,7 +246,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( cons } -sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() { OExternalLockGuard aGuard( this ); @@ -255,7 +255,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException, } -sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() { OExternalLockGuard aGuard( this ); @@ -267,7 +267,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException, // XAccessibleExtendedComponent -Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeException, std::exception) +Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() { OExternalLockGuard aGuard( this ); @@ -276,7 +276,7 @@ Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeExc } -OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeException, std::exception) +OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() { OExternalLockGuard aGuard( this ); @@ -285,7 +285,7 @@ OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeExcept } -OUString VCLXAccessibleHeaderBarItem::getToolTipText() throw (RuntimeException, std::exception) +OUString VCLXAccessibleHeaderBarItem::getToolTipText() { OExternalLockGuard aGuard( this ); diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 7675a594dc31..a3d91ce6e47d 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -83,34 +83,23 @@ public: virtual void SAL_CALL release() throw() override; // XInitialization - virtual void SAL_CALL initialize( const uno::Sequence< uno::Any > & aArguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const uno::Sequence< uno::Any > & aArguments ) override; // 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; // XPropertyAccess - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getPropertyValues() - throw ( uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps ) - throw ( beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getPropertyValues() override; + virtual void SAL_CALL setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps ) override; // XExecuteDialog - virtual sal_Int16 SAL_CALL execute() - throw ( uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw ( uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL execute() override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) - throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) override; }; @@ -134,23 +123,19 @@ void SAL_CALL SvFilterOptionsDialog::release() throw() // XInitialization void SAL_CALL SvFilterOptionsDialog::initialize( const uno::Sequence< uno::Any > & ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) { } // XServiceInfo OUString SAL_CALL SvFilterOptionsDialog::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.svtools.SvFilterOptionsDialog" ); } sal_Bool SAL_CALL SvFilterOptionsDialog::supportsService( const OUString& rServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aRet { "com.sun.star.ui.dialogs.FilterOptionsDialog" }; return aRet; @@ -158,7 +143,6 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog::getSupportedServiceNam // XPropertyAccess uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues() - throw ( uno::RuntimeException, std::exception ) { sal_Int32 i, nCount; for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ ) @@ -176,9 +160,6 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues() } void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps ) - throw ( beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { maMediaDescriptor = aProps; @@ -198,13 +179,11 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope // XExecutableDialog void SvFilterOptionsDialog::setTitle( const OUString& aTitle ) - throw ( uno::RuntimeException, std::exception ) { maDialogTitle = aTitle; } sal_Int16 SvFilterOptionsDialog::execute() - throw ( uno::RuntimeException, std::exception ) { sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL; @@ -251,7 +230,6 @@ sal_Int16 SvFilterOptionsDialog::execute() // XEmporter void SvFilterOptionsDialog::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) - throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { mxSourceDocument = xDoc; diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index ca4b4346c5db..22e8285cae37 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -154,7 +154,6 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aAny; @@ -176,7 +175,6 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } @@ -197,27 +195,23 @@ void SAL_CALL GraphicDescriptor::release() OUString SAL_CALL GraphicDescriptor::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.graphic.GraphicDescriptor" ); } sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { return { "com.sun.star.graphic.GraphicDescriptor" }; } uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< uno::Type > aTypes( 6 ); uno::Type* pTypes = aTypes.getArray(); @@ -233,7 +227,6 @@ uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -265,17 +258,12 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException ) { // we only have readonly attributes } void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index 029a1d8520f5..4878ceef5b2d 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -79,23 +79,23 @@ protected: static ::comphelper::PropertySetInfo* createPropertySetInfo(); // 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; // 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 ) 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; private: diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index 91d784775d24..b156d6123384 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -50,7 +50,6 @@ void Graphic::init( const ::Graphic& rGraphic ) uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aAny; if( rType == cppu::UnoType<graphic::XGraphic>::get()) @@ -67,7 +66,6 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { css::uno::Any aReturn = ::unographic::GraphicDescriptor::queryInterface( rType ); if ( !aReturn.hasValue() ) @@ -89,19 +87,16 @@ void SAL_CALL Graphic::release() throw() } OUString SAL_CALL Graphic::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.graphic.Graphic" ); } sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, rServiceName ); } uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() ); uno::Sequence< OUString > aNew { "com.sun.star.graphic.Graphic" }; @@ -116,7 +111,6 @@ uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames() } uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aRet( ::unographic::GraphicDescriptor::getTypes() ); sal_Int32 nOldCount = aRet.getLength(); @@ -130,14 +124,12 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } sal_Int8 SAL_CALL Graphic::getType() - throw (uno::RuntimeException, std::exception) { sal_Int8 cRet = graphic::GraphicType::EMPTY; @@ -158,7 +150,7 @@ sal_Int8 SAL_CALL Graphic::getType() // XBitmap -awt::Size SAL_CALL Graphic::getSize() throw (uno::RuntimeException, std::exception) +awt::Size SAL_CALL Graphic::getSize() { SolarMutexGuard aGuard; @@ -171,7 +163,7 @@ awt::Size SAL_CALL Graphic::getSize() throw (uno::RuntimeException, std::excepti } -uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB() throw (uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB() { SolarMutexGuard aGuard; @@ -189,7 +181,7 @@ uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB() throw (uno::RuntimeException, } -uno::Sequence<sal_Int8> SAL_CALL Graphic::getMaskDIB() throw (uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL Graphic::getMaskDIB() { SolarMutexGuard aGuard; @@ -216,7 +208,6 @@ const ::Graphic* Graphic::getImplementation( const uno::Reference< uno::XInterfa sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId ) - throw( uno::RuntimeException, std::exception ) { return( ( rId.getLength() == 16 && 0 == memcmp( ::Graphic::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast<sal_Int64>(&maGraphic) : 0 ); diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx index e097c5a8fe24..285cb5f10051 100644 --- a/svtools/source/graphic/graphic.hxx +++ b/svtools/source/graphic/graphic.hxx @@ -51,30 +51,30 @@ 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; // XGraphic - virtual ::sal_Int8 SAL_CALL getType( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL getType( ) override; // XBitmap - virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getDIB( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getMaskDIB( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize( ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getDIB( ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getMaskDIB( ) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) override; private: diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index fa2c98043c70..5a2132bf6bab 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -40,34 +40,31 @@ class GObjectImpl : public GObjectAccess_BASE std::unique_ptr< GraphicObject > mpGObject; public: /// @throws uno::RuntimeException - explicit GObjectImpl(uno::Sequence< uno::Any > const & args) throw (uno::RuntimeException, std::exception); + explicit GObjectImpl(uno::Sequence< uno::Any > const & args); // XGraphicObject - virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) throw (uno::RuntimeException, std::exception) override; - OUString SAL_CALL getUniqueID() throw (uno::RuntimeException, std::exception) override; + virtual uno::Reference< graphic::XGraphic > SAL_CALL getGraphic() override; + virtual void SAL_CALL setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) override; + OUString SAL_CALL getUniqueID() override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.graphic.GraphicObject"); } - 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 { uno::Sequence<OUString> aRet { "com.sun.star.graphic.GraphicObject" }; return aRet; } }; -GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) throw (uno::RuntimeException, std::exception) +GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) { if ( args.getLength() == 1 ) { @@ -81,7 +78,7 @@ GObjectImpl::GObjectImpl(const uno::Sequence< uno::Any >& args) throw (uno::Runt mpGObject.reset( new GraphicObject() ); } -uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() throw (uno::RuntimeException, std::exception) +uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !mpGObject.get() ) @@ -89,7 +86,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() throw (un return mpGObject->GetGraphic().GetXGraphic(); } -void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) throw (uno::RuntimeException, std::exception) +void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic >& _graphic ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !mpGObject.get() ) @@ -98,7 +95,7 @@ void SAL_CALL GObjectImpl::setGraphic( const uno::Reference< graphic::XGraphic > mpGObject->SetGraphic( aGraphic ); } -OUString SAL_CALL GObjectImpl::getUniqueID() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL GObjectImpl::getUniqueID() { ::osl::MutexGuard aGuard( m_aMutex ); OUString sId; diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 87fffe6611c8..7b4293631970 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -66,18 +66,18 @@ 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; // XGraphicProvider - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL queryGraphic( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL storeGraphic( const css::uno::Reference< css::graphic::XGraphic >& Graphic, const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) throw (css::io::IOException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL queryGraphic( const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) override; + virtual void SAL_CALL storeGraphic( const css::uno::Reference< css::graphic::XGraphic >& Graphic, const css::uno::Sequence< css::beans::PropertyValue >& MediaProperties ) override; private: @@ -94,26 +94,22 @@ GraphicProvider::GraphicProvider() } OUString SAL_CALL GraphicProvider::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.graphic.GraphicProvider" ); } sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSeq { "com.sun.star.graphic.GraphicProvider" }; return aSeq; } uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes() - throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 3 ); uno::Type* pTypes = aTypes.getArray(); @@ -126,7 +122,6 @@ uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -300,7 +295,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDescriptor( const uno::Sequence< beans::PropertyValue >& rMediaProperties ) - throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; @@ -372,7 +366,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties ) - throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Reference< ::graphic::XGraphic > xRet; OUString aPath; @@ -714,7 +707,6 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties ) - throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 09fc338e687e..ee9444c92bc7 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -60,26 +60,26 @@ public: GraphicRendererVCL(); // 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; // 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 ) override; - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException ) 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; // XGraphicRenderer - virtual void SAL_CALL render( const css::uno::Reference< css::graphic::XGraphic >& Graphic ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL render( const css::uno::Reference< css::graphic::XGraphic >& Graphic ) override; private: @@ -97,7 +97,6 @@ GraphicRendererVCL::GraphicRendererVCL() : } uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aAny; @@ -121,7 +120,6 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } @@ -142,20 +140,17 @@ void SAL_CALL GraphicRendererVCL::release() OUString SAL_CALL GraphicRendererVCL::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" ); } sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSeq { "com.sun.star.graphic.GraphicRendererVCL" }; return aSeq; @@ -163,7 +158,6 @@ uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames( uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< uno::Type > aTypes( 7 ); uno::Type* pTypes = aTypes.getArray(); @@ -180,7 +174,6 @@ uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -207,10 +200,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException ) { SolarMutexGuard aGuard; @@ -261,7 +250,6 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry* void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException ) { SolarMutexGuard aGuard; @@ -299,7 +287,6 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry* void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic ) - throw (uno::RuntimeException, std::exception) { if( mpOutDev && mxDevice.is() && rxGraphic.is() ) { diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 4375caeb4efa..4caf4692d712 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -72,7 +72,6 @@ void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int // XGraphicTransformer uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange( const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) - throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const uno::Reference< uno::XInterface > xIFace( rxGraphic, uno::UNO_QUERY ); ::Graphic aGraphic( *::unographic::Graphic::getImplementation( xIFace ) ); @@ -136,7 +135,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange( uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyDuotone( const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorOne, sal_Int32 nColorTwo ) - throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const uno::Reference< uno::XInterface > xIFace( rxGraphic, uno::UNO_QUERY ); ::Graphic aGraphic( *::unographic::Graphic::getImplementation( xIFace ) ); @@ -156,7 +154,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyDuotone( uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyBrightnessContrast( const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso ) - throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const uno::Reference< uno::XInterface > xIFace( rxGraphic, uno::UNO_QUERY ); ::Graphic aGraphic( *::unographic::Graphic::getImplementation( xIFace ) ); diff --git a/svtools/source/graphic/transformer.hxx b/svtools/source/graphic/transformer.hxx index 2d7376afa024..bb93a5aeef4e 100644 --- a/svtools/source/graphic/transformer.hxx +++ b/svtools/source/graphic/transformer.hxx @@ -40,18 +40,15 @@ class GraphicTransformer : public GraphicTransformer_UnoImplHelper1 // XGraphicTransformer virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL colorChange( const css::uno::Reference< css::graphic::XGraphic >& rGraphic, - sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) override; virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL applyDuotone( const css::uno::Reference< css::graphic::XGraphic >& rGraphic, - sal_Int32 nColorOne, sal_Int32 nColorTwo ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + sal_Int32 nColorOne, sal_Int32 nColorTwo ) override; virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL applyBrightnessContrast( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic, - sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + sal_Int32 nBrightness, sal_Int32 nContrast, sal_Bool mso ) override; }; diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index aafcd7fa437b..eb51dfb8b8ac 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -58,14 +58,14 @@ public: virtual ~ODocumentCloser() override; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // 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; }; class MainThreadFrameCloserRequest @@ -177,7 +177,6 @@ ODocumentCloser::~ODocumentCloser() // XComponent void SAL_CALL ODocumentCloser::dispose() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +200,6 @@ void SAL_CALL ODocumentCloser::dispose() void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) @@ -215,7 +213,6 @@ void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEv void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pListenersContainer ) @@ -224,19 +221,16 @@ void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang:: // XServiceInfo OUString SAL_CALL ODocumentCloser::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.comp.embed.DocumentCloser" ); } sal_Bool SAL_CALL ODocumentCloser::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL ODocumentCloser::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.embed.DocumentCloser" ); return uno::Sequence< OUString >( &aServiceName, 1 ); diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx index e7216d25f256..8e0faf1f4994 100644 --- a/svtools/source/hatchwindow/hatchwindow.cxx +++ b/svtools/source/hatchwindow/hatchwindow.cxx @@ -109,7 +109,6 @@ void VCLXHatchWindow::InplaceDeactivate() uno::Any SAL_CALL VCLXHatchWindow::queryInterface( const uno::Type & rType ) - throw( uno::RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -138,7 +137,6 @@ void SAL_CALL VCLXHatchWindow::release() } uno::Sequence< uno::Type > SAL_CALL VCLXHatchWindow::getTypes() - throw( uno::RuntimeException, std::exception ) { static ::cppu::OTypeCollection* pTypeCollection = nullptr ; @@ -160,17 +158,16 @@ uno::Sequence< uno::Type > SAL_CALL VCLXHatchWindow::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL VCLXHatchWindow::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } -css::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() throw (css::uno::RuntimeException, std::exception) +css::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() { return aHatchBorderSize; } -void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchbordersize ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchbordersize ) { if ( pHatchWindow ) { @@ -180,26 +177,22 @@ void SAL_CALL VCLXHatchWindow::setHatchBorderSize( const css::awt::Size& _hatchb } void SAL_CALL VCLXHatchWindow::setController( const uno::Reference< embed::XHatchWindowController >& xController ) - throw (uno::RuntimeException, std::exception) { m_xController = xController; } void SAL_CALL VCLXHatchWindow::dispose() - throw (uno::RuntimeException, std::exception) { pHatchWindow.clear(); VCLXWindow::dispose(); } void SAL_CALL VCLXHatchWindow::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { VCLXWindow::addEventListener( xListener ); } void SAL_CALL VCLXHatchWindow::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { VCLXWindow::removeEventListener( xListener ); } diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index f25c806cae9e..8aee772ca732 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -39,19 +39,18 @@ public: OHatchWindowFactory() {} // XHatchWindowFactory - virtual uno::Reference< embed::XHatchWindow > SAL_CALL createHatchWindowInstance( const uno::Reference< awt::XWindowPeer >& xParent, const awt::Rectangle& aBounds, const awt::Size& aSize ) throw (uno::RuntimeException, std::exception) override; + virtual uno::Reference< embed::XHatchWindow > SAL_CALL createHatchWindowInstance( const uno::Reference< awt::XWindowPeer >& xParent, const awt::Rectangle& aBounds, const awt::Size& aSize ) override; // 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; }; uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchWindowInstance( const uno::Reference< awt::XWindowPeer >& xParent, const awt::Rectangle& aBounds, const awt::Size& aHandlerSize ) - throw (uno::RuntimeException, std::exception) { if ( !xParent.is() ) throw lang::IllegalArgumentException(); // TODO @@ -63,19 +62,16 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW } OUString SAL_CALL OHatchWindowFactory::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.embed.HatchWindowFactory" ); } sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OHatchWindowFactory::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.HatchWindowFactory"; diff --git a/svtools/source/inc/hatchwindow.hxx b/svtools/source/inc/hatchwindow.hxx index e33660fe2edf..e60fac6ccf0b 100644 --- a/svtools/source/inc/hatchwindow.hxx +++ b/svtools/source/inc/hatchwindow.hxx @@ -48,23 +48,23 @@ public: void Deactivated(); // XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; void SAL_CALL acquire() throw() override; void SAL_CALL release() throw() override; // XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XHatchWindow - virtual void SAL_CALL setController( const css::uno::Reference< css::embed::XHatchWindowController >& xController ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getHatchBorderSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHatchBorderSize( const css::awt::Size& _hatchbordersize ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setController( const css::uno::Reference< css::embed::XHatchWindowController >& xController ) override; + virtual css::awt::Size SAL_CALL getHatchBorderSize() override; + virtual void SAL_CALL setHatchBorderSize( const css::awt::Size& _hatchbordersize ) override; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; }; #endif // INCLUDED_SVTOOLS_SOURCE_INC_HATCHWINDOW_HXX diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index fbf987aa11cd..ed22a03a884d 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -64,46 +64,46 @@ public: virtual ~VCLXMultiLineEdit() override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); } void SAL_CALL release() throw() override { VCLXWindow::release(); } // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::awt::XTextComponent - void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getSelectedText( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override; - css::awt::Selection SAL_CALL getSelection( ) throw(css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEditable( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getMaxTextLen( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override; + void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override; + void SAL_CALL setText( const OUString& aText ) override; + void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) override; + OUString SAL_CALL getText( ) override; + OUString SAL_CALL getSelectedText( ) override; + void SAL_CALL setSelection( const css::awt::Selection& aSelection ) override; + css::awt::Selection SAL_CALL getSelection( ) override; + sal_Bool SAL_CALL isEditable( ) override; + void SAL_CALL setEditable( sal_Bool bEditable ) override; + void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override; + sal_Int16 SAL_CALL getMaxTextLen( ) override; //XTextArea - OUString SAL_CALL getTextLines( ) throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getTextLines( ) override; // css::awt::XLayoutConstrains - css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; - css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; - css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getMinimumSize( ) override; + css::awt::Size SAL_CALL getPreferredSize( ) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // css::awt::XTextLayoutConstrains - css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override; // css::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override; // css::awt::XWindow - void SAL_CALL setFocus( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setFocus( ) override; static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -126,38 +126,38 @@ public: virtual void SetWindow( const VclPtr< vcl::Window > &pWindow ) override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); } void SAL_CALL release() throw() override { VCLXWindow::release(); } // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::awt::XTextComponent - void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) throw(css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getText( ) throw(css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getSelectedText( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) override; - css::awt::Selection SAL_CALL getSelection( ) throw(css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isEditable( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getMaxTextLen( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override; + void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override; + void SAL_CALL setText( const OUString& aText ) override; + void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) override; + OUString SAL_CALL getText( ) override; + OUString SAL_CALL getSelectedText( ) override; + void SAL_CALL setSelection( const css::awt::Selection& aSelection ) override; + css::awt::Selection SAL_CALL getSelection( ) override; + sal_Bool SAL_CALL isEditable( ) override; + void SAL_CALL setEditable( sal_Bool bEditable ) override; + void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override; + sal_Int16 SAL_CALL getMaxTextLen( ) override; // css::awt::XLayoutConstrains - css::awt::Size SAL_CALL getMinimumSize( ) throw(css::uno::RuntimeException, std::exception) override; - css::awt::Size SAL_CALL getPreferredSize( ) throw(css::uno::RuntimeException, std::exception) override; - css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getMinimumSize( ) override; + css::awt::Size SAL_CALL getPreferredSize( ) override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // css::awt::XTextLayoutConstrains - css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override; + void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override; - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value) override; static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -180,8 +180,8 @@ public: virtual ~SVTXFormattedField() override; // css::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override; protected: void setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier); @@ -250,24 +250,24 @@ protected: public: SVTXRoadmap(); - void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { VCLXWindow::disposing( Source ); } + void SAL_CALL disposing( const css::lang::EventObject& Source ) override { VCLXWindow::disposing( Source ); } // css::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; - css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override; // XContainerListener - void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent )throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL elementInserted( const css::container::ContainerEvent& rEvent ) override; + void SAL_CALL elementRemoved( const css::container::ContainerEvent& rEvent ) override; + void SAL_CALL elementReplaced( const css::container::ContainerEvent& rEvent ) override; // XItemEventBroadcaster - 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 addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override; + virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) 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; protected: @@ -288,31 +288,31 @@ public: virtual ~SVTXNumericField() override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() throw() override { SVTXFormattedField::acquire(); } void SAL_CALL release() throw() override { SVTXFormattedField::release(); } // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::awt::XNumericField - void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getSpinSize( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDecimalDigits( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setValue( double Value ) override; + double SAL_CALL getValue( ) override; + void SAL_CALL setMin( double Value ) override; + double SAL_CALL getMin( ) override; + void SAL_CALL setMax( double Value ) override; + double SAL_CALL getMax( ) override; + void SAL_CALL setFirst( double Value ) override; + double SAL_CALL getFirst( ) override; + void SAL_CALL setLast( double Value ) override; + double SAL_CALL getLast( ) override; + void SAL_CALL setSpinSize( double Value ) override; + double SAL_CALL getSpinSize( ) override; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override; + sal_Int16 SAL_CALL getDecimalDigits( ) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) override; + sal_Bool SAL_CALL isStrictFormat( ) override; virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override; }; @@ -327,35 +327,35 @@ public: virtual ~SVTXCurrencyField() override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() throw() override { SVTXFormattedField::acquire(); } void SAL_CALL release() throw() override { SVTXFormattedField::release(); } // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override; // css::awt::XCurrencyField - void SAL_CALL setValue( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getValue( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setMin( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getMin( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setMax( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getMax( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getFirst( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setLast( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getLast( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) override; - double SAL_CALL getSpinSize( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) throw(css::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getDecimalDigits( ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isStrictFormat( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setValue( double Value ) override; + double SAL_CALL getValue( ) override; + void SAL_CALL setMin( double Value ) override; + double SAL_CALL getMin( ) override; + void SAL_CALL setMax( double Value ) override; + double SAL_CALL getMax( ) override; + void SAL_CALL setFirst( double Value ) override; + double SAL_CALL getFirst( ) override; + void SAL_CALL setLast( double Value ) override; + double SAL_CALL getLast( ) override; + void SAL_CALL setSpinSize( double Value ) override; + double SAL_CALL getSpinSize( ) override; + void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override; + sal_Int16 SAL_CALL getDecimalDigits( ) override; + void SAL_CALL setStrictFormat( sal_Bool bStrict ) override; + sal_Bool SAL_CALL isStrictFormat( ) override; static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -380,24 +380,24 @@ public: virtual ~VCLXProgressBar() override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() throw() override { VCLXWindow::acquire(); } void SAL_CALL release() throw() override { VCLXWindow::release(); } // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // css::awt::XProgressBar - void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception ) override; - sal_Int32 SAL_CALL getValue() throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setForegroundColor( sal_Int32 nColor ) override; + void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override; + void SAL_CALL setValue( sal_Int32 nValue ) override; + void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) override; + sal_Int32 SAL_CALL getValue() override; // css::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override; static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } @@ -413,7 +413,7 @@ public: virtual ~SVTXDateField() override; // css::awt::VclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index 82b76e34acac..abc1f94d8ec9 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -39,7 +39,6 @@ JavaContext::~JavaContext() } Any SAL_CALL JavaContext::queryInterface(const Type& aType ) - throw (RuntimeException, std::exception) { if (aType == cppu::UnoType<XInterface>::get()) return Any(Reference<XInterface>(static_cast<XInterface*>(this))); @@ -59,7 +58,7 @@ void SAL_CALL JavaContext::release( ) throw () delete this; } -Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeException, std::exception) +Any SAL_CALL JavaContext::getValueByName( const OUString& Name) { Any retVal; diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 860f3e07971b..41e61413c0af 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -62,7 +62,6 @@ JavaInteractionHandler::~JavaInteractionHandler() } Any SAL_CALL JavaInteractionHandler::queryInterface(const Type& aType ) - throw (RuntimeException, std::exception) { if (aType == cppu::UnoType<XInterface>::get()) return Any( static_cast<XInterface*>(this), aType); @@ -83,7 +82,7 @@ void SAL_CALL JavaInteractionHandler::release( ) throw () } -void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionRequest >& Request ) throw (RuntimeException, std::exception) +void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionRequest >& Request ) { Any anyExc = Request->getRequest(); Sequence< Reference< XInteractionContinuation > > aSeqCont = Request->getContinuations(); diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index bec1e4f5a292..e06aa584856c 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -64,7 +64,7 @@ class AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEventListener> void execAsync(); private: - virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject&) override { m_xFrame->removeEventListener(this); m_xFrame.clear(); diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 9720e16bf5f6..190048eba6e8 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -40,13 +40,11 @@ TransferableClipboardListener::~TransferableClipboardListener() } void SAL_CALL TransferableClipboardListener::disposing( const lang::EventObject& ) - throw(uno::RuntimeException, std::exception) { } void SAL_CALL TransferableClipboardListener::changedContents( const datatransfer::clipboard::ClipboardEvent& rEventObject ) - throw(uno::RuntimeException, std::exception) { if ( aLink.IsSet() ) { diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index 7f4cbdd9f5c5..c9e4c095e4e2 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -37,7 +37,7 @@ namespace svt } // XDialogClosedListener methods - void SAL_CALL DialogClosedListener::dialogClosed( const DialogClosedEvent& aEvent ) throw (RuntimeException, std::exception) + void SAL_CALL DialogClosedListener::dialogClosed( const DialogClosedEvent& aEvent ) { if ( m_aDialogClosedLink.IsSet() ) { @@ -47,7 +47,7 @@ namespace svt } // XEventListener methods - void SAL_CALL DialogClosedListener::disposing( const EventObject& ) throw(RuntimeException, std::exception) + void SAL_CALL DialogClosedListener::disposing( const EventObject& ) { m_aDialogClosedLink = Link<css::ui::dialogs::DialogClosedEvent*,void>(); } diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index ac3f498eeb9c..fc8c2ff5cbb6 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -72,16 +72,13 @@ public: static EmbedEventListener_Impl* Create( EmbeddedObjectRef* ); - virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) - throw (embed::WrongStateException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) - throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) - throw (util::CloseVetoException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override; + virtual void SAL_CALL stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) override; + virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) override; + virtual void SAL_CALL notifyClosing( const lang::EventObject& Source ) override; + virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) override; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; }; EmbedEventListener_Impl* EmbedEventListener_Impl::Create( EmbeddedObjectRef* p ) @@ -118,15 +115,12 @@ EmbedEventListener_Impl* EmbedEventListener_Impl::Create( EmbeddedObjectRef* p ) void SAL_CALL EmbedEventListener_Impl::changingState( const lang::EventObject&, ::sal_Int32, ::sal_Int32 ) - throw ( embed::WrongStateException, - uno::RuntimeException, std::exception ) { } void SAL_CALL EmbedEventListener_Impl::stateChanged( const lang::EventObject&, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; nState = nNewState; @@ -162,7 +156,7 @@ void SAL_CALL EmbedEventListener_Impl::stateChanged( const lang::EventObject&, } } -void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& ) { SolarMutexGuard aGuard; if ( pObject && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON ) @@ -185,7 +179,7 @@ void SAL_CALL EmbedEventListener_Impl::modified( const lang::EventObject& ) thro } } -void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& aEvent ) { SolarMutexGuard aGuard; @@ -196,7 +190,6 @@ void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject& } void SAL_CALL EmbedEventListener_Impl::queryClosing( const lang::EventObject& Source, sal_Bool ) - throw ( util::CloseVetoException, uno::RuntimeException, std::exception) { // An embedded object can be shared between several objects (f.e. for undo purposes) // the object will not be closed before the last "customer" is destroyed @@ -205,7 +198,7 @@ void SAL_CALL EmbedEventListener_Impl::queryClosing( const lang::EventObject& So throw util::CloseVetoException(); } -void SAL_CALL EmbedEventListener_Impl::notifyClosing( const lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL EmbedEventListener_Impl::notifyClosing( const lang::EventObject& Source ) { if ( pObject && Source.Source == pObject->GetObject() ) { @@ -214,7 +207,7 @@ void SAL_CALL EmbedEventListener_Impl::notifyClosing( const lang::EventObject& S } } -void SAL_CALL EmbedEventListener_Impl::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) +void SAL_CALL EmbedEventListener_Impl::disposing( const lang::EventObject& aEvent ) { if ( pObject && aEvent.Source == pObject->GetObject() ) { diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 60a6c0e1be7e..f8dd078f2bf1 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -62,13 +62,13 @@ namespace svt protected: // XStream - virtual Reference< XInputStream > SAL_CALL getInputStream( ) throw (RuntimeException, std::exception) override; - virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) throw (RuntimeException, std::exception) override; + virtual Reference< XInputStream > SAL_CALL getInputStream( ) override; + virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) override; // XSeekable - virtual void SAL_CALL seek( ::sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( ::sal_Int64 location ) override; + virtual ::sal_Int64 SAL_CALL getPosition( ) override; + virtual ::sal_Int64 SAL_CALL getLength( ) override; }; @@ -83,19 +83,19 @@ namespace svt } - Reference< XInputStream > SAL_CALL StreamSupplier::getInputStream( ) throw (RuntimeException, std::exception) + Reference< XInputStream > SAL_CALL StreamSupplier::getInputStream( ) { return m_xInput; } - Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream( ) throw (RuntimeException, std::exception) + Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream( ) { return m_xOutput; } - void SAL_CALL StreamSupplier::seek( ::sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) + void SAL_CALL StreamSupplier::seek( ::sal_Int64 location ) { if ( !m_xSeekable.is() ) throw NotConnectedException(); @@ -104,7 +104,7 @@ namespace svt } - ::sal_Int64 SAL_CALL StreamSupplier::getPosition( ) throw (IOException, RuntimeException, std::exception) + ::sal_Int64 SAL_CALL StreamSupplier::getPosition( ) { if ( !m_xSeekable.is() ) throw NotConnectedException(); @@ -113,7 +113,7 @@ namespace svt } - ::sal_Int64 SAL_CALL StreamSupplier::getLength( ) throw (IOException, RuntimeException, std::exception) + ::sal_Int64 SAL_CALL StreamSupplier::getLength( ) { if ( !m_xSeekable.is() ) throw NotConnectedException(); diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 8846171c1475..df4d03b67474 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -51,14 +51,14 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener() } -void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) +void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& ) { m_xTargetFrame.clear(); m_xContext.clear(); } -void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw( css::uno::RuntimeException, std::exception ) +void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) { const sal_Int8 nAction = dtde.DropAction; @@ -92,7 +92,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr } -void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw( css::uno::RuntimeException, std::exception ) +void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) { try { @@ -106,7 +106,7 @@ void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dn } -void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw( css::uno::RuntimeException, std::exception ) +void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) { try { @@ -118,7 +118,7 @@ void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd } -void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw( css::uno::RuntimeException, std::exception ) +void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) { try { @@ -136,7 +136,7 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd } -void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw( css::uno::RuntimeException, std::exception ) +void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) { } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 5e417a718f68..1fa767175fd5 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -237,17 +237,17 @@ TransferableHelper::TerminateListener::~TerminateListener() } -void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& ) { } -void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& ) throw( TerminationVetoException, RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& ) { } -void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& ) { mrParent.ImplFlush(); } @@ -259,13 +259,11 @@ TransferableHelper::TransferableHelper() } Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) - throw (UnsupportedFlavorException, IOException, RuntimeException, std::exception) { return getTransferData2(rFlavor, OUString()); } Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, const OUString& rDestDoc ) - throw (UnsupportedFlavorException, IOException, RuntimeException, std::exception) { if( !maAny.hasValue() || mxFormats->empty() || ( maLastFormat != rFlavor.MimeType ) ) { @@ -378,7 +376,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co } -Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() throw( RuntimeException, std::exception ) +Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() { const SolarMutexGuard aGuard; @@ -395,7 +393,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr } -sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) { const SolarMutexGuard aGuard; bool bRet = false; @@ -422,7 +420,7 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r } -void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) { const SolarMutexGuard aGuard; @@ -444,12 +442,12 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, } -void SAL_CALL TransferableHelper::disposing( const EventObject& ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::disposing( const EventObject& ) { } -void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) { const SolarMutexGuard aGuard; @@ -464,27 +462,27 @@ void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE } -void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& ) { } -void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& ) { } -void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& ) { } -void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) +void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& ) { } -sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException, std::exception ) +sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; @@ -1035,10 +1033,10 @@ private: protected: // XClipboardListener - virtual void SAL_CALL changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL changedContents( const clipboard::ClipboardEvent& event ) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; public: TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex ); @@ -1068,7 +1066,7 @@ TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X } -void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException, std::exception) +void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) { SolarMutexGuard aSolarGuard; // the SolarMutex here is necessary, since @@ -1081,7 +1079,7 @@ void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::C } -void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) throw (RuntimeException, std::exception) +void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) { // clipboard is being disposed. Hmm. Okay, become disfunctional myself. dispose(); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 81f68dc7eb0f..4d3e61cd33af 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -53,12 +53,12 @@ DragSourceHelper::DragGestureListener::~DragGestureListener() } -void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) +void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& ) { } -void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) throw( RuntimeException, std::exception ) +void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) { const SolarMutexGuard aGuard; @@ -113,12 +113,12 @@ DropTargetHelper::DropTargetListener::~DropTargetListener() } -void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) +void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& ) { } -void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) throw( RuntimeException, std::exception ) +void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) { const SolarMutexGuard aGuard; @@ -163,7 +163,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv } -void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) throw( RuntimeException, std::exception ) +void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) { const SolarMutexGuard aGuard; @@ -179,7 +179,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD } -void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) throw( RuntimeException, std::exception ) +void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) { const SolarMutexGuard aGuard; @@ -201,7 +201,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr } -void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) throw( RuntimeException, std::exception ) +void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) { const SolarMutexGuard aGuard; @@ -222,7 +222,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv } -void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& ) throw( RuntimeException, std::exception ) +void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& ) { } diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 4ffafea5f4f5..1138aaa5e7dc 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -54,20 +54,20 @@ namespace { explicit OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB); // XTypeProvider - virtual Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(RuntimeException, std::exception) override; + virtual Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPropertySet - virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override; + virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; - 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; protected: // OGenericUnoDialog overridables @@ -87,26 +87,26 @@ namespace { } - Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId( ) throw(RuntimeException, std::exception) + Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } - OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() { return OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" ); } - css::uno::Sequence<OUString> SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported { "com.sun.star.ui.AddressBookSourceDialog" }; return aSupported; } - Reference<XPropertySetInfo> SAL_CALL OAddressBookSourceDialogUno::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference<XPropertySetInfo> SAL_CALL OAddressBookSourceDialogUno::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -136,7 +136,7 @@ namespace { static_cast< AddressBookSourceDialog* >( m_pDialog.get() )->getFieldMapping( m_aAliases ); } - void SAL_CALL OAddressBookSourceDialogUno::initialize(const Sequence< Any >& rArguments) throw(Exception, RuntimeException, std::exception) + void SAL_CALL OAddressBookSourceDialogUno::initialize(const Sequence< Any >& rArguments) { if( rArguments.getLength() == 5 ) { diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 2819b53a569e..518ae332575c 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -53,7 +53,6 @@ FrameStatusListener::~FrameStatusListener() // XInterface Any SAL_CALL FrameStatusListener::queryInterface( const Type& rType ) -throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -81,7 +80,6 @@ void SAL_CALL FrameStatusListener::release() throw () // XComponent void SAL_CALL FrameStatusListener::dispose() -throw (css::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -115,20 +113,17 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL FrameStatusListener::addEventListener( const Reference< XEventListener >& ) -throw ( RuntimeException, std::exception ) { // helper class for status updates - no need to support listener } void SAL_CALL FrameStatusListener::removeEventListener( const Reference< XEventListener >& ) -throw ( RuntimeException, std::exception ) { // helper class for status updates - no need to support listener } // XEventListener void SAL_CALL FrameStatusListener::disposing( const EventObject& Source ) -throw ( RuntimeException, std::exception ) { Reference< XInterface > xSource( Source.Source ); @@ -149,7 +144,6 @@ throw ( RuntimeException, std::exception ) } void FrameStatusListener::frameAction( const FrameActionEvent& Action ) -throw ( RuntimeException, std::exception ) { if ( Action.Action == FrameAction_CONTEXT_CHANGED ) bindListener(); diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 43d34379da18..dd03972489b1 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -71,7 +71,6 @@ GenericToolboxController::~GenericToolboxController() } void SAL_CALL GenericToolboxController::dispose() -throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; m_pToolbox.clear(); @@ -80,7 +79,6 @@ throw ( RuntimeException, std::exception ) } void SAL_CALL GenericToolboxController::execute( sal_Int16 /*KeyModifier*/ ) -throw ( RuntimeException, std::exception ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; @@ -124,7 +122,6 @@ throw ( RuntimeException, std::exception ) } void GenericToolboxController::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index b7543b202a46..c7a17139eb65 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -73,7 +73,7 @@ OGenericUnoDialog::~OGenericUnoDialog() } -Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) { Any aReturn = OGenericUnoDialogBase::queryInterface(_rType); @@ -88,7 +88,7 @@ Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) throw (Runtim } -Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes( ) throw(RuntimeException, std::exception) +Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes( ) { return ::comphelper::concatSequences( OGenericUnoDialogBase::getTypes(), @@ -96,13 +96,13 @@ Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes( ) throw(RuntimeException, ); } -sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception, std::exception) +void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { // TODO : need some handling if we're currently executing ... @@ -119,7 +119,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con } -sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw(IllegalArgumentException) +sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) { switch (nHandle) { @@ -139,7 +139,7 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& } -void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(RuntimeException, std::exception) +void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) { UnoDialogEntryGuard aGuard( *this ); @@ -195,7 +195,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck() } -sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) { // both creation and execution of the dialog must be guarded with the SolarMutex, so be generous here SolarMutexGuard aSolarGuard; @@ -288,7 +288,7 @@ void OGenericUnoDialog::implInitialize(const Any& _rValue) } -void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) +void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 1c0f3431f8f7..225aa304d2b5 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -67,7 +67,7 @@ PopupMenuControllerBase::~PopupMenuControllerBase() } // protected function -void PopupMenuControllerBase::throwIfDisposed() throw ( RuntimeException ) +void PopupMenuControllerBase::throwIfDisposed() { if (rBHelper.bDisposed || rBHelper.bInDispose) throw css::lang::DisposedException(); @@ -92,13 +92,13 @@ void SAL_CALL PopupMenuControllerBase::disposing() } // XServiceInfo -sal_Bool SAL_CALL PopupMenuControllerBase::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL PopupMenuControllerBase::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } // XEventListener -void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) +void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) { osl::MutexGuard aLock( m_aMutex ); m_xFrame.clear(); @@ -107,11 +107,11 @@ void SAL_CALL PopupMenuControllerBase::disposing( const EventObject& ) throw ( R } // XMenuListener -void SAL_CALL PopupMenuControllerBase::itemHighlighted( const awt::MenuEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL PopupMenuControllerBase::itemHighlighted( const awt::MenuEvent& ) { } -void SAL_CALL PopupMenuControllerBase::itemSelected( const awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL PopupMenuControllerBase::itemSelected( const awt::MenuEvent& rEvent ) { throwIfDisposed(); @@ -157,15 +157,15 @@ IMPL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, p, void ) delete pDispatchInfo; } -void SAL_CALL PopupMenuControllerBase::itemActivated( const awt::MenuEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL PopupMenuControllerBase::itemActivated( const awt::MenuEvent& ) { } -void SAL_CALL PopupMenuControllerBase::itemDeactivated( const awt::MenuEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL PopupMenuControllerBase::itemDeactivated( const awt::MenuEvent& ) { } -void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL PopupMenuControllerBase::updatePopupMenu() { osl::ClearableMutexGuard aLock( m_aMutex ); throwIfDisposed(); @@ -199,7 +199,6 @@ PopupMenuControllerBase::queryDispatch( const URL& /*aURL*/, const OUString& /*sTarget*/, sal_Int32 /*nFlags*/ ) -throw( RuntimeException, std::exception ) { // must be implemented by subclass osl::MutexGuard aLock( m_aMutex ); @@ -208,7 +207,7 @@ throw( RuntimeException, std::exception ) return Reference< XDispatch >(); } -Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor ) throw( RuntimeException, std::exception ) +Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispatches( const Sequence< DispatchDescriptor >& lDescriptor ) { // Create return list - which must have same size then the given descriptor // It's not allowed to pack it! @@ -235,7 +234,6 @@ void SAL_CALL PopupMenuControllerBase::dispatch( const URL& /*aURL*/, const Sequence< PropertyValue >& /*seqProperties*/ ) -throw( css::uno::RuntimeException, std::exception ) { // must be implemented by subclass osl::MutexGuard aLock( m_aMutex ); @@ -246,7 +244,6 @@ void SAL_CALL PopupMenuControllerBase::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) -throw( css::uno::RuntimeException, std::exception ) { osl::ResettableMutexGuard aLock( m_aMutex ); throwIfDisposed(); @@ -275,7 +272,6 @@ throw( css::uno::RuntimeException, std::exception ) void SAL_CALL PopupMenuControllerBase::removeStatusListener( const Reference< XStatusListener >& xControl, const URL& /*aURL*/ ) -throw( css::uno::RuntimeException, std::exception ) { rBHelper.removeListener( cppu::UnoType<decltype(xControl)>::get(), xControl ); } @@ -302,7 +298,7 @@ OUString PopupMenuControllerBase::determineBaseURL( const OUString& aURL ) } // XInitialization -void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) +void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) { osl::MutexGuard aLock( m_aMutex ); @@ -336,7 +332,7 @@ void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArgum } } // XPopupMenuController -void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception ) +void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopupMenu >& xPopupMenu ) { osl::MutexGuard aLock( m_aMutex ); throwIfDisposed(); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 9229f09bf040..51d7bbc38dde 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -163,26 +163,26 @@ PopupWindowController::~PopupWindowController() } // XServiceInfo -sal_Bool SAL_CALL PopupWindowController::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL PopupWindowController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } // XComponent -void SAL_CALL PopupWindowController::dispose() throw (RuntimeException, std::exception) +void SAL_CALL PopupWindowController::dispose() { mxImpl.reset(); svt::ToolboxController::dispose(); } // XStatusListener -void SAL_CALL PopupWindowController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception ) +void SAL_CALL PopupWindowController::statusChanged( const frame::FeatureStateEvent& rEvent ) { svt::ToolboxController::statusChanged(rEvent); enable( rEvent.IsEnabled ); } -Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() throw (RuntimeException, std::exception) +Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() { VclPtr< ToolBox > pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ).get() ); if( pToolBox ) diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index d2ae6a6b8c85..8bb37ea27ae7 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -94,7 +94,6 @@ Reference< XURLTransformer > StatusbarController::getURLTransformer() const // XInterface Any SAL_CALL StatusbarController::queryInterface( const Type& rType ) -throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -122,7 +121,6 @@ void SAL_CALL StatusbarController::release() throw () } void SAL_CALL StatusbarController::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException, std::exception ) { bool bInitialized( true ); @@ -171,7 +169,6 @@ throw ( Exception, RuntimeException, std::exception ) } void SAL_CALL StatusbarController::update() -throw ( RuntimeException, std::exception ) { { SolarMutexGuard aSolarMutexGuard; @@ -185,7 +182,6 @@ throw ( RuntimeException, std::exception ) // XComponent void SAL_CALL StatusbarController::dispose() -throw (css::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -235,20 +231,17 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL StatusbarController::addEventListener( const Reference< XEventListener >& xListener ) -throw ( RuntimeException, std::exception ) { m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener ); } void SAL_CALL StatusbarController::removeEventListener( const Reference< XEventListener >& aListener ) -throw ( RuntimeException, std::exception ) { m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), aListener ); } // XEventListener void SAL_CALL StatusbarController::disposing( const EventObject& Source ) -throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -279,7 +272,6 @@ throw ( RuntimeException, std::exception ) // XStatusListener void SAL_CALL StatusbarController::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -302,21 +294,18 @@ throw ( RuntimeException, std::exception ) // XStatusbarController sal_Bool SAL_CALL StatusbarController::mouseButtonDown( const css::awt::MouseEvent& ) -throw (css::uno::RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL StatusbarController::mouseMove( const css::awt::MouseEvent& ) -throw (css::uno::RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL StatusbarController::mouseButtonUp( const css::awt::MouseEvent& ) -throw (css::uno::RuntimeException, std::exception) { return false; } @@ -326,7 +315,6 @@ void SAL_CALL StatusbarController::command( ::sal_Int32, sal_Bool, const css::uno::Any& ) -throw (css::uno::RuntimeException, std::exception) { } @@ -334,16 +322,14 @@ void SAL_CALL StatusbarController::paint( const css::uno::Reference< css::awt::XGraphics >&, const css::awt::Rectangle&, ::sal_Int32 ) -throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL StatusbarController::click( const css::awt::Point& ) -throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL StatusbarController::doubleClick( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL StatusbarController::doubleClick( const css::awt::Point& ) { SolarMutexGuard aSolarMutexGuard; diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 07a840655704..574180953fa0 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -108,7 +108,7 @@ void SVTXGridControl::impl_checkRowIndex_throw( ::svt::table::TableControl const } -sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) { SolarMutexGuard aGuard; @@ -120,7 +120,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) } -sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) { SolarMutexGuard aGuard; @@ -132,7 +132,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 } -sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn( ) { SolarMutexGuard aGuard; @@ -144,7 +144,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn( ) throw (RuntimeException } -sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow( ) { SolarMutexGuard aGuard; @@ -156,7 +156,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow( ) throw (RuntimeException, s } -void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException, std::exception) +void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) { SolarMutexGuard aGuard; @@ -170,19 +170,19 @@ void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 } -void SAL_CALL SVTXGridControl::addSelectionListener(const Reference< XGridSelectionListener > & listener) throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::addSelectionListener(const Reference< XGridSelectionListener > & listener) { m_aSelectionListeners.addInterface(listener); } -void SAL_CALL SVTXGridControl::removeSelectionListener(const Reference< XGridSelectionListener > & listener) throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::removeSelectionListener(const Reference< XGridSelectionListener > & listener) { m_aSelectionListeners.removeInterface(listener); } -void SVTXGridControl::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException, std::exception) +void SVTXGridControl::setProperty( const OUString& PropertyName, const Any& aValue) { SolarMutexGuard aGuard; @@ -466,7 +466,7 @@ namespace } } -Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeException, std::exception) +Any SVTXGridControl::getProperty( const OUString& PropertyName ) { SolarMutexGuard aGuard; @@ -600,7 +600,7 @@ Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeEx } -void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event ) { SolarMutexGuard aGuard; m_xTableModel->notifyRowsInserted( i_event ); @@ -608,14 +608,14 @@ void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event ) thro void SAL_CALL - SVTXGridControl::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + SVTXGridControl::rowsRemoved( const GridDataEvent& i_event ) { SolarMutexGuard aGuard; m_xTableModel->notifyRowsRemoved( i_event ); } -void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) { SolarMutexGuard aGuard; @@ -629,7 +629,7 @@ void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw } -void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& ) { SolarMutexGuard aGuard; @@ -641,7 +641,7 @@ void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& ) throw ( } -void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event ) { SolarMutexGuard aGuard; @@ -653,7 +653,7 @@ void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event ) } -void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) { SolarMutexGuard aGuard; @@ -663,7 +663,7 @@ void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) t } -void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& ) { OSL_ENSURE( false, "SVTXGridControl::elementReplaced: not implemented!" ); // at the moment, the XGridColumnModel API does not allow replacing columns @@ -671,13 +671,13 @@ void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& ) throw (R } -void SAL_CALL SVTXGridControl::disposing( const EventObject& Source ) throw(RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::disposing( const EventObject& Source ) { VCLXWindow::disposing( Source ); } -void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception ) +void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) { SolarMutexGuard aGuard; @@ -690,7 +690,7 @@ void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (Runtim } -void SAL_CALL SVTXGridControl::selectAllRows() throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::selectAllRows() { SolarMutexGuard aGuard; @@ -701,7 +701,7 @@ void SAL_CALL SVTXGridControl::selectAllRows() throw (RuntimeException, std::exc } -void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception ) +void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) { SolarMutexGuard aGuard; @@ -714,7 +714,7 @@ void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (Runt } -void SAL_CALL SVTXGridControl::deselectAllRows() throw (RuntimeException, std::exception) +void SAL_CALL SVTXGridControl::deselectAllRows() { SolarMutexGuard aGuard; @@ -725,7 +725,7 @@ void SAL_CALL SVTXGridControl::deselectAllRows() throw (RuntimeException, std::e } -Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (RuntimeException, std::exception) +Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() { SolarMutexGuard aGuard; @@ -740,7 +740,7 @@ Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (Runti } -sal_Bool SAL_CALL SVTXGridControl::hasSelectedRows() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SVTXGridControl::hasSelectedRows() { SolarMutexGuard aGuard; @@ -751,7 +751,7 @@ sal_Bool SAL_CALL SVTXGridControl::hasSelectedRows() throw (RuntimeException, st } -sal_Bool SAL_CALL SVTXGridControl::isRowSelected( ::sal_Int32 index ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SVTXGridControl::isRowSelected( ::sal_Int32 index ) { SolarMutexGuard aGuard; @@ -762,7 +762,7 @@ sal_Bool SAL_CALL SVTXGridControl::isRowSelected( ::sal_Int32 index ) throw (Run } -void SVTXGridControl::dispose() throw(RuntimeException, std::exception) +void SVTXGridControl::dispose() { EventObject aObj; aObj.Source = static_cast<cppu::OWeakObject*>(this); @@ -850,7 +850,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent } -void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) +void SVTXGridControl::setEnable( sal_Bool bEnable ) { SolarMutexGuard aGuard; diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index 07af15b39982..a8e074d1074d 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -64,45 +64,45 @@ public: virtual ~SVTXGridControl() override; // XGridDataListener - virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) override; + virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) override; + virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) override; + virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) 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; // 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; // XGridControl - virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCurrentColumn( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getCurrentRow( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, css::util::VetoException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) override; + virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) override; + virtual ::sal_Int32 SAL_CALL getCurrentColumn( ) override; + virtual ::sal_Int32 SAL_CALL getCurrentRow( ) override; + virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) override; // XGridRowSelection - virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override; - virtual void SAL_CALL selectAllRows() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception ) override; - virtual void SAL_CALL deselectAllRows() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasSelectedRows() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) override; - - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) override; + virtual void SAL_CALL selectAllRows() override; + virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) override; + virtual void SAL_CALL deselectAllRows() override; + virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() override; + virtual sal_Bool SAL_CALL hasSelectedRows() override; + virtual sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) override; + virtual void SAL_CALL addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) override; + virtual void SAL_CALL removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) override; + + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override; // css::lang::XComponent - void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) override; // XWindow - void SAL_CALL setEnable( sal_Bool bEnable ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setEnable( sal_Bool bEnable ) override; protected: // VCLXWindow diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 79a03db19e04..b8a48f08ae8f 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -133,7 +133,6 @@ Reference< XLayoutManager > ToolboxController::getLayoutManager() const // XInterface Any SAL_CALL ToolboxController::queryInterface( const Type& rType ) -throw ( RuntimeException, std::exception ) { css::uno::Any a(ToolboxController_Base::queryInterface(rType)); return a.hasValue() ? a : OPropertyContainer::queryInterface(rType); @@ -150,7 +149,6 @@ void SAL_CALL ToolboxController::release() throw () } css::uno::Sequence<css::uno::Type> ToolboxController::getTypes() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence<css::uno::Type> s1(ToolboxController_Base::getTypes()); css::uno::Sequence<css::uno::Type> s2(getBaseTypes()); @@ -163,7 +161,6 @@ css::uno::Sequence<css::uno::Type> ToolboxController::getTypes() } void SAL_CALL ToolboxController::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException, std::exception ) { bool bInitialized( true ); @@ -220,7 +217,6 @@ throw ( Exception, RuntimeException, std::exception ) } void SAL_CALL ToolboxController::update() -throw ( RuntimeException, std::exception ) { { SolarMutexGuard aSolarMutexGuard; @@ -234,7 +230,6 @@ throw ( RuntimeException, std::exception ) // XComponent void SAL_CALL ToolboxController::dispose() -throw (css::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -275,20 +270,17 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL ToolboxController::addEventListener( const Reference< XEventListener >& xListener ) -throw ( RuntimeException, std::exception ) { m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener ); } void SAL_CALL ToolboxController::removeEventListener( const Reference< XEventListener >& aListener ) -throw ( RuntimeException, std::exception ) { m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), aListener ); } // XEventListener void SAL_CALL ToolboxController::disposing( const EventObject& Source ) -throw ( RuntimeException, std::exception ) { Reference< XInterface > xSource( Source.Source ); @@ -314,14 +306,12 @@ throw ( RuntimeException, std::exception ) // XStatusListener void SAL_CALL ToolboxController::statusChanged( const FeatureStateEvent& ) -throw ( RuntimeException, std::exception ) { // must be implemented by sub class } // XToolbarController void SAL_CALL ToolboxController::execute( sal_Int16 KeyModifier ) -throw (css::uno::RuntimeException, std::exception) { Reference< XDispatch > xDispatch; OUString aCommandURL; @@ -368,23 +358,19 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL ToolboxController::click() -throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL ToolboxController::doubleClick() -throw (css::uno::RuntimeException, std::exception) { } Reference< XWindow > SAL_CALL ToolboxController::createPopupWindow() -throw (css::uno::RuntimeException, std::exception) { return Reference< XWindow >(); } Reference< XWindow > SAL_CALL ToolboxController::createItemWindow( const Reference< XWindow >& ) -throw (css::uno::RuntimeException, std::exception) { return Reference< XWindow >(); } @@ -697,7 +683,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ToolboxController::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ToolboxController::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -719,7 +705,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ToolboxController: sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( css::uno::Any& aConvertedValue , css::uno::Any& aOldValue , sal_Int32 nHandle , - const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException ) + const css::uno::Any& aValue ) { switch (nHandle) { @@ -742,7 +728,6 @@ sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( css::uno::Any& void SAL_CALL ToolboxController::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) -throw( css::uno::Exception, std::exception) { OPropertyContainer::setFastPropertyValue_NoBroadcast(nHandle, aValue); if (TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE == nHandle) diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index fa2a39137b10..e2a5cf9bbfea 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -180,7 +180,7 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) } -UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ ) throw( IllegalArgumentException ) +UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ ) { if( mpTreeNodeMap ) { @@ -416,7 +416,7 @@ void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTree } -UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (RuntimeException ) +UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const { if( !mpTreeImpl ) throw DisposedException(); @@ -424,7 +424,7 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim } -void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException ) +void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) { SolarMutexGuard aGuard; @@ -481,7 +481,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, // css::view::XSelectionSupplier -sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) { SolarMutexGuard aGuard; ChangeNodesSelection( rSelection, true, true ); @@ -489,7 +489,7 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega } -Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::exception) +Any SAL_CALL TreeControlPeer::getSelection() { SolarMutexGuard aGuard; @@ -524,13 +524,13 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::excep } -void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) { maSelectionListeners.addInterface( xListener ); } -void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) { maSelectionListeners.addInterface( xListener ); } @@ -539,27 +539,27 @@ void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< X // css::view::XMultiSelectionSupplier -sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) { ChangeNodesSelection( rSelection, true, false ); return true; } -void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) { ChangeNodesSelection( rSelection, false, false ); } -void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::clearSelection() { SolarMutexGuard aGuard; getTreeListBoxOrThrow().SelectAll( false ); } -sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() { SolarMutexGuard aGuard; return getTreeListBoxOrThrow().GetSelectionCount(); @@ -570,8 +570,8 @@ class TreeSelectionEnumeration : public ::cppu::WeakImplHelper< XEnumeration > { public: explicit TreeSelectionEnumeration( std::list< Any >& rSelection ); - virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual Any SAL_CALL nextElement() override; std::list< Any > maSelection; std::list< Any >::iterator maIter; @@ -585,13 +585,13 @@ TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection } -sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements() { return maIter != maSelection.end(); } -Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL TreeSelectionEnumeration::nextElement() { if( maIter == maSelection.end() ) throw NoSuchElementException(); @@ -600,7 +600,7 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti } -Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() { SolarMutexGuard aGuard; @@ -623,7 +623,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() } -Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() { SolarMutexGuard aGuard; @@ -649,14 +649,14 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer // css::awt::XTreeControl -OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() { SolarMutexGuard aGuard; return msDefaultExpandedGraphicURL; } -void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) { SolarMutexGuard aGuard; if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL ) @@ -685,14 +685,14 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe } -OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() { SolarMutexGuard aGuard; return msDefaultCollapsedGraphicURL; } -void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) { SolarMutexGuard aGuard; if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL ) @@ -721,7 +721,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sD } -sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) +sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) { SolarMutexGuard aGuard; @@ -731,14 +731,14 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& } -sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) +sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) { SolarMutexGuard aGuard; return !isNodeExpanded( xNode ); } -void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) +void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) { SolarMutexGuard aGuard; @@ -749,7 +749,7 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN } -sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) +sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) { SolarMutexGuard aGuard; @@ -759,7 +759,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& } -void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) +void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) { SolarMutexGuard aGuard; @@ -770,7 +770,7 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) } -void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) +void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) { SolarMutexGuard aGuard; @@ -781,19 +781,19 @@ void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode } -void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) { maTreeExpansionListeners.addInterface( xListener ); } -void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) { maTreeExpansionListeners.removeInterface( xListener ); } -Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) +Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) { SolarMutexGuard aGuard; @@ -810,7 +810,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x } -Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) +Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) { SolarMutexGuard aGuard; @@ -827,7 +827,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_ } -awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException, std::exception) +awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) { SolarMutexGuard aGuard; @@ -839,7 +839,7 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode } -sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TreeControlPeer::isEditing( ) { SolarMutexGuard aGuard; @@ -848,7 +848,7 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException, std::e } -sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TreeControlPeer::stopEditing() { SolarMutexGuard aGuard; @@ -865,7 +865,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::e } -void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::cancelEditing( ) { SolarMutexGuard aGuard; @@ -874,7 +874,7 @@ void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException, std::e } -void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) { SolarMutexGuard aGuard; @@ -883,12 +883,12 @@ void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& rTree.EditEntry( pEntry ); } -void SAL_CALL TreeControlPeer::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) { maTreeEditListeners.addInterface( xListener ); } -void SAL_CALL TreeControlPeer::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) { maTreeEditListeners.removeInterface( xListener ); } @@ -943,7 +943,7 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const OUString& r // css::awt::tree::TreeDataModelListener -void SAL_CALL TreeControlPeer::treeNodesChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::treeNodesChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) { SolarMutexGuard aGuard; @@ -953,7 +953,7 @@ void SAL_CALL TreeControlPeer::treeNodesChanged( const css::awt::tree::TreeDataM updateTree( rEvent ); } -void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeDataModelEvent& rEvent ) { SolarMutexGuard aGuard; @@ -963,7 +963,7 @@ void SAL_CALL TreeControlPeer::treeNodesInserted( const css::awt::tree::TreeData updateTree( rEvent ); } -void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& rEvent ) { SolarMutexGuard aGuard; @@ -973,7 +973,7 @@ void SAL_CALL TreeControlPeer::treeNodesRemoved( const css::awt::tree::TreeDataM updateTree( rEvent ); } -void SAL_CALL TreeControlPeer::treeStructureChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::treeStructureChanged( const css::awt::tree::TreeDataModelEvent& rEvent ) { SolarMutexGuard aGuard; @@ -1141,7 +1141,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue ) } // XEventListener -void SAL_CALL TreeControlPeer::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL TreeControlPeer::disposing( const css::lang::EventObject& ) { // model is disposed, so we clear our tree SolarMutexGuard aGuard; @@ -1172,7 +1172,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere // css::awt::XLayoutConstrains -css::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException, std::exception) +css::awt::Size TreeControlPeer::getMinimumSize() { SolarMutexGuard aGuard; @@ -1185,12 +1185,12 @@ css::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException, std::ex return aSz; } -css::awt::Size TreeControlPeer::getPreferredSize() throw(RuntimeException, std::exception) +css::awt::Size TreeControlPeer::getPreferredSize() { return getMinimumSize(); } -css::awt::Size TreeControlPeer::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(RuntimeException, std::exception) +css::awt::Size TreeControlPeer::calcAdjustedSize( const css::awt::Size& rNewSize ) { SolarMutexGuard aGuard; @@ -1207,7 +1207,7 @@ css::awt::Size TreeControlPeer::calcAdjustedSize( const css::awt::Size& rNewSize // css::awt::XVclWindowPeer -void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException, std::exception) +void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue) { SolarMutexGuard aGuard; @@ -1310,7 +1310,7 @@ void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aVal } } -Any TreeControlPeer::getProperty( const OUString& PropertyName ) throw(RuntimeException, std::exception) +Any TreeControlPeer::getProperty( const OUString& PropertyName ) { SolarMutexGuard aGuard; diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 2106cb18eece..9a976f460d55 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -58,63 +58,63 @@ public: vcl::Window* createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ); // css::view::XSelectionSupplier - virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) override; + virtual css::uno::Any SAL_CALL getSelection( ) override; + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; // css::view::XMultiSelectionSupplier - virtual sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearSelection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getSelectionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) override; + virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) override; + virtual void SAL_CALL clearSelection( ) override; + virtual ::sal_Int32 SAL_CALL getSelectionCount( ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration( ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) override; // css::awt::XTreeControl - virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL makeNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL expandNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL collapseNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::awt::tree::ExpandVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getNodeRect( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEditing( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL stopEditing( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelEditing( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDefaultExpandedGraphicURL() override; + virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) override; + virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() override; + virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) override; + virtual sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual void SAL_CALL makeNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual void SAL_CALL expandNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual void SAL_CALL collapseNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) override; + virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) override; + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) override; + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) override; + virtual css::awt::Rectangle SAL_CALL getNodeRect( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual sal_Bool SAL_CALL isEditing( ) override; + virtual sal_Bool SAL_CALL stopEditing( ) override; + virtual void SAL_CALL cancelEditing( ) override; + virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) override; + virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) override; // css::awt::tree::TreeDataModelListener - virtual void SAL_CALL treeNodesChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL treeNodesInserted( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL treeStructureChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL treeNodesChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) override; + virtual void SAL_CALL treeNodesInserted( const css::awt::tree::TreeDataModelEvent& aEvent ) override; + virtual void SAL_CALL treeNodesRemoved( const css::awt::tree::TreeDataModelEvent& aEvent ) override; + virtual void SAL_CALL treeStructureChanged( const css::awt::tree::TreeDataModelEvent& aEvent ) override; // XEventListener - void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // css::awt::XLayoutConstrains - css::awt::Size SAL_CALL getMinimumSize() throw(css::uno::RuntimeException, std::exception) override; - css::awt::Size SAL_CALL getPreferredSize() throw(css::uno::RuntimeException, std::exception) override; - css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw(css::uno::RuntimeException, std::exception) override; + css::awt::Size SAL_CALL getMinimumSize() override; + css::awt::Size SAL_CALL getPreferredSize() override; + css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // css::awt::XVclWindowPeer - void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; + css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override; private: /// @throws css::lang::IllegalArgumentException - UnoTreeListEntry* getEntry( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bThrow = true ) throw (css::lang::IllegalArgumentException ); + UnoTreeListEntry* getEntry( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bThrow = true ); void disposeControl(); @@ -134,10 +134,10 @@ private: static OUString getEntryString( const css::uno::Any& rValue ); /// @throws css::uno::RuntimeException - UnoTreeListBoxImpl& getTreeListBoxOrThrow() const throw (css::uno::RuntimeException ); + UnoTreeListBoxImpl& getTreeListBoxOrThrow() const; /// @throws css::uno::RuntimeException /// @throws css::lang::IllegalArgumentException - void ChangeNodesSelection( const css::uno::Any& rSelection, bool bSelect, bool bSetSelection ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void ChangeNodesSelection( const css::uno::Any& rSelection, bool bSelect, bool bSetSelection ); void onChangeDataModel( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeDataModel >& xDataModel ); diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index e8f6cbd5cdcf..6a6688574501 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -138,7 +138,6 @@ void getAnyFromMacro(Any& rAny, const SvxMacro& rMacro) void getMacroFromAny( SvxMacro& rMacro, const Any& rAny) - throw ( IllegalArgumentException ) { // get sequence Sequence<PropertyValue> aSequence; @@ -250,11 +249,6 @@ SvBaseEventDescriptor::~SvBaseEventDescriptor() void SvBaseEventDescriptor::replaceByName( const OUString& rName, const Any& rElement ) - throw( - IllegalArgumentException, - NoSuchElementException, - WrappedTargetException, - RuntimeException, std::exception) { sal_uInt16 nMacroID = getMacroID(rName); @@ -276,10 +270,6 @@ void SvBaseEventDescriptor::replaceByName( Any SvBaseEventDescriptor::getByName( const OUString& rName ) - throw( - NoSuchElementException, - WrappedTargetException, - RuntimeException, std::exception) { sal_uInt16 nMacroID = getMacroID(rName); @@ -296,7 +286,6 @@ Any SvBaseEventDescriptor::getByName( } Sequence<OUString> SvBaseEventDescriptor::getElementNames() - throw(RuntimeException, std::exception) { // create and fill sequence Sequence<OUString> aSequence(mnMacroItems); @@ -310,32 +299,27 @@ Sequence<OUString> SvBaseEventDescriptor::getElementNames() sal_Bool SvBaseEventDescriptor::hasByName( const OUString& rName ) - throw(RuntimeException, std::exception) { sal_uInt16 nMacroID = getMacroID(rName); return (nMacroID != 0); } Type SvBaseEventDescriptor::getElementType() - throw(RuntimeException, std::exception) { return cppu::UnoType<Sequence<PropertyValue>>::get(); } sal_Bool SvBaseEventDescriptor::hasElements() - throw(RuntimeException, std::exception) { return mnMacroItems != 0; } sal_Bool SvBaseEventDescriptor::supportsService(const OUString& rServiceName) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence<OUString> SvBaseEventDescriptor::getSupportedServiceNames() - throw(RuntimeException, std::exception) { Sequence<OUString> aSequence { sAPI_ServiceName }; @@ -379,11 +363,6 @@ SvEventDescriptor::~SvEventDescriptor() void SvEventDescriptor::replaceByName( const sal_uInt16 nEvent, const SvxMacro& rMacro) - throw( - IllegalArgumentException, - NoSuchElementException, - WrappedTargetException, - RuntimeException) { SvxMacroItem aItem(getMacroItemWhich()); aItem.SetMacroTable(getMacroItem().GetMacroTable()); @@ -394,10 +373,6 @@ void SvEventDescriptor::replaceByName( void SvEventDescriptor::getByName( SvxMacro& rMacro, const sal_uInt16 nEvent ) - throw( - NoSuchElementException, - WrappedTargetException, - RuntimeException) { const SvxMacroItem& rItem = getMacroItem(); if( rItem.HasMacro( nEvent ) ) @@ -450,7 +425,6 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const } OUString SvDetachedEventDescriptor::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return sImplName; } @@ -459,11 +433,6 @@ OUString SvDetachedEventDescriptor::getImplementationName() void SvDetachedEventDescriptor::replaceByName( const sal_uInt16 nEvent, const SvxMacro& rMacro) - throw( - IllegalArgumentException, - NoSuchElementException, - WrappedTargetException, - RuntimeException) { sal_Int16 nIndex = getIndex(nEvent); if (-1 == nIndex) @@ -477,10 +446,6 @@ void SvDetachedEventDescriptor::replaceByName( void SvDetachedEventDescriptor::getByName( SvxMacro& rMacro, const sal_uInt16 nEvent ) - throw( - NoSuchElementException, - WrappedTargetException, - RuntimeException) { sal_Int16 nIndex = getIndex(nEvent); if (-1 == nIndex ) @@ -492,7 +457,6 @@ void SvDetachedEventDescriptor::getByName( bool SvDetachedEventDescriptor::hasById( const sal_uInt16 nEvent ) const /// item ID of event - throw(IllegalArgumentException) { sal_Int16 nIndex = getIndex(nEvent); if (-1 == nIndex) diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx index 890fbd295e00..d3c3f2acde5c 100644 --- a/svtools/source/uno/unogridcolumnfacade.cxx +++ b/svtools/source/uno/unogridcolumnfacade.cxx @@ -101,10 +101,10 @@ namespace svt { namespace table virtual ~ColumnChangeMultiplexer() override; // XGridColumnListener - virtual void SAL_CALL columnChanged( const GridColumnEvent& i_event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL columnChanged( const GridColumnEvent& i_event ) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& i_event ) override; private: UnoGridColumnFacade* m_pColumnImplementation; @@ -129,7 +129,7 @@ namespace svt { namespace table } - void SAL_CALL ColumnChangeMultiplexer::columnChanged( const GridColumnEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL ColumnChangeMultiplexer::columnChanged( const GridColumnEvent& i_event ) { if ( i_event.AttributeName == "DataColumnIndex" ) { @@ -162,7 +162,7 @@ namespace svt { namespace table } - void SAL_CALL ColumnChangeMultiplexer::disposing( const EventObject& ) throw (RuntimeException, std::exception) + void SAL_CALL ColumnChangeMultiplexer::disposing( const EventObject& ) { } diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index e3a362070ee2..9521348ae37d 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -184,7 +184,7 @@ VCLXMultiLineEdit::~VCLXMultiLineEdit() { } -css::uno::Any VCLXMultiLineEdit::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any VCLXMultiLineEdit::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::awt::XTextComponent* >(this)), @@ -202,17 +202,17 @@ IMPL_XTYPEPROVIDER_START( VCLXMultiLineEdit ) VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -void VCLXMultiLineEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) { maTextListeners.addInterface( l ); } -void VCLXMultiLineEdit::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) { maTextListeners.removeInterface( l ); } -void VCLXMultiLineEdit::setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::setText( const OUString& aText ) { SolarMutexGuard aGuard; @@ -229,7 +229,7 @@ void VCLXMultiLineEdit::setText( const OUString& aText ) throw(css::uno::Runtime } } -void VCLXMultiLineEdit::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::insertText( const css::awt::Selection& rSel, const OUString& aText ) { SolarMutexGuard aGuard; @@ -241,7 +241,7 @@ void VCLXMultiLineEdit::insertText( const css::awt::Selection& rSel, const OUStr } } -OUString VCLXMultiLineEdit::getText() throw(css::uno::RuntimeException, std::exception) +OUString VCLXMultiLineEdit::getText() { SolarMutexGuard aGuard; @@ -252,7 +252,7 @@ OUString VCLXMultiLineEdit::getText() throw(css::uno::RuntimeException, std::exc return aText; } -OUString VCLXMultiLineEdit::getSelectedText() throw(css::uno::RuntimeException, std::exception) +OUString VCLXMultiLineEdit::getSelectedText() { SolarMutexGuard aGuard; @@ -264,7 +264,7 @@ OUString VCLXMultiLineEdit::getSelectedText() throw(css::uno::RuntimeException, } -void VCLXMultiLineEdit::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::setSelection( const css::awt::Selection& aSelection ) { SolarMutexGuard aGuard; @@ -275,7 +275,7 @@ void VCLXMultiLineEdit::setSelection( const css::awt::Selection& aSelection ) th } } -css::awt::Selection VCLXMultiLineEdit::getSelection() throw(css::uno::RuntimeException, std::exception) +css::awt::Selection VCLXMultiLineEdit::getSelection() { SolarMutexGuard aGuard; @@ -289,7 +289,7 @@ css::awt::Selection VCLXMultiLineEdit::getSelection() throw(css::uno::RuntimeExc return aSel; } -sal_Bool VCLXMultiLineEdit::isEditable() throw(css::uno::RuntimeException, std::exception) +sal_Bool VCLXMultiLineEdit::isEditable() { SolarMutexGuard aGuard; @@ -297,7 +297,7 @@ sal_Bool VCLXMultiLineEdit::isEditable() throw(css::uno::RuntimeException, std:: return pMultiLineEdit && !pMultiLineEdit->IsReadOnly() && pMultiLineEdit->IsEnabled(); } -void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) { SolarMutexGuard aGuard; @@ -306,7 +306,7 @@ void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(css::uno::Runtim pMultiLineEdit->SetReadOnly( !bEditable ); } -void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) { SolarMutexGuard aGuard; @@ -315,7 +315,7 @@ void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeE pMultiLineEdit->SetMaxTextLen( nLen ); } -sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(css::uno::RuntimeException, std::exception) +sal_Int16 VCLXMultiLineEdit::getMaxTextLen() { SolarMutexGuard aGuard; @@ -323,7 +323,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(css::uno::RuntimeException, s return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0; } -OUString VCLXMultiLineEdit::getTextLines() throw(css::uno::RuntimeException, std::exception) +OUString VCLXMultiLineEdit::getTextLines() { SolarMutexGuard aGuard; @@ -334,7 +334,7 @@ OUString VCLXMultiLineEdit::getTextLines() throw(css::uno::RuntimeException, std return aText; } -css::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(css::uno::RuntimeException, std::exception) +css::awt::Size VCLXMultiLineEdit::getMinimumSize() { SolarMutexGuard aGuard; @@ -345,12 +345,12 @@ css::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(css::uno::RuntimeExcept return aSz; } -css::awt::Size VCLXMultiLineEdit::getPreferredSize() throw(css::uno::RuntimeException, std::exception) +css::awt::Size VCLXMultiLineEdit::getPreferredSize() { return getMinimumSize(); } -css::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) +css::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const css::awt::Size& rNewSize ) { SolarMutexGuard aGuard; @@ -361,7 +361,7 @@ css::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const css::awt::Size& rNewSi return aSz; } -css::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(css::uno::RuntimeException, std::exception) +css::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) { SolarMutexGuard aGuard; @@ -372,7 +372,7 @@ css::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLi return aSz; } -void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) { SolarMutexGuard aGuard; @@ -409,7 +409,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven } } -void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) +void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const css::uno::Any& Value) { SolarMutexGuard aGuard; @@ -465,7 +465,7 @@ void VCLXMultiLineEdit::setProperty( const OUString& PropertyName, const css::un } } -css::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) { SolarMutexGuard aGuard; @@ -509,7 +509,7 @@ css::uno::Any VCLXMultiLineEdit::getProperty( const OUString& PropertyName ) thr return aProp; } -void SAL_CALL VCLXMultiLineEdit::setFocus( ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL VCLXMultiLineEdit::setFocus( ) { SolarMutexGuard aGuard; @@ -547,7 +547,7 @@ VCLXFileControl::~VCLXFileControl() pControl->GetEdit().SetModifyHdl( Link<Edit&,void>() ); } -css::uno::Any VCLXFileControl::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any VCLXFileControl::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::awt::XTextComponent* >(this)), @@ -563,7 +563,7 @@ IMPL_XTYPEPROVIDER_START( VCLXFileControl ) VCLXWindow::getTypes() IMPL_XTYPEPROVIDER_END -void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const css::uno::Any& Value) { SolarMutexGuard aGuard; @@ -603,17 +603,17 @@ void VCLXFileControl::SetWindow( const VclPtr< vcl::Window > &pWindow ) VCLXWindow::SetWindow( pWindow ); } -void VCLXFileControl::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception) +void VCLXFileControl::addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) { maTextListeners.addInterface( l ); } -void VCLXFileControl::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw(css::uno::RuntimeException, std::exception) +void VCLXFileControl::removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) { maTextListeners.removeInterface( l ); } -void VCLXFileControl::setText( const OUString& aText ) throw(css::uno::RuntimeException, std::exception) +void VCLXFileControl::setText( const OUString& aText ) { SolarMutexGuard aGuard; @@ -628,7 +628,7 @@ void VCLXFileControl::setText( const OUString& aText ) throw(css::uno::RuntimeEx } } -void VCLXFileControl::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception) +void VCLXFileControl::insertText( const css::awt::Selection& rSel, const OUString& aText ) { SolarMutexGuard aGuard; @@ -640,7 +640,7 @@ void VCLXFileControl::insertText( const css::awt::Selection& rSel, const OUStrin } } -OUString VCLXFileControl::getText() throw(css::uno::RuntimeException, std::exception) +OUString VCLXFileControl::getText() { SolarMutexGuard aGuard; @@ -651,7 +651,7 @@ OUString VCLXFileControl::getText() throw(css::uno::RuntimeException, std::excep return aText; } -OUString VCLXFileControl::getSelectedText() throw(css::uno::RuntimeException, std::exception) +OUString VCLXFileControl::getSelectedText() { SolarMutexGuard aGuard; @@ -663,7 +663,7 @@ OUString VCLXFileControl::getSelectedText() throw(css::uno::RuntimeException, st } -void VCLXFileControl::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) +void VCLXFileControl::setSelection( const css::awt::Selection& aSelection ) { SolarMutexGuard aGuard; @@ -672,7 +672,7 @@ void VCLXFileControl::setSelection( const css::awt::Selection& aSelection ) thro pFileControl->GetEdit().SetSelection( Selection( aSelection.Min, aSelection.Max ) ); } -css::awt::Selection VCLXFileControl::getSelection() throw(css::uno::RuntimeException, std::exception) +css::awt::Selection VCLXFileControl::getSelection() { SolarMutexGuard aGuard; @@ -686,7 +686,7 @@ css::awt::Selection VCLXFileControl::getSelection() throw(css::uno::RuntimeExcep return aSel; } -sal_Bool VCLXFileControl::isEditable() throw(css::uno::RuntimeException, std::exception) +sal_Bool VCLXFileControl::isEditable() { SolarMutexGuard aGuard; @@ -694,7 +694,7 @@ sal_Bool VCLXFileControl::isEditable() throw(css::uno::RuntimeException, std::ex return pFileControl && !pFileControl->GetEdit().IsReadOnly() && pFileControl->GetEdit().IsEnabled(); } -void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeException, std::exception) +void VCLXFileControl::setEditable( sal_Bool bEditable ) { SolarMutexGuard aGuard; @@ -703,7 +703,7 @@ void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(css::uno::RuntimeE pFileControl->GetEdit().SetReadOnly( !bEditable ); } -void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeException, std::exception) +void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) { SolarMutexGuard aGuard; @@ -712,7 +712,7 @@ void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(css::uno::RuntimeExc pFileControl->GetEdit().SetMaxTextLen( nLen ); } -sal_Int16 VCLXFileControl::getMaxTextLen() throw(css::uno::RuntimeException, std::exception) +sal_Int16 VCLXFileControl::getMaxTextLen() { SolarMutexGuard aGuard; @@ -733,7 +733,7 @@ void VCLXFileControl::ModifyHdl() maTextListeners.textChanged( aEvent ); } -css::awt::Size VCLXFileControl::getMinimumSize() throw(css::uno::RuntimeException, std::exception) +css::awt::Size VCLXFileControl::getMinimumSize() { SolarMutexGuard aGuard; @@ -748,14 +748,14 @@ css::awt::Size VCLXFileControl::getMinimumSize() throw(css::uno::RuntimeExceptio return aSz; } -css::awt::Size VCLXFileControl::getPreferredSize() throw(css::uno::RuntimeException, std::exception) +css::awt::Size VCLXFileControl::getPreferredSize() { css::awt::Size aSz = getMinimumSize(); aSz.Height += 4; return aSz; } -css::awt::Size VCLXFileControl::calcAdjustedSize( const css::awt::Size& rNewSize ) throw(css::uno::RuntimeException, std::exception) +css::awt::Size VCLXFileControl::calcAdjustedSize( const css::awt::Size& rNewSize ) { SolarMutexGuard aGuard; @@ -770,7 +770,7 @@ css::awt::Size VCLXFileControl::calcAdjustedSize( const css::awt::Size& rNewSize return aSz; } -css::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(css::uno::RuntimeException, std::exception) +css::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) { SolarMutexGuard aGuard; @@ -784,7 +784,7 @@ css::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) thr return aSz; } -void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(css::uno::RuntimeException, std::exception) +void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) { SolarMutexGuard aGuard; @@ -828,7 +828,7 @@ void SVTXFormattedField::SetWindow( const VclPtr< vcl::Window > &_pWindow ) } -void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) +void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) { SolarMutexGuard aGuard; @@ -953,7 +953,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::u } -css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) { SolarMutexGuard aGuard; @@ -1421,7 +1421,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } -void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) +void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) { SolarMutexGuard aGuard; VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); @@ -1460,12 +1460,12 @@ void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) t } -void SVTXRoadmap::addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) +void SVTXRoadmap::addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) { maItemListeners.addInterface( l ); } -void SVTXRoadmap::removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) +void SVTXRoadmap::removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) { maItemListeners.removeInterface( l ); } @@ -1493,7 +1493,7 @@ RMItemData SVTXRoadmap::GetRMItemData( const css::container::ContainerEvent& _rE return aCurRMItemData; } -void SVTXRoadmap::elementInserted( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception) +void SVTXRoadmap::elementInserted( const css::container::ContainerEvent& _rEvent ) { SolarMutexGuard aGuard; VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); @@ -1506,7 +1506,7 @@ void SVTXRoadmap::elementInserted( const css::container::ContainerEvent& _rEvent } } -void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception) +void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent ) { SolarMutexGuard aGuard; VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); @@ -1518,7 +1518,7 @@ void SVTXRoadmap::elementRemoved( const css::container::ContainerEvent& _rEvent } } -void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent )throw(css::uno::RuntimeException, std::exception) +void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent ) { SolarMutexGuard aGuard; VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); @@ -1532,7 +1532,7 @@ void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent } -void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) +void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any& Value) { SolarMutexGuard aGuard; @@ -1586,7 +1586,7 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any } -css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) { SolarMutexGuard aGuard; @@ -1645,7 +1645,7 @@ SVTXNumericField::~SVTXNumericField() { } -css::uno::Any SVTXNumericField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SVTXNumericField::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::awt::XNumericField* >(this)), @@ -1660,7 +1660,7 @@ IMPL_XTYPEPROVIDER_START( SVTXNumericField ) IMPL_XTYPEPROVIDER_END -void SVTXNumericField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXNumericField::setValue( double Value ) { SolarMutexGuard aGuard; @@ -1669,7 +1669,7 @@ void SVTXNumericField::setValue( double Value ) throw(css::uno::RuntimeException pField->SetValue( Value ); } -double SVTXNumericField::getValue() throw(css::uno::RuntimeException, std::exception) +double SVTXNumericField::getValue() { SolarMutexGuard aGuard; @@ -1677,7 +1677,7 @@ double SVTXNumericField::getValue() throw(css::uno::RuntimeException, std::excep return pField ? pField->GetValue() : 0; } -void SVTXNumericField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXNumericField::setMin( double Value ) { SolarMutexGuard aGuard; @@ -1686,7 +1686,7 @@ void SVTXNumericField::setMin( double Value ) throw(css::uno::RuntimeException, pField->SetMinValue( Value ); } -double SVTXNumericField::getMin() throw(css::uno::RuntimeException, std::exception) +double SVTXNumericField::getMin() { SolarMutexGuard aGuard; @@ -1694,7 +1694,7 @@ double SVTXNumericField::getMin() throw(css::uno::RuntimeException, std::excepti return pField ? pField->GetMinValue() : 0; } -void SVTXNumericField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXNumericField::setMax( double Value ) { SolarMutexGuard aGuard; @@ -1703,7 +1703,7 @@ void SVTXNumericField::setMax( double Value ) throw(css::uno::RuntimeException, pField->SetMaxValue( Value ); } -double SVTXNumericField::getMax() throw(css::uno::RuntimeException, std::exception) +double SVTXNumericField::getMax() { SolarMutexGuard aGuard; @@ -1711,7 +1711,7 @@ double SVTXNumericField::getMax() throw(css::uno::RuntimeException, std::excepti return pField ? pField->GetMaxValue() : 0; } -void SVTXNumericField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXNumericField::setFirst( double Value ) { SolarMutexGuard aGuard; @@ -1720,7 +1720,7 @@ void SVTXNumericField::setFirst( double Value ) throw(css::uno::RuntimeException pField->SetSpinFirst( Value ); } -double SVTXNumericField::getFirst() throw(css::uno::RuntimeException, std::exception) +double SVTXNumericField::getFirst() { SolarMutexGuard aGuard; @@ -1728,7 +1728,7 @@ double SVTXNumericField::getFirst() throw(css::uno::RuntimeException, std::excep return pField ? pField->GetSpinFirst() : 0; } -void SVTXNumericField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXNumericField::setLast( double Value ) { SolarMutexGuard aGuard; @@ -1737,7 +1737,7 @@ void SVTXNumericField::setLast( double Value ) throw(css::uno::RuntimeException, pField->SetSpinLast( Value ); } -double SVTXNumericField::getLast() throw(css::uno::RuntimeException, std::exception) +double SVTXNumericField::getLast() { SolarMutexGuard aGuard; @@ -1745,7 +1745,7 @@ double SVTXNumericField::getLast() throw(css::uno::RuntimeException, std::except return pField ? pField->GetSpinLast() : 0; } -void SVTXNumericField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXNumericField::setSpinSize( double Value ) { SolarMutexGuard aGuard; @@ -1754,7 +1754,7 @@ void SVTXNumericField::setSpinSize( double Value ) throw(css::uno::RuntimeExcept pField->SetSpinSize( Value ); } -double SVTXNumericField::getSpinSize() throw(css::uno::RuntimeException, std::exception) +double SVTXNumericField::getSpinSize() { SolarMutexGuard aGuard; @@ -1762,7 +1762,7 @@ double SVTXNumericField::getSpinSize() throw(css::uno::RuntimeException, std::ex return pField ? pField->GetSpinSize() : 0; } -void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) { SolarMutexGuard aGuard; @@ -1771,7 +1771,7 @@ void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::Runti pField->SetDecimalDigits( Value ); } -sal_Int16 SVTXNumericField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception) +sal_Int16 SVTXNumericField::getDecimalDigits() { SolarMutexGuard aGuard; @@ -1779,7 +1779,7 @@ sal_Int16 SVTXNumericField::getDecimalDigits() throw(css::uno::RuntimeException, return pField ? pField->GetDecimalDigits() : 0; } -void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) +void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) { SolarMutexGuard aGuard; @@ -1788,7 +1788,7 @@ void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::Runti pField->SetStrictFormat( bStrict ); } -sal_Bool SVTXNumericField::isStrictFormat() throw(css::uno::RuntimeException, std::exception) +sal_Bool SVTXNumericField::isStrictFormat() { SolarMutexGuard aGuard; @@ -1812,7 +1812,7 @@ SVTXCurrencyField::~SVTXCurrencyField() { } -css::uno::Any SVTXCurrencyField::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SVTXCurrencyField::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::awt::XCurrencyField* >(this)), @@ -1826,7 +1826,7 @@ IMPL_XTYPEPROVIDER_START( SVTXCurrencyField ) SVTXFormattedField::getTypes() IMPL_XTYPEPROVIDER_END -void SVTXCurrencyField::setValue( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setValue( double Value ) { SolarMutexGuard aGuard; @@ -1835,7 +1835,7 @@ void SVTXCurrencyField::setValue( double Value ) throw(css::uno::RuntimeExceptio pField->SetValue( Value ); } -double SVTXCurrencyField::getValue() throw(css::uno::RuntimeException, std::exception) +double SVTXCurrencyField::getValue() { SolarMutexGuard aGuard; @@ -1843,7 +1843,7 @@ double SVTXCurrencyField::getValue() throw(css::uno::RuntimeException, std::exce return pField ? pField->GetValue() : 0; } -void SVTXCurrencyField::setMin( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setMin( double Value ) { SolarMutexGuard aGuard; @@ -1852,7 +1852,7 @@ void SVTXCurrencyField::setMin( double Value ) throw(css::uno::RuntimeException, pField->SetMinValue( Value ); } -double SVTXCurrencyField::getMin() throw(css::uno::RuntimeException, std::exception) +double SVTXCurrencyField::getMin() { SolarMutexGuard aGuard; @@ -1860,7 +1860,7 @@ double SVTXCurrencyField::getMin() throw(css::uno::RuntimeException, std::except return pField ? pField->GetMinValue() : 0; } -void SVTXCurrencyField::setMax( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setMax( double Value ) { SolarMutexGuard aGuard; @@ -1869,7 +1869,7 @@ void SVTXCurrencyField::setMax( double Value ) throw(css::uno::RuntimeException, pField->SetMaxValue( Value ); } -double SVTXCurrencyField::getMax() throw(css::uno::RuntimeException, std::exception) +double SVTXCurrencyField::getMax() { SolarMutexGuard aGuard; @@ -1877,7 +1877,7 @@ double SVTXCurrencyField::getMax() throw(css::uno::RuntimeException, std::except return pField ? pField->GetMaxValue() : 0; } -void SVTXCurrencyField::setFirst( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setFirst( double Value ) { SolarMutexGuard aGuard; @@ -1886,7 +1886,7 @@ void SVTXCurrencyField::setFirst( double Value ) throw(css::uno::RuntimeExceptio pField->SetSpinFirst( Value ); } -double SVTXCurrencyField::getFirst() throw(css::uno::RuntimeException, std::exception) +double SVTXCurrencyField::getFirst() { SolarMutexGuard aGuard; @@ -1894,7 +1894,7 @@ double SVTXCurrencyField::getFirst() throw(css::uno::RuntimeException, std::exce return pField ? pField->GetSpinFirst() : 0; } -void SVTXCurrencyField::setLast( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setLast( double Value ) { SolarMutexGuard aGuard; @@ -1903,7 +1903,7 @@ void SVTXCurrencyField::setLast( double Value ) throw(css::uno::RuntimeException pField->SetSpinLast( Value ); } -double SVTXCurrencyField::getLast() throw(css::uno::RuntimeException, std::exception) +double SVTXCurrencyField::getLast() { SolarMutexGuard aGuard; @@ -1911,7 +1911,7 @@ double SVTXCurrencyField::getLast() throw(css::uno::RuntimeException, std::excep return pField ? pField->GetSpinLast() : 0; } -void SVTXCurrencyField::setSpinSize( double Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setSpinSize( double Value ) { SolarMutexGuard aGuard; @@ -1920,7 +1920,7 @@ void SVTXCurrencyField::setSpinSize( double Value ) throw(css::uno::RuntimeExcep pField->SetSpinSize( Value ); } -double SVTXCurrencyField::getSpinSize() throw(css::uno::RuntimeException, std::exception) +double SVTXCurrencyField::getSpinSize() { SolarMutexGuard aGuard; @@ -1928,7 +1928,7 @@ double SVTXCurrencyField::getSpinSize() throw(css::uno::RuntimeException, std::e return pField ? pField->GetSpinSize() : 0; } -void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) { SolarMutexGuard aGuard; @@ -1937,7 +1937,7 @@ void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(css::uno::Runt pField->SetDecimalDigits( Value ); } -sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(css::uno::RuntimeException, std::exception) +sal_Int16 SVTXCurrencyField::getDecimalDigits() { SolarMutexGuard aGuard; @@ -1945,7 +1945,7 @@ sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(css::uno::RuntimeException return pField ? pField->GetDecimalDigits() : 0; } -void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) { SolarMutexGuard aGuard; @@ -1954,7 +1954,7 @@ void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(css::uno::Runt pField->SetStrictFormat( bStrict ); } -sal_Bool SVTXCurrencyField::isStrictFormat() throw(css::uno::RuntimeException, std::exception) +sal_Bool SVTXCurrencyField::isStrictFormat() { SolarMutexGuard aGuard; @@ -1962,7 +1962,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(css::uno::RuntimeException, s return pField && pField->IsStrictFormat(); } -void SVTXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) +void SVTXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value) { SolarMutexGuard aGuard; @@ -1995,7 +1995,7 @@ void SVTXCurrencyField::setProperty( const OUString& PropertyName, const css::un SVTXFormattedField::setProperty(PropertyName, Value); } -css::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SVTXCurrencyField::getProperty( const OUString& PropertyName ) { SolarMutexGuard aGuard; @@ -2100,7 +2100,7 @@ void VCLXProgressBar::ImplUpdateValue() } // css::uno::XInterface -css::uno::Any VCLXProgressBar::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any VCLXProgressBar::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::awt::XProgressBar* >(this)), @@ -2115,7 +2115,7 @@ IMPL_XTYPEPROVIDER_START( VCLXProgressBar ) IMPL_XTYPEPROVIDER_END // css::awt::XProgressBar -void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) +void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) { SolarMutexGuard aGuard; @@ -2127,7 +2127,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(css::uno::Run } } -void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) +void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) { SolarMutexGuard aGuard; @@ -2141,7 +2141,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(css::uno::Run } } -void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception) +void VCLXProgressBar::setValue( sal_Int32 nValue ) { SolarMutexGuard aGuard; @@ -2149,7 +2149,7 @@ void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(css::uno::RuntimeExcept ImplUpdateValue(); } -void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception ) +void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) { SolarMutexGuard aGuard; @@ -2169,7 +2169,7 @@ void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno: ImplUpdateValue(); } -sal_Int32 VCLXProgressBar::getValue() throw(css::uno::RuntimeException, std::exception) +sal_Int32 VCLXProgressBar::getValue() { SolarMutexGuard aGuard; @@ -2177,7 +2177,7 @@ sal_Int32 VCLXProgressBar::getValue() throw(css::uno::RuntimeException, std::exc } // css::awt::VclWindowPeer -void VCLXProgressBar::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) +void VCLXProgressBar::setProperty( const OUString& PropertyName, const css::uno::Any& Value) { SolarMutexGuard aGuard; @@ -2235,7 +2235,7 @@ void VCLXProgressBar::setProperty( const OUString& PropertyName, const css::uno: } } -css::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any VCLXProgressBar::getProperty( const OUString& PropertyName ) { SolarMutexGuard aGuard; @@ -2292,7 +2292,7 @@ SVTXDateField::~SVTXDateField() { } -void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const css::uno::Any& Value ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL SVTXDateField::setProperty( const OUString& PropertyName, const css::uno::Any& Value ) { VCLXDateField::setProperty( PropertyName, Value ); diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index c8cf52487645..b2b882843099 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -82,26 +82,26 @@ public: rtl::Reference<SvMacroTableEventDescriptor> mxEvents; // overriden helpers from PropertySetHelper - virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) override; - virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) throw(UnknownPropertyException, WrappedTargetException ) override; + virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) override; + virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) override; // XInterface - virtual Any SAL_CALL queryAggregation( const Type & rType ) throw(RuntimeException, std::exception) override; - virtual Any SAL_CALL queryInterface( const Type & rType ) throw(RuntimeException, std::exception) override; + virtual Any SAL_CALL queryAggregation( const Type & rType ) override; + virtual Any SAL_CALL queryInterface( const Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes( ) throw(RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes( ) override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XEventsSupplier - virtual Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw(RuntimeException, std::exception) override; + virtual Reference< css::container::XNameReplace > SAL_CALL getEvents( ) 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: static PropertySetInfo* createPropertySetInfo( sal_uInt16 nType ); @@ -299,13 +299,11 @@ IMapObject* SvUnoImageMapObject::createIMapObject() const // XInterface Any SAL_CALL SvUnoImageMapObject::queryInterface( const Type & rType ) - throw( RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } Any SAL_CALL SvUnoImageMapObject::queryAggregation( const Type & rType ) - throw(RuntimeException, std::exception) { Any aAny; @@ -338,7 +336,6 @@ void SAL_CALL SvUnoImageMapObject::release() throw() } uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes() - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 7 ); uno::Type* pTypes = aTypes.getArray(); @@ -355,19 +352,17 @@ uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL SvUnoImageMapObject::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames() - throw(RuntimeException, std::exception) { Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = "com.sun.star.image.ImageMapObject"; @@ -387,7 +382,7 @@ Sequence< OUString > SAL_CALL SvUnoImageMapObject::getSupportedServiceNames() return aSNS; } -OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL SvUnoImageMapObject::getImplementationName() { switch( mnType ) { @@ -403,7 +398,6 @@ OUString SAL_CALL SvUnoImageMapObject::getImplementationName() throw(RuntimeExce // overriden helpers from PropertySetHelper void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) { bool bOk = false; @@ -455,7 +449,6 @@ void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries } void SvUnoImageMapObject::_getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValues ) - throw(UnknownPropertyException, WrappedTargetException ) { while( *ppEntries ) { @@ -503,7 +496,6 @@ void SvUnoImageMapObject::_getPropertyValues( const PropertyMapEntry** ppEntries Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents() - throw( RuntimeException, std::exception ) { return mxEvents.get(); } @@ -517,29 +509,29 @@ public: bool fillImageMap( ImageMap& rMap ) const; /// @throws IllegalArgumentException - static SvUnoImageMapObject* getObject( const Any& aElement ) throw( IllegalArgumentException ); + static SvUnoImageMapObject* getObject( const Any& aElement ); UNO3_GETIMPLEMENTATION_DECL( SvUnoImageMap ) // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element ) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const Any& Element ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 Index ) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element ) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const Any& Element ) 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; // 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; // XSerivceInfo - 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: OUString maName; @@ -567,7 +559,6 @@ SvUnoImageMap::SvUnoImageMap( const ImageMap& rMap, const SvEventDescription* pS } SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement ) - throw( IllegalArgumentException ) { Reference< XInterface > xObject; aElement >>= xObject; @@ -581,7 +572,6 @@ SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement ) // XIndexContainer void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32 nIndex, const Any& Element ) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { SvUnoImageMapObject* pObject = getObject( Element ); const sal_Int32 nCount = maObjectList.size(); @@ -598,7 +588,7 @@ void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32 nIndex, const Any& Element } } -void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 nIndex ) { const sal_Int32 nCount = maObjectList.size(); if( nIndex >= nCount ) @@ -617,7 +607,7 @@ void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 nIndex ) throw(IndexOutOfB } // XIndexReplace -void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 nIndex, const Any& Element ) throw(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 nIndex, const Any& Element ) { SvUnoImageMapObject* pObject = getObject( Element ); const sal_Int32 nCount = maObjectList.size(); @@ -630,12 +620,12 @@ void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 nIndex, const Any& Elemen } // XIndexAccess -sal_Int32 SAL_CALL SvUnoImageMap::getCount( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL SvUnoImageMap::getCount( ) { return maObjectList.size(); } -Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 nIndex ) { const sal_Int32 nCount = maObjectList.size(); if( nIndex >= nCount ) @@ -649,31 +639,28 @@ Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 nIndex ) throw(IndexOutOfBound } // XElementAccess -Type SAL_CALL SvUnoImageMap::getElementType( ) throw(RuntimeException, std::exception) +Type SAL_CALL SvUnoImageMap::getElementType( ) { return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SAL_CALL SvUnoImageMap::hasElements( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL SvUnoImageMap::hasElements( ) { return (!maObjectList.empty()); } // XSerivceInfo OUString SAL_CALL SvUnoImageMap::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString( "org.openoffice.comp.svt.SvUnoImageMap" ); } sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL SvUnoImageMap::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { const OUString aSN( "com.sun.star.image.ImageMap" ); return Sequence< OUString >( &aSN, 1 ); diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 492bbb9c0d27..d4977cfe456d 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -96,37 +96,37 @@ namespace { explicit Wizard( const css::uno::Reference< css::uno::XComponentContext >& i_rContext ); // lang::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; // beans::XPropertySet - virtual css::uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // ui::dialogs::XWizard - virtual OUString SAL_CALL getHelpURL() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpURL( const OUString& _helpurl ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< awt::XWindow > SAL_CALL getDialogWindow() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< ui::dialogs::XWizardPage > SAL_CALL getCurrentPage( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultButton( ::sal_Int16 WizardButton ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL travelNext( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL travelPrevious( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enablePage( ::sal_Int16 PageID, sal_Bool Enable ) throw (container::NoSuchElementException, util::InvalidStateException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTravelUI( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL advanceTo( ::sal_Int16 PageId ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL goBackTo( ::sal_Int16 PageId ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, sal_Bool Final ) throw (container::NoSuchElementException, util::InvalidStateException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getHelpURL() override; + virtual void SAL_CALL setHelpURL( const OUString& _helpurl ) override; + virtual css::uno::Reference< awt::XWindow > SAL_CALL getDialogWindow() override; + virtual css::uno::Reference< ui::dialogs::XWizardPage > SAL_CALL getCurrentPage( ) override; + virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, sal_Bool Enable ) override; + virtual void SAL_CALL setDefaultButton( ::sal_Int16 WizardButton ) override; + virtual sal_Bool SAL_CALL travelNext( ) override; + virtual sal_Bool SAL_CALL travelPrevious( ) override; + virtual void SAL_CALL enablePage( ::sal_Int16 PageID, sal_Bool Enable ) override; + virtual void SAL_CALL updateTravelUI( ) override; + virtual sal_Bool SAL_CALL advanceTo( ::sal_Int16 PageId ) override; + virtual sal_Bool SAL_CALL goBackTo( ::sal_Int16 PageId ) override; + virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, sal_Bool Final ) 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; // 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; protected: virtual ~Wizard() override; @@ -224,7 +224,7 @@ namespace { } - void SAL_CALL Wizard::initialize( const Sequence< Any >& i_Arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL Wizard::initialize( const Sequence< Any >& i_Arguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) @@ -273,20 +273,20 @@ namespace { return pDialog.get(); } - OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL Wizard::getImplementationName() { return OUString("com.sun.star.comp.svtools.uno.Wizard"); } - Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames() { Sequence< OUString > aServices { "com.sun.star.ui.dialogs.Wizard" }; return aServices; } - Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } @@ -306,7 +306,7 @@ namespace { } - OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException, std::exception) + OUString SAL_CALL Wizard::getHelpURL() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -318,7 +318,7 @@ namespace { } - void SAL_CALL Wizard::setHelpURL( const OUString& i_HelpURL ) throw (RuntimeException, std::exception) + void SAL_CALL Wizard::setHelpURL( const OUString& i_HelpURL ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -330,7 +330,7 @@ namespace { } - Reference< XWindow > SAL_CALL Wizard::getDialogWindow() throw (RuntimeException, std::exception) + Reference< XWindow > SAL_CALL Wizard::getDialogWindow() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -340,7 +340,7 @@ namespace { } - void SAL_CALL Wizard::enableButton( ::sal_Int16 i_WizardButton, sal_Bool i_Enable ) throw (RuntimeException, std::exception) + void SAL_CALL Wizard::enableButton( ::sal_Int16 i_WizardButton, sal_Bool i_Enable ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -352,7 +352,7 @@ namespace { } - void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) throw (RuntimeException, std::exception) + void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -364,7 +364,7 @@ namespace { } - sal_Bool SAL_CALL Wizard::travelNext( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL Wizard::travelNext( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -376,7 +376,7 @@ namespace { } - sal_Bool SAL_CALL Wizard::travelPrevious( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL Wizard::travelPrevious( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -388,7 +388,7 @@ namespace { } - void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, sal_Bool i_Enable ) throw (NoSuchElementException, InvalidStateException, RuntimeException, std::exception) + void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, sal_Bool i_Enable ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -406,7 +406,7 @@ namespace { } - void SAL_CALL Wizard::updateTravelUI( ) throw (RuntimeException, std::exception) + void SAL_CALL Wizard::updateTravelUI( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -418,7 +418,7 @@ namespace { } - sal_Bool SAL_CALL Wizard::advanceTo( ::sal_Int16 i_PageId ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL Wizard::advanceTo( ::sal_Int16 i_PageId ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -430,7 +430,7 @@ namespace { } - sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -442,7 +442,7 @@ namespace { } - Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage( ) throw (RuntimeException, std::exception) + Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -454,7 +454,7 @@ namespace { } - void SAL_CALL Wizard::activatePath( ::sal_Int16 i_PathIndex, sal_Bool i_Final ) throw (NoSuchElementException, InvalidStateException, RuntimeException, std::exception) + void SAL_CALL Wizard::activatePath( ::sal_Int16 i_PathIndex, sal_Bool i_Final ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -469,14 +469,14 @@ namespace { } - void SAL_CALL Wizard::setTitle( const OUString& i_Title ) throw (RuntimeException, std::exception) + void SAL_CALL Wizard::setTitle( const OUString& i_Title ) { // simply disambiguate Wizard_Base::OGenericUnoDialog::setTitle( i_Title ); } - ::sal_Int16 SAL_CALL Wizard::execute( ) throw (RuntimeException, std::exception) + ::sal_Int16 SAL_CALL Wizard::execute( ) { return Wizard_Base::OGenericUnoDialog::execute(); } |