diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
| commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
| tree | bcce66b27261553c308779f3e8663a269ed3a671 /toolkit/source/controls | |
| parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) | |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'toolkit/source/controls')
33 files changed, 1142 insertions, 1274 deletions
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 33e99cebdd3e..9be20827f287 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -118,21 +118,21 @@ namespace toolkit } - sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount( ) { // we do not have children return 0; } - Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) { // we do not have children throw IndexOutOfBoundsException(); } - Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent( ) { OContextEntryGuard aGuard( this ); OSL_ENSURE( implGetForeignControlledParent().is(), "OAccessibleControlContext::getAccessibleParent: somebody forgot to set a parent!" ); @@ -142,33 +142,33 @@ namespace toolkit } - sal_Int16 SAL_CALL OAccessibleControlContext::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL OAccessibleControlContext::getAccessibleRole( ) { return AccessibleRole::SHAPE; } - OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription( ) { OContextEntryGuard aGuard( this ); return getModelStringProperty( "HelpText" ); } - OUString SAL_CALL OAccessibleControlContext::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OAccessibleControlContext::getAccessibleName( ) { OContextEntryGuard aGuard( this ); return getModelStringProperty( "Name" ); } - Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet( ) { return nullptr; } - Reference< XAccessibleStateSet > SAL_CALL OAccessibleControlContext::getAccessibleStateSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleStateSet > SAL_CALL OAccessibleControlContext::getAccessibleStateSet( ) { ::osl::MutexGuard aGuard( GetMutex() ); // no OContextEntryGuard here, as we do not want to throw an exception in case we're not alive anymore @@ -188,7 +188,7 @@ namespace toolkit } - void SAL_CALL OAccessibleControlContext::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception ) + void SAL_CALL OAccessibleControlContext::disposing( const EventObject& _rSource ) { OSL_ENSURE( Reference< XPropertySet >( _rSource.Source, UNO_QUERY ).get() == m_xControlModel.get(), "OAccessibleControlContext::disposing: where did this come from?" ); @@ -237,7 +237,7 @@ namespace toolkit } - awt::Rectangle OAccessibleControlContext::implGetBounds( ) throw (RuntimeException) + awt::Rectangle OAccessibleControlContext::implGetBounds( ) { SolarMutexGuard aSolarGuard; // want to do some VCL stuff here ... @@ -297,20 +297,20 @@ namespace toolkit } - Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ ) { // no children at all return nullptr; } - void SAL_CALL OAccessibleControlContext::grabFocus( ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleControlContext::grabFocus( ) { OSL_FAIL( "OAccessibleControlContext::grabFocus: !isFocusTraversable, but grabFocus!" ); } - sal_Int32 SAL_CALL OAccessibleControlContext::getForeground( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleControlContext::getForeground( ) { SolarMutexGuard aSolarGuard; // want to do some VCL stuff here ... @@ -336,7 +336,7 @@ namespace toolkit } - sal_Int32 SAL_CALL OAccessibleControlContext::getBackground( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleControlContext::getBackground( ) { SolarMutexGuard aSolarGuard; // want to do some VCL stuff here ... diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 3a461083fa79..f50761cae167 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -57,26 +57,26 @@ public: OUString GetComponentServiceName() override; // XAnimation - virtual void SAL_CALL startAnimation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stopAnimation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAnimationRunning( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startAnimation( ) override; + virtual void SAL_CALL stopAnimation( ) override; + virtual sal_Bool SAL_CALL isAnimationRunning( ) override; // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName( ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XControl - sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& i_rModel ) throw ( css::uno::RuntimeException, std::exception ) override; - void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& i_toolkit, const css::uno::Reference< css::awt::XWindowPeer >& i_parentPeer ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& i_rModel ) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& i_toolkit, const css::uno::Reference< css::awt::XWindowPeer >& i_parentPeer ) 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& i_event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override; }; AnimatedImagesControl::AnimatedImagesControl() @@ -91,7 +91,7 @@ public: } - void SAL_CALL AnimatedImagesControl::startAnimation( ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControl::startAnimation( ) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); if ( xAnimation.is() ) @@ -99,7 +99,7 @@ public: } - void SAL_CALL AnimatedImagesControl::stopAnimation( ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControl::stopAnimation( ) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); if ( xAnimation.is() ) @@ -107,7 +107,7 @@ public: } - sal_Bool SAL_CALL AnimatedImagesControl::isAnimationRunning( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AnimatedImagesControl::isAnimationRunning( ) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); if ( xAnimation.is() ) @@ -116,13 +116,13 @@ public: } - OUString SAL_CALL AnimatedImagesControl::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL AnimatedImagesControl::getImplementationName( ) { return OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" ); } - Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() { Sequence< OUString > aServices( AnimatedImagesControl_Base::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); @@ -146,7 +146,7 @@ public: } - sal_Bool SAL_CALL AnimatedImagesControl::setModel( const Reference< XControlModel >& i_rModel ) throw ( RuntimeException, std::exception ) + sal_Bool SAL_CALL AnimatedImagesControl::setModel( const Reference< XControlModel >& i_rModel ) { const Reference< XAnimatedImages > xOldContainer( getModel(), UNO_QUERY ); const Reference< XAnimatedImages > xNewContainer( i_rModel, UNO_QUERY ); @@ -166,7 +166,7 @@ public: } - void SAL_CALL AnimatedImagesControl::createPeer( const Reference< XToolkit >& i_toolkit, const Reference< XWindowPeer >& i_parentPeer ) throw(RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControl::createPeer( const Reference< XToolkit >& i_toolkit, const Reference< XWindowPeer >& i_parentPeer ) { AnimatedImagesControl_Base::createPeer( i_toolkit, i_parentPeer ); @@ -174,7 +174,7 @@ public: } - void SAL_CALL AnimatedImagesControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControl::elementInserted( const ContainerEvent& i_event ) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); if ( xPeerListener.is() ) @@ -182,7 +182,7 @@ public: } - void SAL_CALL AnimatedImagesControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControl::elementRemoved( const ContainerEvent& i_event ) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); if ( xPeerListener.is() ) @@ -190,7 +190,7 @@ public: } - void SAL_CALL AnimatedImagesControl::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControl::elementReplaced( const ContainerEvent& i_event ) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); if ( xPeerListener.is() ) @@ -198,7 +198,7 @@ public: } - void SAL_CALL AnimatedImagesControl::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControl::disposing( const EventObject& i_event ) { UnoControlBase::disposing( i_event ); } @@ -275,26 +275,26 @@ namespace toolkit { } - Reference< css::beans::XPropertySetInfo > SAL_CALL AnimatedImagesControlModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< css::beans::XPropertySetInfo > SAL_CALL AnimatedImagesControlModel::getPropertySetInfo( ) { static Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - OUString SAL_CALL AnimatedImagesControlModel::getServiceName() throw(RuntimeException, std::exception) + OUString SAL_CALL AnimatedImagesControlModel::getServiceName() { return OUString("com.sun.star.awt.AnimatedImagesControlModel"); } - OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) { return OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel"); } - Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.awt.AnimatedImagesControlModel"; @@ -303,7 +303,7 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 i_handle, const Any& i_value ) throw (Exception, std::exception) + void SAL_CALL AnimatedImagesControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 i_handle, const Any& i_value ) { switch ( i_handle ) { @@ -361,7 +361,7 @@ namespace toolkit { } - ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getStepTime() throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getStepTime() { sal_Int32 nStepTime( 100 ); OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_STEP_TIME ) ) >>= nStepTime ); @@ -369,13 +369,13 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::setStepTime( ::sal_Int32 i_stepTime ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControlModel::setStepTime( ::sal_Int32 i_stepTime ) { setPropertyValue( GetPropertyName( BASEPROPERTY_STEP_TIME ), makeAny( i_stepTime ) ); } - sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat() { bool bAutoRepeat( true ); OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ) ) >>= bAutoRepeat ); @@ -383,13 +383,13 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::setAutoRepeat( sal_Bool i_autoRepeat ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControlModel::setAutoRepeat( sal_Bool i_autoRepeat ) { setPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ), makeAny( i_autoRepeat ) ); } - ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode() throw (RuntimeException, std::exception) + ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode() { sal_Int16 nImageScaleMode( ImageScaleMode::ANISOTROPIC ); OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ) ) >>= nImageScaleMode ); @@ -397,13 +397,13 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::setScaleMode( ::sal_Int16 i_scaleMode ) throw (IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControlModel::setScaleMode( ::sal_Int16 i_scaleMode ) { setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ), makeAny( i_scaleMode ) ); } - ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getImageSetCount( ) throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getImageSetCount( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( GetBroadcastHelper().bDisposed || GetBroadcastHelper().bInDispose ) @@ -413,7 +413,7 @@ namespace toolkit { } - Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( GetBroadcastHelper().bDisposed || GetBroadcastHelper().bInDispose ) @@ -425,7 +425,7 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // sanity checks @@ -442,7 +442,7 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // sanity checks @@ -459,7 +459,7 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::removeImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControlModel::removeImageSet( ::sal_Int32 i_index ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // sanity checks @@ -478,13 +478,13 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener ) { BrdcstHelper.addListener( cppu::UnoType<XContainerListener>::get(), i_listener ); } - void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) { BrdcstHelper.removeListener( cppu::UnoType<XContainerListener>::get(), i_listener ); } diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 1294f41cef3f..5f88ae38faae 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -258,7 +258,7 @@ Any ControlModelContainerBase::ImplGetDefaultValue( sal_uInt16 nPropId ) const return *pHelper; } -void SAL_CALL ControlModelContainerBase::dispose( ) throw(RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::dispose( ) { // tell our listeners @@ -296,7 +296,7 @@ void SAL_CALL ControlModelContainerBase::dispose( ) throw(RuntimeException, std } // XMultiPropertySet -Reference< XPropertySetInfo > ControlModelContainerBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > ControlModelContainerBase::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -324,7 +324,7 @@ ControlModelContainerBase::UnoControlModelHolderList::iterator ControlModelConta } // ::XMultiServiceFactory -Reference< XInterface > ControlModelContainerBase::createInstance( const OUString& aServiceSpecifier ) throw(Exception, RuntimeException, std::exception) +Reference< XInterface > ControlModelContainerBase::createInstance( const OUString& aServiceSpecifier ) { SolarMutexGuard aGuard; @@ -411,7 +411,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const OUStrin return xNewModel; } -Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& i_arguments ) throw(Exception, RuntimeException, std::exception) +Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& i_arguments ) { const Reference< XInterface > xInstance( createInstance( ServiceSpecifier ) ); const Reference< XInitialization > xInstanceInit( xInstance, UNO_QUERY ); @@ -420,7 +420,7 @@ Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( return xInstance; } -Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw(RuntimeException, std::exception) +Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() { static Sequence< OUString >* pNamesSeq = nullptr; if ( !pNamesSeq ) @@ -454,30 +454,30 @@ Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw } // XContainer -void ControlModelContainerBase::addContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception) +void ControlModelContainerBase::addContainerListener( const Reference< XContainerListener >& l ) { maContainerListeners.addInterface( l ); } -void ControlModelContainerBase::removeContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception) +void ControlModelContainerBase::removeContainerListener( const Reference< XContainerListener >& l ) { maContainerListeners.removeInterface( l ); } // XElementAcces -Type ControlModelContainerBase::getElementType() throw(RuntimeException, std::exception) +Type ControlModelContainerBase::getElementType() { Type aType = cppu::UnoType<XControlModel>::get(); return aType; } -sal_Bool ControlModelContainerBase::hasElements() throw(RuntimeException, std::exception) +sal_Bool ControlModelContainerBase::hasElements() { return !maModels.empty(); } // XNameContainer, XNameReplace, XNameAccess -void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& aElement ) { SolarMutexGuard aGuard; @@ -523,7 +523,7 @@ void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& implNotifyTabModelChange( aName ); } -Any ControlModelContainerBase::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any ControlModelContainerBase::getByName( const OUString& aName ) { UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName ); if ( maModels.end() == aElementPos ) @@ -532,7 +532,7 @@ Any ControlModelContainerBase::getByName( const OUString& aName ) throw(NoSuchEl return makeAny( aElementPos->first ); } -Sequence< OUString > ControlModelContainerBase::getElementNames() throw(RuntimeException, std::exception) +Sequence< OUString > ControlModelContainerBase::getElementNames() { Sequence< OUString > aNames( maModels.size() ); @@ -546,12 +546,12 @@ Sequence< OUString > ControlModelContainerBase::getElementNames() throw(RuntimeE return aNames; } -sal_Bool ControlModelContainerBase::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) +sal_Bool ControlModelContainerBase::hasByName( const OUString& aName ) { return maModels.end() != ImplFindElement( aName ); } -void ControlModelContainerBase::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) +void ControlModelContainerBase::insertByName( const OUString& aName, const Any& aElement ) { SolarMutexGuard aGuard; @@ -614,7 +614,7 @@ void ControlModelContainerBase::insertByName( const OUString& aName, const Any& implNotifyTabModelChange( aName ); } -void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +void ControlModelContainerBase::removeByName( const OUString& aName ) { SolarMutexGuard aGuard; @@ -659,19 +659,19 @@ void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSu } -sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl( ) { return true; } -void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) { SAL_WARN("toolkit", "explicit grouping not supported" ); } -void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Reference< XControlModel > >& _rControls ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Reference< XControlModel > >& _rControls ) { SolarMutexGuard aGuard; @@ -708,7 +708,7 @@ void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Refer typedef ::std::multimap< sal_Int32, Reference< XControlModel > > MapIndexToModel; -Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels( ) throw (RuntimeException, std::exception) +Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels( ) { SolarMutexGuard aGuard; @@ -757,7 +757,7 @@ Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getCo } -void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& ) { // not supported. We have only implicit grouping: // We only have a sequence of control models, and we _know_ (yes, that's a HACK relying on @@ -767,7 +767,7 @@ void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XC } ////----- XInitialization ------------------------------------------------------------------- -void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) { if ( rArguments.getLength() == 1 ) { @@ -779,19 +779,19 @@ void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArgum else m_nTabPageId = -1; } -::sal_Int16 SAL_CALL ControlModelContainerBase::getTabPageID() throw (css::uno::RuntimeException, std::exception) +::sal_Int16 SAL_CALL ControlModelContainerBase::getTabPageID() { return m_nTabPageId; } -sal_Bool SAL_CALL ControlModelContainerBase::getEnabled() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ControlModelContainerBase::getEnabled() { return m_bEnabled; } -void SAL_CALL ControlModelContainerBase::setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setEnabled( sal_Bool _enabled ) { m_bEnabled = _enabled; } -OUString SAL_CALL ControlModelContainerBase::getTitle() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ControlModelContainerBase::getTitle() { SolarMutexGuard aGuard; Reference<XPropertySet> xThis(*this,UNO_QUERY); @@ -799,25 +799,25 @@ OUString SAL_CALL ControlModelContainerBase::getTitle() throw (css::uno::Runtime xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle; return sTitle; } -void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) { SolarMutexGuard aGuard; Reference<XPropertySet> xThis(*this,UNO_QUERY); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),makeAny(_title)); } -OUString SAL_CALL ControlModelContainerBase::getImageURL() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ControlModelContainerBase::getImageURL() { return m_sImageURL; } -void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl ) { m_sImageURL = _imageurl; } -OUString SAL_CALL ControlModelContainerBase::getToolTip() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ControlModelContainerBase::getToolTip() { return m_sTooltip; } -void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) { m_sTooltip = _tooltip; } @@ -849,7 +849,7 @@ namespace } -sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount( ) { SolarMutexGuard aGuard; @@ -859,7 +859,7 @@ sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount( ) throw (RuntimeEx } -void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, OUString& _rName ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, OUString& _rName ) { SolarMutexGuard aGuard; @@ -883,7 +883,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< } -void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) { SolarMutexGuard aGuard; @@ -892,13 +892,13 @@ void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, } -void SAL_CALL ControlModelContainerBase::addChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::addChangesListener( const Reference< XChangesListener >& _rxListener ) { maChangeListeners.addInterface( _rxListener ); } -void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< XChangesListener >& _rxListener ) { maChangeListeners.removeInterface( _rxListener ); } @@ -1028,7 +1028,7 @@ void ControlModelContainerBase::implUpdateGroupStructure() } -void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEvent& _rEvent ) { SolarMutexGuard aGuard; @@ -1054,7 +1054,7 @@ void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEve } -void SAL_CALL ControlModelContainerBase::disposing( const EventObject& /*rEvent*/ ) throw (RuntimeException, std::exception) +void SAL_CALL ControlModelContainerBase::disposing( const EventObject& /*rEvent*/ ) { } @@ -1104,7 +1104,6 @@ ResourceListener::~ResourceListener() // XInterface Any SAL_CALL ResourceListener::queryInterface( const Type& rType ) -throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -1210,7 +1209,6 @@ void ResourceListener::stopListening() // XModifyListener void SAL_CALL ResourceListener::modified( const lang::EventObject& aEvent ) -throw ( RuntimeException, std::exception ) { Reference< util::XModifyListener > xListener; @@ -1239,7 +1237,6 @@ throw ( RuntimeException, std::exception ) // XEventListener void SAL_CALL ResourceListener::disposing( const EventObject& Source ) -throw ( RuntimeException, std::exception ) { Reference< lang::XEventListener > xListener; Reference< resource::XStringResourceResolver > xResource; @@ -1328,7 +1325,7 @@ ControlContainerBase::~ControlContainerBase() { } -void ControlContainerBase::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) +void ControlContainerBase::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { SolarMutexGuard aGuard; UnoControlContainer::createPeer( rxToolkit, rParentPeer ); @@ -1431,7 +1428,7 @@ void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl ) xW->setPosSize( nX, nY, nWidth, nHeight, PosSize::POSSIZE ); } -void ControlContainerBase::dispose() throw(RuntimeException, std::exception) +void ControlContainerBase::dispose() { EventObject aEvt; aEvt.Source = static_cast< ::cppu::OWeakObject* >( this ); @@ -1451,12 +1448,11 @@ void ControlContainerBase::dispose() throw(RuntimeException, std::exception) void SAL_CALL ControlContainerBase::disposing( const EventObject& Source ) -throw(RuntimeException, std::exception) { UnoControlContainer::disposing( Source ); } -sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception) +sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxModel ) { SolarMutexGuard aGuard; @@ -1529,7 +1525,7 @@ sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxMod return bRet; } -void ControlContainerBase::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exception) +void ControlContainerBase::setDesignMode( sal_Bool bOn ) { SolarMutexGuard aGuard; @@ -1548,7 +1544,7 @@ void ControlContainerBase::setDesignMode( sal_Bool bOn ) throw(RuntimeException, mxTabController->activateTabOrder(); } -void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw(RuntimeException, std::exception) +void ControlContainerBase::elementInserted( const ContainerEvent& Event ) { SolarMutexGuard aGuard; @@ -1572,7 +1568,7 @@ void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw( } } -void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException, std::exception) +void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) { SolarMutexGuard aGuard; @@ -1593,7 +1589,7 @@ void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(R } } -void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException, std::exception) +void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) { SolarMutexGuard aGuard; @@ -1633,7 +1629,7 @@ void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw( } // XPropertiesChangeListener -void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception) +void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) { if( !isDesignMode() && !mbCreatingCompatiblePeer ) { @@ -1712,7 +1708,7 @@ void ControlContainerBase::removingControl( const Reference< XControl >& _rxCont } -void SAL_CALL ControlContainerBase::changesOccurred( const ChangesEvent& ) throw (RuntimeException, std::exception) +void SAL_CALL ControlContainerBase::changesOccurred( const ChangesEvent& ) { SolarMutexGuard aGuard; // a tab controller model may have changed @@ -1840,7 +1836,7 @@ OUString getPhysicalLocation( const css::uno::Any& rbase, const css::uno::Any& r } void -ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const css::uno::Reference< css::awt::XControlModel >& xTarget ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const OUString& aName, ChildOperation Operation, const css::uno::Reference< css::awt::XControlModel >& xTarget ) { if ( Operation < Insert || Operation > Remove ) throw IllegalArgumentException(); diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index e13026c91413..ba0d503e6231 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -81,7 +81,7 @@ class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNam ::osl::Mutex m_aMutex; public: // css::container::XNameContainer, XNameReplace, XNameAccess - virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -91,24 +91,24 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override + virtual Any SAL_CALL getByName( const OUString& aName ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); return uno::makeAny( things[ aName ] ); } - virtual Sequence< OUString > SAL_CALL getElementNames( ) throw(RuntimeException, std::exception) override + virtual Sequence< OUString > SAL_CALL getElementNames( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return comphelper::mapKeysToSequence( things ); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { ::osl::MutexGuard aGuard( m_aMutex ); return ( things.find( aName ) != things.end() ); } - virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -118,18 +118,18 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override + virtual void SAL_CALL removeByName( const OUString& aName ) override { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); things.erase( things.find( aName ) ); } - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override + virtual Type SAL_CALL getElementType( ) override { return cppu::UnoType<T>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return ( !things.empty() ); @@ -145,25 +145,23 @@ protected: css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const override; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // ::cppu::OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; public: explicit UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlDialogModel( const UnoControlDialogModel& rModel ); UnoControlModel* Clone() const override; // css::beans::XMultiPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // css::io::XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getServiceName() override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("stardiv.Toolkit.UnoControlDialogModel"); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { auto s(ControlModelContainerBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -236,7 +234,7 @@ UnoControlModel* UnoControlDialogModel::Clone() const } -OUString UnoControlDialogModel::getServiceName( ) throw(RuntimeException, std::exception) +OUString UnoControlDialogModel::getServiceName( ) { return OUString("stardiv.vcl.controlmodel.Dialog"); } @@ -275,13 +273,13 @@ Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // XMultiPropertySet -Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) +void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) { ControlModelContainerBase::setFastPropertyValue_NoBroadcast( nHandle, rValue ); try @@ -329,7 +327,7 @@ OUString UnoDialogControl::GetComponentServiceName() return OUString("TabPage"); } -void UnoDialogControl::dispose() throw(RuntimeException, std::exception) +void UnoDialogControl::dispose() { SolarMutexGuard aGuard; @@ -341,12 +339,11 @@ void UnoDialogControl::dispose() throw(RuntimeException, std::exception) void SAL_CALL UnoDialogControl::disposing( const EventObject& Source ) -throw(RuntimeException, std::exception) { ControlContainerBase::disposing( Source ); } -sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception) +sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) { // #Can we move all the Resource stuff to the ControlContainerBase ? SolarMutexGuard aGuard; @@ -355,7 +352,7 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) return bRet; } -void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) +void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { SolarMutexGuard aGuard; @@ -385,19 +382,16 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons } OUString UnoDialogControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoDialogControl"); } sal_Bool UnoDialogControl::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> UnoDialogControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ OUString::createFromAscii(szServiceName2_UnoControlDialog), @@ -435,7 +429,7 @@ void UnoDialogControl::PrepareWindowDescriptor( css::awt::WindowDescriptor& rDes } } -void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException, std::exception) +void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) { maTopWindowListeners.addInterface( rxListener ); if( getPeer().is() && maTopWindowListeners.getLength() == 1 ) @@ -445,7 +439,7 @@ void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener } } -void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException, std::exception) +void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListener >& rxListener ) { if( getPeer().is() && maTopWindowListeners.getLength() == 1 ) { @@ -455,7 +449,7 @@ void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListe maTopWindowListeners.removeInterface( rxListener ); } -void UnoDialogControl::toFront( ) throw (RuntimeException, std::exception) +void UnoDialogControl::toFront( ) { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -466,7 +460,7 @@ void UnoDialogControl::toFront( ) throw (RuntimeException, std::exception) } } -void UnoDialogControl::toBack( ) throw (RuntimeException, std::exception) +void UnoDialogControl::toBack( ) { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -477,7 +471,7 @@ void UnoDialogControl::toBack( ) throw (RuntimeException, std::exception) } } -void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) throw (RuntimeException, std::exception) +void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) { SolarMutexGuard aGuard; mxMenuBar = rxMenuBar; @@ -495,7 +489,6 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize } // css::awt::XWindowListener void SAL_CALL UnoDialogControl::windowResized( const css::awt::WindowEvent& e ) -throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -536,7 +529,6 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL UnoDialogControl::windowMoved( const css::awt::WindowEvent& e ) -throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -561,43 +553,43 @@ throw (css::uno::RuntimeException, std::exception) } } -void SAL_CALL UnoDialogControl::windowShown( const EventObject& e ) throw (RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::windowShown( const EventObject& e ) { (void)e; } -void SAL_CALL UnoDialogControl::windowHidden( const EventObject& e ) throw (RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::windowHidden( const EventObject& e ) { (void)e; } -void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) throw (RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) { Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY ); if ( xPeerDialog.is() ) xPeerDialog->endDialog( i_result ); } -void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id ) throw (RuntimeException, std::exception) +void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id ) { Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY ); if ( xPeerDialog.is() ) xPeerDialog->setHelpId( i_id ); } -void UnoDialogControl::setTitle( const OUString& Title ) throw(RuntimeException, std::exception) +void UnoDialogControl::setTitle( const OUString& Title ) { SolarMutexGuard aGuard; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ), uno::Any(Title), true ); } -OUString UnoDialogControl::getTitle() throw(RuntimeException, std::exception) +OUString UnoDialogControl::getTitle() { SolarMutexGuard aGuard; return ImplGetPropertyValue_UString( BASEPROPERTY_TITLE ); } -sal_Int16 UnoDialogControl::execute() throw(RuntimeException, std::exception) +sal_Int16 UnoDialogControl::execute() { SolarMutexGuard aGuard; sal_Int16 nDone = -1; @@ -614,7 +606,7 @@ sal_Int16 UnoDialogControl::execute() throw(RuntimeException, std::exception) return nDone; } -void UnoDialogControl::endExecute() throw(RuntimeException, std::exception) +void UnoDialogControl::endExecute() { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -631,12 +623,11 @@ void UnoDialogControl::endExecute() throw(RuntimeException, std::exception) // XModifyListener void SAL_CALL UnoDialogControl::modified( const lang::EventObject& /*rEvent*/ ) -throw (RuntimeException, std::exception) { ImplUpdateResourceResolver(); } -void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception) +void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) { sal_Int32 nLen = rEvents.getLength(); for( sal_Int32 i = 0; i < nLen; i++ ) @@ -680,29 +671,29 @@ UnoMultiPageControl::~UnoMultiPageControl() } // XTabListener -void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 ) { } -void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 ) { } void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32, - SAL_UNUSED_PARAMETER const Sequence< NamedValue >& ) throw (RuntimeException, std::exception) + SAL_UNUSED_PARAMETER const Sequence< NamedValue >& ) { } -void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), false ); } -void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) { } -void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) { } -void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -711,7 +702,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::excep } // css::awt::XSimpleTabController -::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -719,7 +710,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::excep return xMultiPage->insertTab(); } -void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -727,7 +718,7 @@ void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOf xMultiPage->removeTab( ID ); } -void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -735,7 +726,7 @@ void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< xMultiPage->setTabProps( ID, Properties ); } -Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -743,7 +734,7 @@ Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID return xMultiPage->getTabProps( ID ); } -void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -753,7 +744,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOut } -::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -761,7 +752,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOut return xMultiPage->getActiveTabID(); } -void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener >& Listener ) { maTabListeners.addInterface( Listener ); Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); @@ -769,7 +760,7 @@ void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener xMultiPage->addTabListener( &maTabListeners ); } -void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( xMultiPage.is() && maTabListeners.getLength() == 1 ) @@ -786,7 +777,7 @@ IMPL_XTYPEPROVIDER_START( UnoMultiPageControl ) IMPL_XTYPEPROVIDER_END // uno::XInterface -uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XTabListener* >(this)), (static_cast< awt::XSimpleTabController* >(this)) ); @@ -824,7 +815,7 @@ void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxCo } -void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) +void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { SolarMutexGuard aSolarGuard; @@ -914,7 +905,7 @@ UnoMultiPageModel::Clone() const return pClone; } -OUString UnoMultiPageModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoMultiPageModel::getServiceName() { return OUString( "com.sun.star.awt.UnoMultiPageModel" ); } @@ -940,13 +931,13 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) +void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement ) { Reference< XServiceInfo > xInfo; aElement >>= xInfo; @@ -962,7 +953,7 @@ void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement } -sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) { return true; } @@ -1032,7 +1023,7 @@ UnoPageModel::Clone() const return pClone; } -OUString UnoPageModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoPageModel::getServiceName() { return OUString( "com.sun.star.awt.UnoPageModel" ); } @@ -1058,14 +1049,14 @@ uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) { return false; } @@ -1195,7 +1186,7 @@ UnoFrameModel::Clone() const return pClone; } -OUString UnoFrameModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoFrameModel::getServiceName() { return OUString( "com.sun.star.awt.UnoFrameModel" ); } @@ -1234,7 +1225,7 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index 4687c7314793..a64f8094b07b 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -42,13 +42,11 @@ namespace toolkit // Methods XElementAccess Type ScriptEventContainer::getElementType() - throw(RuntimeException, std::exception) { return mType; } sal_Bool ScriptEventContainer::hasElements() - throw(RuntimeException, std::exception) { bool bRet = (mnElementCount > 0); return bRet; @@ -56,7 +54,6 @@ sal_Bool ScriptEventContainer::hasElements() // Methods XNameAccess Any ScriptEventContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); if( aIt == mHashMap.end() ) @@ -69,13 +66,11 @@ Any ScriptEventContainer::getByName( const OUString& aName ) } Sequence< OUString > ScriptEventContainer::getElementNames() - throw(RuntimeException, std::exception) { return mNames; } sal_Bool ScriptEventContainer::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); bool bRet = ( aIt != mHashMap.end() ); @@ -85,7 +80,6 @@ sal_Bool ScriptEventContainer::hasByName( const OUString& aName ) // Methods XNameReplace void ScriptEventContainer::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { const Type& aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -112,7 +106,6 @@ void ScriptEventContainer::replaceByName( const OUString& aName, const Any& aEle // Methods XNameContainer void ScriptEventContainer::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { const Type& aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -140,7 +133,6 @@ void ScriptEventContainer::insertByName( const OUString& aName, const Any& aElem } void ScriptEventContainer::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( Name ); if( aIt == mHashMap.end() ) @@ -172,12 +164,12 @@ void ScriptEventContainer::removeByName( const OUString& Name ) } // Methods XContainer -void ScriptEventContainer::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) +void ScriptEventContainer::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) { maContainerListeners.addInterface( l ); } -void ScriptEventContainer::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) throw(css::uno::RuntimeException, std::exception) +void ScriptEventContainer::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) { maContainerListeners.removeInterface( l ); } diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 8a567b27fa3b..5f9b13a7d9ea 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -164,13 +164,13 @@ namespace toolkit } - OUString UnoControlFormattedFieldModel::getServiceName() throw(RuntimeException, std::exception) + OUString UnoControlFormattedFieldModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlFormattedFieldModel ); } - void SAL_CALL UnoControlFormattedFieldModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) + void SAL_CALL UnoControlFormattedFieldModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -261,7 +261,7 @@ namespace toolkit } - void UnoControlFormattedFieldModel::dispose( ) throw(RuntimeException, std::exception) + void UnoControlFormattedFieldModel::dispose( ) { UnoControlModel::dispose(); @@ -303,7 +303,7 @@ namespace toolkit } - void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) { bool bSettingValue = false; bool bSettingText = false; @@ -327,7 +327,7 @@ namespace toolkit sal_Bool UnoControlFormattedFieldModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nPropId, - const Any& rValue ) throw (IllegalArgumentException, std::exception) + const Any& rValue ) { if ( BASEPROPERTY_EFFECTIVE_DEFAULT == nPropId && rValue.hasValue() ) { @@ -412,21 +412,19 @@ namespace toolkit // beans::XMultiPropertySet - Reference< XPropertySetInfo > UnoControlFormattedFieldModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > UnoControlFormattedFieldModel::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlFormattedFieldModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlFormattedFieldModel"); } css::uno::Sequence<OUString> UnoControlFormattedFieldModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -450,7 +448,7 @@ namespace toolkit } - void UnoFormattedFieldControl::textChanged(const TextEvent& e) throw(RuntimeException, std::exception) + void UnoFormattedFieldControl::textChanged(const TextEvent& e) { Reference< XVclWindowPeer > xPeer(getPeer(), UNO_QUERY); OSL_ENSURE(xPeer.is(), "UnoFormattedFieldControl::textChanged : what kind of peer do I have ?"); @@ -470,14 +468,12 @@ namespace toolkit } OUString UnoFormattedFieldControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoFormattedFieldControl"); } css::uno::Sequence<OUString> UnoFormattedFieldControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoEditControl::getSupportedServiceNames()); s.realloc(s.getLength() + 2); diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index f4cc7cd1f8c6..5cd187c2fd42 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -134,7 +134,7 @@ } - Sequence< Type > SAL_CALL OGeometryControlModel_Base::getTypes( ) throw (RuntimeException, std::exception) + Sequence< Type > SAL_CALL OGeometryControlModel_Base::getTypes( ) { // our own types Sequence< Type > aTypes = ::comphelper::concatSequences( @@ -244,7 +244,7 @@ } - Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType ) throw(RuntimeException, std::exception) + Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType ) { Any aReturn; if (_rType.equals(cppu::UnoType<XCloneable>::get()) && !m_bCloneable) @@ -269,7 +269,7 @@ } - Any SAL_CALL OGeometryControlModel_Base::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) + Any SAL_CALL OGeometryControlModel_Base::queryInterface( const Type& _rType ) { return OGCM_Base::queryInterface(_rType); } @@ -303,13 +303,13 @@ sal_Bool SAL_CALL OGeometryControlModel_Base::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue, - sal_Int32 _nHandle, const Any& _rValue) throw (IllegalArgumentException) + sal_Int32 _nHandle, const Any& _rValue) { return OPropertyContainer::convertFastPropertyValue(_rConvertedValue, _rOldValue, _nHandle, _rValue); } - void SAL_CALL OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception, std::exception) + void SAL_CALL OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) { OPropertyContainer::setFastPropertyValue_NoBroadcast(_nHandle, _rValue); } @@ -349,13 +349,13 @@ } - Reference< XPropertySetInfo> SAL_CALL OGeometryControlModel_Base::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference< XPropertySetInfo> SAL_CALL OGeometryControlModel_Base::getPropertySetInfo() { return OPropertySetAggregationHelper::createPropertySetInfo(getInfoHelper()); } - Reference< XCloneable > SAL_CALL OGeometryControlModel_Base::createClone( ) throw(RuntimeException, std::exception) + Reference< XCloneable > SAL_CALL OGeometryControlModel_Base::createClone( ) { OSL_ENSURE(m_bCloneable, "OGeometryControlModel_Base::createClone: invalid call!"); if (!m_bCloneable) @@ -417,7 +417,7 @@ } - Reference< XNameContainer > SAL_CALL OGeometryControlModel_Base::getEvents() throw(RuntimeException, std::exception) + Reference< XNameContainer > SAL_CALL OGeometryControlModel_Base::getEvents() { if( !mxEventContainer.is() ) mxEventContainer = static_cast<XNameContainer*>(new toolkit::ScriptEventContainer()); @@ -578,7 +578,7 @@ return new OCommonGeometryControlModel( _rxAggregateInstance, m_sServiceSpecifier ); } - Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId( ) throw (RuntimeException, std::exception) + Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -596,7 +596,7 @@ }; - void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) + void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 5f3c21d14b2e..9d6aeae9564d 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -58,25 +58,25 @@ public: DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource ); // XGridColumnModel - virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL createColumn( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL addColumn(const css::uno::Reference< css::awt::grid::XGridColumn > & column) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual void SAL_CALL removeColumn( ::sal_Int32 i_columnIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::awt::grid::XGridColumn > > SAL_CALL getColumns() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getColumnCount() override; + virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL createColumn( ) override; + virtual ::sal_Int32 SAL_CALL addColumn(const css::uno::Reference< css::awt::grid::XGridColumn > & column) override; + virtual void SAL_CALL removeColumn( ::sal_Int32 i_columnIndex ) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::grid::XGridColumn > > SAL_CALL getColumns() override; + virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) override; + virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) 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; // XContainer - virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -132,13 +132,13 @@ private: m_aColumns.swap( aColumns ); } - ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() { return m_aColumns.size(); } - Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn( ) throw (RuntimeException, std::exception) + Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn( ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return new GridColumn(); @@ -146,7 +146,6 @@ private: ::sal_Int32 SAL_CALL DefaultGridColumnModel::addColumn( const Reference< XGridColumn > & i_column ) - throw (RuntimeException, css::lang::IllegalArgumentException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -172,7 +171,6 @@ private: void SAL_CALL DefaultGridColumnModel::removeColumn( ::sal_Int32 i_columnIndex ) - throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -221,7 +219,7 @@ private: } - Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() throw (RuntimeException, std::exception) + Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return ::comphelper::containerToSequence( m_aColumns ); @@ -229,7 +227,6 @@ private: Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::getColumn(::sal_Int32 index) - throw (css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -240,7 +237,7 @@ private: } - void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) throw (RuntimeException, std::exception) + void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) { ::std::vector< ContainerEvent > aRemovedColumns; ::std::vector< ContainerEvent > aInsertedColumns; @@ -324,17 +321,17 @@ private: } - OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) { return OUString("stardiv.Toolkit.DefaultGridColumnModel"); } - sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName ) { return cppu::supportsService(this, i_serviceName); } - Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) { const OUString aServiceName("com.sun.star.awt.grid.DefaultGridColumnModel"); const Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -342,14 +339,14 @@ private: } - void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener ) { if ( i_listener.is() ) m_aContainerListeners.addInterface( i_listener ); } - void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) { if ( i_listener.is() ) m_aContainerListeners.removeInterface( i_listener ); @@ -386,7 +383,7 @@ private: } - Reference< css::util::XCloneable > SAL_CALL DefaultGridColumnModel::createClone( ) throw (RuntimeException, std::exception) + Reference< css::util::XCloneable > SAL_CALL DefaultGridColumnModel::createClone( ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return new DefaultGridColumnModel( *this ); diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index 4e96dfd0b2ce..cae8df334284 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -55,38 +55,38 @@ public: DefaultGridDataModel( DefaultGridDataModel const & i_copySource ); // XMutableGridDataModel - virtual void SAL_CALL addRow( const Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRows( const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertRow( ::sal_Int32 i_index, const css::uno::Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; - virtual void SAL_CALL insertRows( ::sal_Int32 i_index, const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAllRows( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRowData( const css::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const css::uno::Sequence< css::uno::Any >& Values ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRow( const Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) override; + virtual void SAL_CALL addRows( const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) override; + virtual void SAL_CALL insertRow( ::sal_Int32 i_index, const css::uno::Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) override; + virtual void SAL_CALL insertRows( ::sal_Int32 i_index, const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) override; + virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) override; + virtual void SAL_CALL removeAllRows( ) override; + virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) override; + virtual void SAL_CALL updateRowData( const css::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const css::uno::Sequence< css::uno::Any >& Values ) override; + virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) override; + virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) override; + virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) override; + virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) override; + virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) override; // XGridDataModel - virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 Row ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 Row ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getRowCount() override; + virtual ::sal_Int32 SAL_CALL getColumnCount() override; + virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 Row ) override; + virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 Row ) override; + virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) 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 css::uno::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 css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: typedef ::std::pair< Any, Any > CellData; @@ -141,14 +141,14 @@ private: } - ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (css::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return impl_getRowCount_nolck(); } - ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (css::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nColumnCount; @@ -194,21 +194,21 @@ private: } - Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) + Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return impl_getCellData_throw( i_column, i_row ).first; } - Any SAL_CALL DefaultGridDataModel::getCellToolTip( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) + Any SAL_CALL DefaultGridDataModel::getCellToolTip( ::sal_Int32 i_column, ::sal_Int32 i_row ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return impl_getCellData_throw( i_column, i_row ).second; } - Any SAL_CALL DefaultGridDataModel::getRowHeading( ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) + Any SAL_CALL DefaultGridDataModel::getRowHeading( ::sal_Int32 i_row ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -219,7 +219,7 @@ private: } - Sequence< Any > SAL_CALL DefaultGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Sequence< Any > SAL_CALL DefaultGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -252,19 +252,19 @@ private: } - void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) { insertRow( getRowCount(), i_heading, i_data ); } - void SAL_CALL DefaultGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) { insertRows( getRowCount(), i_headings, i_data ); } - void SAL_CALL DefaultGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) + void SAL_CALL DefaultGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -287,7 +287,7 @@ private: } - void SAL_CALL DefaultGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) { if ( i_headings.getLength() != i_data.getLength() ) throw IllegalArgumentException( OUString(), *this, -1 ); @@ -326,7 +326,7 @@ private: } - void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -344,7 +344,7 @@ private: } - void SAL_CALL DefaultGridDataModel::removeAllRows( ) throw (RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::removeAllRows( ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -359,7 +359,7 @@ private: } - void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -373,7 +373,7 @@ private: } - void SAL_CALL DefaultGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -413,7 +413,7 @@ private: } - void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -430,14 +430,14 @@ private: } - void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); impl_getCellDataAccess_throw( i_columnIndex, i_rowIndex ).second = i_value; } - void SAL_CALL DefaultGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -447,13 +447,13 @@ private: } - void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) { rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) { rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } @@ -476,24 +476,24 @@ private: } - OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) { return OUString("stardiv.Toolkit.DefaultGridDataModel"); } - sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) { Sequence<OUString> aSeq { "com.sun.star.awt.grid.DefaultGridDataModel" }; return aSeq; } - Reference< css::util::XCloneable > SAL_CALL DefaultGridDataModel::createClone( ) throw (RuntimeException, std::exception) + Reference< css::util::XCloneable > SAL_CALL DefaultGridDataModel::createClone( ) { return new DefaultGridDataModel( *this ); } diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 90f79dae8fa8..55623f29a1ed 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -93,106 +93,106 @@ namespace toolkit } - css::uno::Any SAL_CALL GridColumn::getIdentifier() throw (css::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL GridColumn::getIdentifier() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_aIdentifier; } - void SAL_CALL GridColumn::setIdentifier(const css::uno::Any & value) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setIdentifier(const css::uno::Any & value) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); m_aIdentifier = value; } - ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (css::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nColumnWidth; } - void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) { impl_set( m_nColumnWidth, value, "ColumnWidth" ); } - ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (css::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nMaxWidth; } - void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) { impl_set( m_nMaxWidth, value, "MaxWidth" ); } - ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (css::uno::RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getMinWidth() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nMinWidth; } - void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) { impl_set( m_nMinWidth, value, "MinWidth" ); } - OUString SAL_CALL GridColumn::getTitle() throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL GridColumn::getTitle() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sTitle; } - void SAL_CALL GridColumn::setTitle(const OUString & value) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setTitle(const OUString & value) { impl_set( m_sTitle, value, "Title" ); } - OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException, std::exception) + OUString SAL_CALL GridColumn::getHelpText() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sHelpText; } - void SAL_CALL GridColumn::setHelpText( const OUString & value ) throw (RuntimeException, std::exception) + void SAL_CALL GridColumn::setHelpText( const OUString & value ) { impl_set( m_sHelpText, value, "HelpText" ); } - sal_Bool SAL_CALL GridColumn::getResizeable() throw (css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL GridColumn::getResizeable() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_bResizeable; } - void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setResizeable(sal_Bool value) { impl_set( m_bResizeable, bool(value), "Resizeable" ); } - ::sal_Int32 SAL_CALL GridColumn::getFlexibility() throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getFlexibility() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nFlexibility; } - void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) { if ( i_value < 0 ) throw IllegalArgumentException( OUString(), *this, 1 ); @@ -200,26 +200,26 @@ namespace toolkit } - HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (css::uno::RuntimeException, std::exception) + HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_eHorizontalAlign; } - void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) { impl_set( m_eHorizontalAlign, align, "HorizontalAlign" ); } - void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException, std::exception) + void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) { rBHelper.addListener( cppu::UnoType<XGridColumnListener>::get(), xListener ); } - void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException, std::exception) + void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) { rBHelper.removeListener( cppu::UnoType<XGridColumnListener>::get(), xListener ); } @@ -234,7 +234,7 @@ namespace toolkit } - ::sal_Int32 SAL_CALL GridColumn::getIndex() throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getIndex() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nIndex; @@ -248,30 +248,30 @@ namespace toolkit } - ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex() throw(RuntimeException, std::exception) + ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex() { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nDataColumnIndex; } - void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(RuntimeException, std::exception) + void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) { impl_set( m_nDataColumnIndex, i_dataColumnIndex, "DataColumnIndex" ); } - OUString SAL_CALL GridColumn::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL GridColumn::getImplementationName( ) { return OUString( "org.openoffice.comp.toolkit.GridColumn" ); } - sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName ) { return cppu::supportsService(this, i_serviceName); } - css::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + css::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) { const OUString aServiceName("com.sun.star.awt.grid.GridColumn"); const Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -279,13 +279,13 @@ namespace toolkit } - Reference< XCloneable > SAL_CALL GridColumn::createClone( ) throw (RuntimeException, std::exception) + Reference< XCloneable > SAL_CALL GridColumn::createClone( ) { return new GridColumn( *this ); } - sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) throw(RuntimeException, std::exception) + sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) { if ( ( i_identifier.getLength() == 16 ) && ( i_identifier == getUnoTunnelId() ) ) return ::sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ) ); diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index d0001b0c20cb..65a61363d7e6 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -50,43 +50,43 @@ public: virtual ~GridColumn() override; // css::awt::grid::XGridColumn - virtual css::uno::Any SAL_CALL getIdentifier() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIdentifier(const css::uno::Any & value) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMaxWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMinWidth() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getResizeable() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setResizeable(sal_Bool the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getFlexibility() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitle(const OUString & value) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getHelpText() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpText(const OUString & value) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::style::HorizontalAlignment SAL_CALL getHorizontalAlign() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHorizontalAlign(css::style::HorizontalAlignment align) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getIdentifier() override; + virtual void SAL_CALL setIdentifier(const css::uno::Any & value) override; + virtual ::sal_Int32 SAL_CALL getColumnWidth() override; + virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) override; + virtual ::sal_Int32 SAL_CALL getMaxWidth() override; + virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) override; + virtual ::sal_Int32 SAL_CALL getMinWidth() override; + virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) override; + virtual sal_Bool SAL_CALL getResizeable() override; + virtual void SAL_CALL setResizeable(sal_Bool the_value) override; + virtual ::sal_Int32 SAL_CALL getFlexibility() override; + virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) override; + virtual OUString SAL_CALL getTitle() override; + virtual void SAL_CALL setTitle(const OUString & value) override; + virtual OUString SAL_CALL getHelpText() override; + virtual void SAL_CALL setHelpText(const OUString & value) override; + virtual ::sal_Int32 SAL_CALL getIndex() override; + virtual ::sal_Int32 SAL_CALL getDataColumnIndex() override; + virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) override; + virtual css::style::HorizontalAlignment SAL_CALL getHorizontalAlign() override; + virtual void SAL_CALL setHorizontalAlign(css::style::HorizontalAlignment align) override; + virtual void SAL_CALL addGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) override; + virtual void SAL_CALL removeGridColumnListener( const css::uno::Reference< css::awt::grid::XGridColumnListener >& xListener ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XCloneable (base of XGridColumn) - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) 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; // XUnoTunnel and friends - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& i_identifier ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& i_identifier ) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelId() throw(); static GridColumn* getImplementation( const css::uno::Reference< css::uno::XInterface >& i_component ); diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 62709421d1f5..c18a1e4e56a9 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -180,7 +180,7 @@ namespace } -void SAL_CALL UnoGridModel::dispose( ) throw(RuntimeException, std::exception) +void SAL_CALL UnoGridModel::dispose( ) { lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ) ); lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL ) ); @@ -189,7 +189,7 @@ void SAL_CALL UnoGridModel::dispose( ) throw(RuntimeException, std::exception) } -void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) +void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { Any aOldSubModel; if ( ( nHandle == BASEPROPERTY_GRID_COLUMNMODEL ) || ( nHandle == BASEPROPERTY_GRID_DATAMODEL ) ) @@ -210,7 +210,7 @@ void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, } -OUString UnoGridModel::getServiceName() throw(RuntimeException, std::exception) +OUString UnoGridModel::getServiceName() { return OUString("com.sun.star.awt.grid.UnoControlGridModel"); } @@ -262,7 +262,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const // XMultiPropertySet -Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -290,7 +290,7 @@ OUString UnoGridControl::GetComponentServiceName() } -void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException, std::exception) +void SAL_CALL UnoGridControl::dispose( ) { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -299,7 +299,7 @@ void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException, std::exception } -void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -348,7 +348,7 @@ namespace } -sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model ) { lcl_setEventForwarding( getModel(), m_pEventForwarder, false ); if ( !UnoGridControl_Base::setModel( i_model ) ) @@ -358,90 +358,90 @@ sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_ } -::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getRowAtPoint( x, y ); } -::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getColumnAtPoint( x, y ); } -::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn( ) throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn( ) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getCurrentColumn(); } -::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow( ) throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow( ) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getCurrentRow(); } -void SAL_CALL UnoGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException, std::exception) +void SAL_CALL UnoGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); xGrid->goToCell( i_columnIndex, i_rowIndex ); } -void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception ) +void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex ) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectRow( i_rowIndex ); } -void SAL_CALL UnoGridControl::selectAllRows() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::selectAllRows() { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectAllRows(); } -void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception ) +void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectRow( i_rowIndex ); } -void SAL_CALL UnoGridControl::deselectAllRows() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::deselectAllRows() { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectAllRows(); } -css::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->getSelectedRows(); } -sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->hasSelectedRows(); } -sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->isRowSelected( index ); } -void SAL_CALL UnoGridControl::addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::addSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) { m_aSelectionListeners.addInterface( listener ); } -void SAL_CALL UnoGridControl::removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL UnoGridControl::removeSelectionListener(const css::uno::Reference< css::awt::grid::XGridSelectionListener > & listener) { m_aSelectionListeners.removeInterface( listener ); } diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index afc22b760c00..a4f8a1f5b026 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -53,24 +53,22 @@ public: UnoControlModel* Clone() const override; // css::lang::XComponent - void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) override; // css::beans::XMultiPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // css::io::XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getServiceName() override; // OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("stardiv.Toolkit.GridControlModel"); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 1); @@ -93,37 +91,35 @@ public: OUString GetComponentServiceName() override; // css::lang::XComponent - void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) override; // css::awt::XControl - void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& rxModel ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override; + sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& rxModel ) override; // css::awt::grid::XGridControl - virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getRowAtPoint(::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 getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) override; + virtual ::sal_Int32 SAL_CALL getRowAtPoint(::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; // css::awt::grid::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; + 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; // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("stardiv.Toolkit.GridControl"); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 1); diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx index a85d47c4a471..9de7a9a56d1b 100644 --- a/toolkit/source/controls/grid/grideventforwarder.cxx +++ b/toolkit/source/controls/grid/grideventforwarder.cxx @@ -59,7 +59,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event ) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -67,7 +67,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event ) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -75,7 +75,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event ) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -83,7 +83,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event ) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -91,7 +91,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event ) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -99,7 +99,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event ) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -107,7 +107,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event ) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -115,7 +115,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event ) { Reference< XEventListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx index da9a6cd269f3..50a3fd4501da 100644 --- a/toolkit/source/controls/grid/grideventforwarder.hxx +++ b/toolkit/source/controls/grid/grideventforwarder.hxx @@ -52,18 +52,18 @@ namespace toolkit virtual void SAL_CALL release() throw() 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& i_event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override; private: UnoGridControl& m_parent; diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 59463e8696b5..8df02feb14b6 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -72,64 +72,64 @@ protected: public: // XSortableGridData - virtual void SAL_CALL sortByColumn( ::sal_Int32 ColumnIndex, sal_Bool SortAscending ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeColumnSort( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::beans::Pair< ::sal_Int32, sal_Bool > SAL_CALL getCurrentSortOrder( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL sortByColumn( ::sal_Int32 ColumnIndex, sal_Bool SortAscending ) override; + virtual void SAL_CALL removeColumnSort( ) override; + virtual css::beans::Pair< ::sal_Int32, sal_Bool > SAL_CALL getCurrentSortOrder( ) override; // XMutableGridDataModel - virtual void SAL_CALL addRow( const css::uno::Any& Heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRows( const css::uno::Sequence< css::uno::Any >& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertRow( ::sal_Int32 i_index, const css::uno::Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; - virtual void SAL_CALL insertRows( ::sal_Int32 i_index, const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAllRows( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRowData( const css::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const css::uno::Sequence< css::uno::Any >& Values ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRow( const css::uno::Any& Heading, const css::uno::Sequence< css::uno::Any >& Data ) override; + virtual void SAL_CALL addRows( const css::uno::Sequence< css::uno::Any >& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) override; + virtual void SAL_CALL insertRow( ::sal_Int32 i_index, const css::uno::Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) override; + virtual void SAL_CALL insertRows( ::sal_Int32 i_index, const css::uno::Sequence< css::uno::Any>& Headings, const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& Data ) override; + virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) override; + virtual void SAL_CALL removeAllRows( ) override; + virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) override; + virtual void SAL_CALL updateRowData( const css::uno::Sequence< ::sal_Int32 >& ColumnIndexes, ::sal_Int32 RowIndex, const css::uno::Sequence< css::uno::Any >& Values ) override; + virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) override; + virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) override; + virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) override; + virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) override; + virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) override; // XGridDataModel - virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getRowCount() override; + virtual ::sal_Int32 SAL_CALL getColumnCount() override; + virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 RowIndex ) override; + virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 RowIndex ) override; + virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // 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; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw () final override; virtual void SAL_CALL release( ) throw () 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; private: /** translates the given public index into one to be passed to our delegator @@ -261,7 +261,7 @@ public: } - Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) + Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) { Any aReturn( SortableGridDataModel_Base::queryInterface( aType ) ); if ( !aReturn.hasValue() ) @@ -282,14 +282,14 @@ public: } - Sequence< Type > SAL_CALL SortableGridDataModel::getTypes( ) throw (RuntimeException, std::exception) + Sequence< Type > SAL_CALL SortableGridDataModel::getTypes( ) { return SortableGridDataModel_Base::getTypes(); // don't expose the types got via SortableGridDataModel_PrivateBase - they're private, after all } - Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId( ) throw (RuntimeException, std::exception) + Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -306,7 +306,7 @@ public: } - void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -363,7 +363,7 @@ public: } - void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) { MethodGuard aGuard( *this, rBHelper ); @@ -422,7 +422,7 @@ public: } - void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) { MethodGuard aGuard( *this, rBHelper ); @@ -482,7 +482,7 @@ public: } - void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) { MethodGuard aGuard( *this, rBHelper ); @@ -491,7 +491,7 @@ public: } - void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) { MethodGuard aGuard( *this, rBHelper ); @@ -500,7 +500,7 @@ public: } - void SAL_CALL SortableGridDataModel::disposing( const EventObject& ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::disposing( const EventObject& ) { } @@ -592,7 +592,7 @@ public: } - void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, sal_Bool i_sortAscending ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, sal_Bool i_sortAscending ) { MethodGuard aGuard( *this, rBHelper ); @@ -634,14 +634,14 @@ public: } - void SAL_CALL SortableGridDataModel::removeColumnSort( ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::removeColumnSort( ) { MethodGuard aGuard( *this, rBHelper ); impl_removeColumnSort( aGuard ); } - css::beans::Pair< ::sal_Int32, sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder( ) throw (RuntimeException, std::exception) + css::beans::Pair< ::sal_Int32, sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder( ) { MethodGuard aGuard( *this, rBHelper ); @@ -649,7 +649,7 @@ public: } - void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) { MethodGuard aGuard( *this, rBHelper ); @@ -659,7 +659,7 @@ public: } - void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) { MethodGuard aGuard( *this, rBHelper ); @@ -669,7 +669,7 @@ public: } - void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) + void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) { MethodGuard aGuard( *this, rBHelper ); @@ -682,7 +682,7 @@ public: } - void SAL_CALL SortableGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) { MethodGuard aGuard( *this, rBHelper ); @@ -695,7 +695,7 @@ public: } - void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) { MethodGuard aGuard( *this, rBHelper ); @@ -707,7 +707,7 @@ public: } - void SAL_CALL SortableGridDataModel::removeAllRows( ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::removeAllRows( ) { MethodGuard aGuard( *this, rBHelper ); @@ -717,7 +717,7 @@ public: } - void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) { MethodGuard aGuard( *this, rBHelper ); @@ -729,7 +729,7 @@ public: } - void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) { MethodGuard aGuard( *this, rBHelper ); @@ -741,7 +741,7 @@ public: } - void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) { MethodGuard aGuard( *this, rBHelper ); @@ -753,7 +753,7 @@ public: } - void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) { MethodGuard aGuard( *this, rBHelper ); @@ -765,7 +765,7 @@ public: } - void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) { MethodGuard aGuard( *this, rBHelper ); @@ -777,19 +777,19 @@ public: } - void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) { rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) { rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() { MethodGuard aGuard( *this, rBHelper ); @@ -799,7 +799,7 @@ public: } - ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() { MethodGuard aGuard( *this, rBHelper ); @@ -809,7 +809,7 @@ public: } - Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) { MethodGuard aGuard( *this, rBHelper ); @@ -821,7 +821,7 @@ public: } - Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) { MethodGuard aGuard( *this, rBHelper ); @@ -833,7 +833,7 @@ public: } - Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) { MethodGuard aGuard( *this, rBHelper ); @@ -845,7 +845,7 @@ public: } - Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) { MethodGuard aGuard( *this, rBHelper ); @@ -876,7 +876,7 @@ public: } - Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone( ) throw (RuntimeException, std::exception) + Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone( ) { MethodGuard aGuard( *this, rBHelper ); @@ -884,17 +884,17 @@ public: } - OUString SAL_CALL SortableGridDataModel::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL SortableGridDataModel::getImplementationName( ) { return OUString( "org.openoffice.comp.toolkit.SortableGridDataModel" ); } - sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName ) { return cppu::supportsService(this, i_serviceName); } - Sequence< OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames( ) { Sequence< OUString > aServiceNames { "com.sun.star.awt.grid.SortableGridDataModel" }; return aServiceNames; diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index c6359a108272..59c99d314194 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -76,20 +76,18 @@ static void lcl_throwIndexOutOfBoundsException( ) } - OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException, std::exception) + OUString UnoControlRoadmapModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlRoadmapModel ); } OUString UnoControlRoadmapModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlRoadmapModel"); } css::uno::Sequence<OUString> UnoControlRoadmapModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlRoadmapModel_Base::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -127,7 +125,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( ) throw (Exception, css::uno::RuntimeException, std::exception) + Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( ) { ORoadmapEntry* pRoadmapItem = new ORoadmapEntry(); Reference< XInterface > xNewRoadmapItem = static_cast<cppu::OWeakObject*>(pRoadmapItem); @@ -135,7 +133,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException, std::exception) + Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ ) { // Todo: implementation of the arguments handling ORoadmapEntry* pRoadmapItem = new ORoadmapEntry(); @@ -147,7 +145,7 @@ static void lcl_throwIndexOutOfBoundsException( ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, UnoControlRoadmapModel_IBase ) - css::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType ) { Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -170,19 +168,19 @@ static void lcl_throwIndexOutOfBoundsException( ) // beans::XMultiPropertySet - Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - sal_Int32 SAL_CALL UnoControlRoadmapModel::getCount() throw(RuntimeException, std::exception) + sal_Int32 SAL_CALL UnoControlRoadmapModel::getCount() { return maRoadmapItems.size(); } - Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) + Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index ) { if (( Index >= (sal_Int32)maRoadmapItems.size()) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -273,7 +271,6 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& Element) - throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -295,7 +292,6 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index) - throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -326,7 +322,6 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::replaceByIndex( const sal_Int32 Index, const Any& Element) - throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Reference< XInterface > xRoadmapItem; Element >>= xRoadmapItem; @@ -339,25 +334,25 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Type SAL_CALL UnoControlRoadmapModel::getElementType() throw(RuntimeException, std::exception) + Type SAL_CALL UnoControlRoadmapModel::getElementType() { Type aType = cppu::UnoType<XPropertySet>::get(); return aType; } - sal_Bool SAL_CALL UnoControlRoadmapModel::hasElements() throw(RuntimeException, std::exception) + sal_Bool SAL_CALL UnoControlRoadmapModel::hasElements() { return !maRoadmapItems.empty(); } - void SAL_CALL UnoControlRoadmapModel::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL UnoControlRoadmapModel::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) { maContainerListeners.addInterface( xListener ); } - void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) { maContainerListeners.removeInterface( xListener ); } @@ -376,7 +371,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoRoadmapControl, UnoControlRoadmap_Base, Uno IMPLEMENT_FORWARD_XINTERFACE2( UnoRoadmapControl, UnoControlRoadmap_Base, UnoControlRoadmap_IBase ) -sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& _rModel) throw ( RuntimeException, std::exception ) +sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& _rModel) { @@ -400,7 +395,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& } - void UnoRoadmapControl::dispose() throw(RuntimeException, std::exception) + void UnoRoadmapControl::dispose() { EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -409,7 +404,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& } -void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) +void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent ) { Reference< XInterface > xRoadmapItem; rEvent.Element >>= xRoadmapItem; @@ -428,7 +423,7 @@ void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(Run } -void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) +void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent ) { Reference< XContainerListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -441,7 +436,7 @@ void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(Runt } -void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) +void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent ) { Reference< XContainerListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -449,7 +444,7 @@ void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(Run } -void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) { sal_Int16 CurItemIndex = sal::static_int_cast< sal_Int16 >(rEvent.ItemId); Reference< XControlModel > xModel( getModel( ), UNO_QUERY ); @@ -460,7 +455,7 @@ void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) thr } -void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) +void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener >& l ) { maItemListeners.addInterface( l ); if( getPeer().is() && maItemListeners.getLength() == 1 ) @@ -471,7 +466,7 @@ void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener } -void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) +void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListener >& l ) { if( getPeer().is() && maItemListeners.getLength() == 1 ) { @@ -483,7 +478,7 @@ void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListe } -void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception) +void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt ) { Reference< XPropertyChangeListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -491,13 +486,11 @@ void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt } OUString UnoRoadmapControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoRoadmapControl"); } css::uno::Sequence<OUString> UnoRoadmapControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index 2327d0248690..3238b6e5d578 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -69,24 +69,23 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe css::uno::Reference< css:: beans::XPropertySetInfo > SAL_CALL ORoadmapEntry::getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } -OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL ORoadmapEntry::getImplementationName( ) { OUString aStr("com.sun.star.comp.toolkit.RoadmapItem"); return aStr; } -sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) { css::uno::Sequence<OUString> aRet { "com.sun.star.awt.RoadmapItem" }; return aRet; diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index 231a3e85f534..fbb44bcbc7ba 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -38,14 +38,14 @@ public: virtual UnoControlModel* Clone() const override; // XPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getServiceName() override; // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName( ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: virtual ~SpinningProgressControlModel() override; @@ -96,26 +96,26 @@ protected: } - Reference< beans::XPropertySetInfo > SAL_CALL SpinningProgressControlModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< beans::XPropertySetInfo > SAL_CALL SpinningProgressControlModel::getPropertySetInfo( ) { static Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - OUString SAL_CALL SpinningProgressControlModel::getServiceName() throw(RuntimeException, std::exception) + OUString SAL_CALL SpinningProgressControlModel::getServiceName() { return OUString("com.sun.star.awt.SpinningProgressControlModel"); } - OUString SAL_CALL SpinningProgressControlModel::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL SpinningProgressControlModel::getImplementationName( ) { return OUString("org.openoffice.comp.toolkit.SpinningProgressControlModel"); } - Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() { Sequence< OUString > aServiceNames(3); aServiceNames[0] = "com.sun.star.awt.SpinningProgressControlModel"; diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 6603e86caa4a..6b3456969c26 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -161,7 +161,7 @@ void StdTabController::ImplActivateControl( bool bFirst ) const } // XInterface -Any StdTabController::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception) +Any StdTabController::queryAggregation( const Type & rType ) { Any aRet = ::cppu::queryInterface( rType, (static_cast< XTabController* >(this)), @@ -176,35 +176,35 @@ IMPL_XTYPEPROVIDER_START( StdTabController ) cppu::UnoType<XServiceInfo>::get() IMPL_XTYPEPROVIDER_END -void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) throw(RuntimeException, std::exception) +void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); mxModel = Model; } -Reference< XTabControllerModel > StdTabController::getModel( ) throw(RuntimeException, std::exception) +Reference< XTabControllerModel > StdTabController::getModel( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mxModel; } -void StdTabController::setContainer( const Reference< XControlContainer >& Container ) throw(RuntimeException, std::exception) +void StdTabController::setContainer( const Reference< XControlContainer >& Container ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); mxControlContainer = Container; } -Reference< XControlContainer > StdTabController::getContainer( ) throw(RuntimeException, std::exception) +Reference< XControlContainer > StdTabController::getContainer( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mxControlContainer; } -Sequence< Reference< XControl > > StdTabController::getControls( ) throw(RuntimeException, std::exception) +Sequence< Reference< XControl > > StdTabController::getControls( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -230,7 +230,7 @@ Sequence< Reference< XControl > > StdTabController::getControls( ) throw(Runtim return aSeq; } -void StdTabController::autoTabOrder( ) throw(RuntimeException, std::exception) +void StdTabController::autoTabOrder( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -295,7 +295,7 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException, std::exception) mxModel->setControlModels( aNewSeq ); } -void StdTabController::activateTabOrder( ) throw(RuntimeException, std::exception) +void StdTabController::activateTabOrder( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -350,7 +350,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException, std::excepti } } -void StdTabController::activateFirst( ) throw(RuntimeException, std::exception) +void StdTabController::activateFirst( ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); //TODO: necessary? @@ -358,7 +358,7 @@ void StdTabController::activateFirst( ) throw(RuntimeException, std::exception) ImplActivateControl( true ); } -void StdTabController::activateLast( ) throw(RuntimeException, std::exception) +void StdTabController::activateLast( ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); //TODO: necessary? @@ -367,19 +367,16 @@ void StdTabController::activateLast( ) throw(RuntimeException, std::exception) } OUString StdTabController::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.StdTabController"); } sal_Bool StdTabController::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> StdTabController::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ OUString::createFromAscii(szServiceName2_TabController), diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index 184d56c0fdcf..a9b2786bb42a 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -213,7 +213,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > ImplReadCon // css::uno::XInterface -css::uno::Any StdTabControllerModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any StdTabControllerModel::queryAggregation( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::awt::XTabControllerModel* >(this)), @@ -230,21 +230,21 @@ IMPL_XTYPEPROVIDER_START( StdTabControllerModel ) cppu::UnoType<css::io::XPersistObject>::get() IMPL_XTYPEPROVIDER_END -sal_Bool StdTabControllerModel::getGroupControl( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool StdTabControllerModel::getGroupControl( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mbGroupControl; } -void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(css::uno::RuntimeException, std::exception) +void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); mbGroupControl = GroupControl; } -void StdTabControllerModel::setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) throw(css::uno::RuntimeException, std::exception) +void StdTabControllerModel::setControlModels( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Controls ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -252,7 +252,7 @@ void StdTabControllerModel::setControlModels( const css::uno::Sequence< css::uno ImplSetControlModels( maControls, Controls ); } -css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > StdTabControllerModel::getControlModels( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > StdTabControllerModel::getControlModels( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -262,7 +262,7 @@ css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > StdTabContr return aSeq; } -void StdTabControllerModel::setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) throw(css::uno::RuntimeException, std::exception) +void StdTabControllerModel::setGroup( const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& Group, const OUString& GroupName ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -300,7 +300,7 @@ void StdTabControllerModel::setGroup( const css::uno::Sequence< css::uno::Refere maControls.push_back( pNewEntry ); } -sal_Int32 StdTabControllerModel::getGroupCount( ) throw(css::uno::RuntimeException, std::exception) +sal_Int32 StdTabControllerModel::getGroupCount( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -318,7 +318,7 @@ sal_Int32 StdTabControllerModel::getGroupCount( ) throw(css::uno::RuntimeExcept return nGroups; } -void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup, OUString& rName ) throw(css::uno::RuntimeException, std::exception) +void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup, OUString& rName ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -345,7 +345,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, css::uno::Sequence< css: rGroup = aSeq; } -void StdTabControllerModel::getGroupByName( const OUString& rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup ) throw(css::uno::RuntimeException, std::exception) +void StdTabControllerModel::getGroupByName( const OUString& rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& rGroup ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -369,12 +369,12 @@ void StdTabControllerModel::getGroupByName( const OUString& rName, css::uno::Seq // css::io::XPersistObject -OUString StdTabControllerModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) +OUString StdTabControllerModel::getServiceName( ) { return OUString::createFromAscii( szServiceName_TabControllerModel ); } -void StdTabControllerModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) +void StdTabControllerModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -398,7 +398,7 @@ void StdTabControllerModel::write( const css::uno::Reference< css::io::XObjectOu } } -void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) +void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -415,19 +415,16 @@ void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInp } OUString StdTabControllerModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.StdTabControllerModel"); } sal_Bool StdTabControllerModel::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> StdTabControllerModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ OUString::createFromAscii(szServiceName2_TabControllerModel), diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 0e4939947f7a..1a7319d96693 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -61,7 +61,7 @@ UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Referenc ImplRegisterProperty( BASEPROPERTY_TEXT ); } -OUString UnoControlTabPageContainerModel::getServiceName() throw(RuntimeException, std::exception) +OUString UnoControlTabPageContainerModel::getServiceName() { return OUString("com.sun.star.awt.tab.UnoControlTabPageContainerModel"); } @@ -89,7 +89,7 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI } return *pHelper; } -Reference< css::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo( ) { static Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -129,14 +129,14 @@ namespace } } -Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPage( ::sal_Int16 i_tabPageID ) throw (RuntimeException, std::exception) +Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPage( ::sal_Int16 i_tabPageID ) { Sequence< Any > aInitArgs(1); aInitArgs[0] <<= i_tabPageID; return lcl_createTabPageModel( m_xContext, aInitArgs, this ); } -Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const OUString& i_resourceURL ) throw (RuntimeException, std::exception) +Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const OUString& i_resourceURL ) { Sequence< Any > aInitArgs(2); aInitArgs[0] <<= i_tabPageID; @@ -144,7 +144,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage return lcl_createTabPageModel( m_xContext, aInitArgs, this ); } -void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const css::uno::Any& aElement) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const css::uno::Any& aElement) { SolarMutexGuard aSolarGuard; uno::Reference < XTabPageModel > xTabPageModel; @@ -170,22 +170,22 @@ void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex throw IllegalArgumentException( WRONG_TYPE_EXCEPTION, static_cast<OWeakObject *>(this), 2 ); } -void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Index*/ ) { } // XIndexReplace -void SAL_CALL UnoControlTabPageContainerModel::replaceByIndex( ::sal_Int32 /*Index*/, const uno::Any& /*Element*/ ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainerModel::replaceByIndex( ::sal_Int32 /*Index*/, const uno::Any& /*Element*/ ) { } // XIndexAccess -::sal_Int32 SAL_CALL UnoControlTabPageContainerModel::getCount( ) throw (uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoControlTabPageContainerModel::getCount( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return sal_Int32( m_aTabPageVector.size()); } -uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( nIndex < 0 || nIndex > sal_Int32(m_aTabPageVector.size()) ) @@ -194,23 +194,23 @@ uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nInde } // XElementAccess -uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType( ) throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType( ) { return cppu::UnoType<css::awt::XControlModel>::get(); } -sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return !m_aTabPageVector.empty(); } // XContainer -void UnoControlTabPageContainerModel::addContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception) +void UnoControlTabPageContainerModel::addContainerListener( const Reference< XContainerListener >& l ) { maContainerListeners.addInterface( l ); } -void UnoControlTabPageContainerModel::removeContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception) +void UnoControlTabPageContainerModel::removeContainerListener( const Reference< XContainerListener >& l ) { maContainerListeners.removeInterface( l ); } @@ -229,7 +229,7 @@ OUString UnoControlTabPageContainer::GetComponentServiceName() return OUString("TabPageContainer"); } -void SAL_CALL UnoControlTabPageContainer::dispose( ) throw(RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainer::dispose( ) { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -237,7 +237,7 @@ void SAL_CALL UnoControlTabPageContainer::dispose( ) throw(RuntimeException, st UnoControl::dispose(); } -void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -249,43 +249,43 @@ void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit // XTabPageContainer -::sal_Int16 SAL_CALL UnoControlTabPageContainer::getActiveTabPageID() throw (RuntimeException, std::exception) +::sal_Int16 SAL_CALL UnoControlTabPageContainer::getActiveTabPageID() { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getActiveTabPageID(); } -void SAL_CALL UnoControlTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpageid ) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); xTPContainer->setActiveTabPageID(_activetabpageid); } -::sal_Int16 SAL_CALL UnoControlTabPageContainer::getTabPageCount( ) throw (RuntimeException, std::exception) +::sal_Int16 SAL_CALL UnoControlTabPageContainer::getTabPageCount( ) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getTabPageCount(); } -sal_Bool SAL_CALL UnoControlTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoControlTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex ) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->isTabPageActive(tabPageIndex); } -Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) +Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getTabPage(tabPageIndex); } -Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception) +Reference< css::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getTabPageByID(tabPageID); } -void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) { m_aTabPageListeners.addInterface( listener ); if( getPeer().is() && m_aTabPageListeners.getLength() == 1 ) @@ -294,7 +294,7 @@ void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Ref xTabPageContainer->addTabPageContainerListener( &m_aTabPageListeners ); } } -void SAL_CALL UnoControlTabPageContainer::removeTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainer::removeTabPageContainerListener( const Reference< css::awt::tab::XTabPageContainerListener >& listener ) { if( getPeer().is() && m_aTabPageListeners.getLength() == 1 ) { @@ -322,7 +322,7 @@ void UnoControlTabPageContainer::updateFromModel() xContainerListener->elementInserted( aEvent ); } } -void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< css::awt::XControl >& Control ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< css::awt::XControl >& Control ) { SolarMutexGuard aSolarGuard; ControlContainerBase::addControl(Name,Control); diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 488d72a325ed..b8f67f88f86c 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -59,12 +59,12 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c ImplRegisterProperty( BASEPROPERTY_HELPURL ); } -OUString SAL_CALL UnoControlTabPageModel::getImplementationName() throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL UnoControlTabPageModel::getImplementationName() { return OUString("stardiv.Toolkit.UnoControlTabPageModel"); } -css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServiceNames() { css::uno::Sequence< OUString > aNames = ControlModelContainerBase::getSupportedServiceNames( ); aNames.realloc( aNames.getLength() + 1 ); @@ -72,7 +72,7 @@ css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServ return aNames; } -OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException, std::exception) +OUString UnoControlTabPageModel::getServiceName( ) { return OUString("com.sun.star.awt.tab.UnoControlTabPageModel"); } @@ -104,14 +104,13 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return *pHelper; } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } ////----- XInitialization ------------------------------------------------------------------- void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { sal_Int16 nPageId = -1; if ( rArguments.getLength() == 1 ) @@ -181,25 +180,22 @@ OUString UnoControlTabPage::GetComponentServiceName() } OUString SAL_CALL UnoControlTabPage::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlTabPage"); } sal_Bool SAL_CALL UnoControlTabPage::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL UnoControlTabPage::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq { "com.sun.star.awt.tab.UnoControlTabPage" }; return aSeq; } -void UnoControlTabPage::dispose() throw(RuntimeException, std::exception) +void UnoControlTabPage::dispose() { SolarMutexGuard aSolarGuard; @@ -208,12 +204,12 @@ void UnoControlTabPage::dispose() throw(RuntimeException, std::exception) ControlContainerBase::dispose(); } -void SAL_CALL UnoControlTabPage::disposing( const lang::EventObject& Source )throw(RuntimeException, std::exception) +void SAL_CALL UnoControlTabPage::disposing( const lang::EventObject& Source ) { ControlContainerBase::disposing( Source ); } -void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) +void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { SolarMutexGuard aSolarGuard; ImplUpdateResourceResolver(); @@ -239,7 +235,6 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize } // css::awt::XWindowListener void SAL_CALL UnoControlTabPage::windowResized( const css::awt::WindowEvent& e ) -throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -277,7 +272,6 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL UnoControlTabPage::windowMoved( const css::awt::WindowEvent& e ) -throw (css::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -303,13 +297,11 @@ throw (css::uno::RuntimeException, std::exception) } void SAL_CALL UnoControlTabPage::windowShown( const css::lang::EventObject& e ) -throw (css::uno::RuntimeException, std::exception) { (void)e; } void SAL_CALL UnoControlTabPage::windowHidden( const css::lang::EventObject& e ) -throw (css::uno::RuntimeException, std::exception) { (void)e; } diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index 3c42011c0b08..8acda6794406 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -44,20 +44,18 @@ namespace toolkit } - OUString UnoControlScrollBarModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) + OUString UnoControlScrollBarModel::getServiceName( ) { return OUString::createFromAscii( szServiceName_UnoControlScrollBarModel ); } OUString UnoControlScrollBarModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlScrollBarModel"); } css::uno::Sequence<OUString> UnoControlScrollBarModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -93,7 +91,7 @@ namespace toolkit } - uno::Reference< beans::XPropertySetInfo > UnoControlScrollBarModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) + uno::Reference< beans::XPropertySetInfo > UnoControlScrollBarModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -114,7 +112,7 @@ namespace toolkit } // css::uno::XInterface - uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) + uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XAdjustmentListener* >(this)), @@ -129,7 +127,7 @@ namespace toolkit UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END - void UnoScrollBarControl::dispose() throw(uno::RuntimeException, std::exception) + void UnoScrollBarControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -137,7 +135,7 @@ namespace toolkit UnoControl::dispose(); } - void UnoScrollBarControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) + void UnoScrollBarControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -146,7 +144,7 @@ namespace toolkit } // css::awt::XAdjustmentListener - void UnoScrollBarControl::adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) { switch ( rEvent.Type ) { @@ -174,29 +172,29 @@ namespace toolkit } // css::awt::XScrollBar - void UnoScrollBarControl::addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) { maAdjustmentListeners.addInterface( l ); } - void UnoScrollBarControl::removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener > & l ) { maAdjustmentListeners.removeInterface( l ); } - void UnoScrollBarControl::setValue( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setValue( sal_Int32 n ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), uno::makeAny( n ), true ); } - void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), uno::Any(nValue), true ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), uno::Any(nVisible), true ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), uno::Any(nMax), true ); } - sal_Int32 UnoScrollBarControl::getValue() throw(css::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getValue() { sal_Int32 n = 0; if ( getPeer().is() ) @@ -207,12 +205,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setMaximum( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setMaximum( sal_Int32 n ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getMaximum() throw(css::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getMaximum() { sal_Int32 n = 0; if ( getPeer().is() ) @@ -223,12 +221,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setLineIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setLineIncrement( sal_Int32 n ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINEINCREMENT ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getLineIncrement() throw(css::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getLineIncrement() { sal_Int32 n = 0; if ( getPeer().is() ) @@ -239,12 +237,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setBlockIncrement( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setBlockIncrement( sal_Int32 n ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BLOCKINCREMENT ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getBlockIncrement() throw(css::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getBlockIncrement() { sal_Int32 n = 0; if ( getPeer().is() ) @@ -255,12 +253,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setVisibleSize( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setVisibleSize( sal_Int32 n ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getVisibleSize() throw(css::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getVisibleSize() { sal_Int32 n = 0; if ( getPeer().is() ) @@ -271,12 +269,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setOrientation( sal_Int32 n ) throw(css::uno::RuntimeException, std::exception) + void UnoScrollBarControl::setOrientation( sal_Int32 n ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getOrientation() throw(css::uno::RuntimeException, std::exception) + sal_Int32 UnoScrollBarControl::getOrientation() { sal_Int32 n = 0; if ( getPeer().is() ) @@ -288,13 +286,11 @@ namespace toolkit } OUString UnoScrollBarControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoScrollBarControl"); } css::uno::Sequence<OUString> UnoScrollBarControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index d69051025218..9807970109b7 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -52,14 +52,14 @@ public: UnoControlModel* Clone() const override { return new UnoSpinButtonModel( *this ); } // XMultiPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getServiceName() override; // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName( ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -81,36 +81,36 @@ public: OUString GetComponentServiceName() override; DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase ) - css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; - void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override { UnoControlBase::disposing( Source ); } - void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override; + void SAL_CALL disposing( const css::lang::EventObject& Source ) override { UnoControlBase::disposing( Source ); } + void SAL_CALL dispose( ) override; // XTypeProvider DECLARE_XTYPEPROVIDER() // XAdjustmentListener - void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) override; // XSpinValue - virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( sal_Int32 value ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinimum( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaximum( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSpinIncrement( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getOrientation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) override; + virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) override; + virtual void SAL_CALL setValue( sal_Int32 value ) override; + virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) override; + virtual sal_Int32 SAL_CALL getValue( ) override; + virtual void SAL_CALL setMinimum( sal_Int32 minValue ) override; + virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) override; + virtual sal_Int32 SAL_CALL getMinimum( ) override; + virtual sal_Int32 SAL_CALL getMaximum( ) override; + virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) override; + virtual sal_Int32 SAL_CALL getSpinIncrement( ) override; + virtual void SAL_CALL setOrientation( sal_Int32 orientation ) override; + virtual sal_Int32 SAL_CALL getOrientation( ) override; // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName( ) override; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -143,7 +143,7 @@ public: } - OUString UnoSpinButtonModel::getServiceName( ) throw (RuntimeException, std::exception) + OUString UnoSpinButtonModel::getServiceName( ) { return OUString("com.sun.star.awt.UnoControlSpinButtonModel"); } @@ -180,20 +180,20 @@ public: } - Reference< XPropertySetInfo > UnoSpinButtonModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > UnoSpinButtonModel::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - OUString SAL_CALL UnoSpinButtonModel::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL UnoSpinButtonModel::getImplementationName( ) { return OUString( "stardiv.Toolkit.UnoSpinButtonModel" ); } - Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() { Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); @@ -218,7 +218,7 @@ public: } - Any UnoSpinButtonControl::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception) + Any UnoSpinButtonControl::queryAggregation( const Type & rType ) { Any aRet = UnoControlBase::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -230,7 +230,7 @@ public: IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoSpinButtonControl, UnoControlBase, UnoSpinButtonControl_Base ) - void UnoSpinButtonControl::dispose() throw(RuntimeException, std::exception) + void UnoSpinButtonControl::dispose() { ::osl::ClearableMutexGuard aGuard( GetMutex() ); if ( maAdjustmentListeners.getLength() ) @@ -250,13 +250,13 @@ public: } - OUString SAL_CALL UnoSpinButtonControl::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL UnoSpinButtonControl::getImplementationName( ) { return OUString( "stardiv.Toolkit.UnoSpinButtonControl" ); } - Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() { Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); @@ -265,7 +265,7 @@ public: } - void UnoSpinButtonControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) + void UnoSpinButtonControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -275,7 +275,7 @@ public: } - void UnoSpinButtonControl::adjustmentValueChanged( const AdjustmentEvent& rEvent ) throw(RuntimeException, std::exception) + void UnoSpinButtonControl::adjustmentValueChanged( const AdjustmentEvent& rEvent ) { switch ( rEvent.Type ) { @@ -297,27 +297,27 @@ public: } - void UnoSpinButtonControl::addAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException, std::exception) + void UnoSpinButtonControl::addAdjustmentListener( const Reference< XAdjustmentListener > & listener ) { ::osl::MutexGuard aGuard( GetMutex() ); maAdjustmentListeners.addInterface( listener ); } - void UnoSpinButtonControl::removeAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException, std::exception) + void UnoSpinButtonControl::removeAdjustmentListener( const Reference< XAdjustmentListener > & listener ) { ::osl::MutexGuard aGuard( GetMutex() ); maAdjustmentListeners.removeInterface( listener ); } - void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value ) throw (RuntimeException, std::exception) + void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), true ); } - void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException, std::exception) + void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), true ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), true ); @@ -325,7 +325,7 @@ public: } - sal_Int32 SAL_CALL UnoSpinButtonControl::getValue( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL UnoSpinButtonControl::getValue( ) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nValue = 0; @@ -338,19 +338,19 @@ public: } - void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException, std::exception) + void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), true ); } - void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException, std::exception) + void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), true ); } - sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum( ) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nMin = 0; @@ -363,7 +363,7 @@ public: } - sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum( ) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nMax = 0; @@ -376,13 +376,13 @@ public: } - void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException, std::exception) + void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), true ); } - sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement( ) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nIncrement = 0; @@ -395,13 +395,13 @@ public: } - void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), true ); } - sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation( ) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nOrientation = ScrollBarOrientation::HORIZONTAL; diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 428d5b9ddfcc..3cba6623cd6c 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -79,7 +79,7 @@ UnoControlModel* UnoTreeModel::Clone() const return new UnoTreeModel( *this ); } -OUString UnoTreeModel::getServiceName() throw(RuntimeException, std::exception) +OUString UnoTreeModel::getServiceName() { return OUString( "com.sun.star.awt.tree.TreeControlModel" ); } @@ -120,7 +120,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // XMultiPropertySet -Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -138,47 +138,47 @@ public: OUString GetComponentServiceName() override; // css::lang::XComponent - void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose( ) override; // css::awt::XControl - void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) override; // 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::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoTreeControl, UnoControlBase, "com.sun.star.awt.tree.TreeControl" ) @@ -207,19 +207,19 @@ OUString UnoTreeControl::GetComponentServiceName() // css::view::XSelectionSupplier -sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->select( rSelection ); } -Any SAL_CALL UnoTreeControl::getSelection() throw (RuntimeException, std::exception) +Any SAL_CALL UnoTreeControl::getSelection() { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelection(); } -void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) { maSelectionListeners.addInterface( xListener ); if( getPeer().is() && (maSelectionListeners.getLength() == 1) ) @@ -231,7 +231,7 @@ void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSele } -void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) { if( getPeer().is() && (maSelectionListeners.getLength() == 1) ) { @@ -246,37 +246,37 @@ void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XS // css::view::XMultiSelectionSupplier -sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->addSelection(rSelection); } -void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->removeSelection(rSelection); } -void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::clearSelection() { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->clearSelection(); } -sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelectionCount(); } -Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() throw (RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createSelectionEnumeration(); } -Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() throw (RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createReverseSelectionEnumeration(); } @@ -285,67 +285,67 @@ Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumera // XTreeControl -OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() throw (RuntimeException, std::exception) +OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultExpandedGraphicURL(); } -void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->setDefaultExpandedGraphicURL(_defaultexpansiongraphicurl); } -OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() throw (RuntimeException, std::exception) +OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultCollapsedGraphicURL(); } -void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->setDefaultCollapsedGraphicURL(_defaultcollapsedgraphicurl); } -sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) +sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeExpanded(xNode); } -sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) +sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeCollapsed(xNode); } -void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) +void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->makeNodeVisible(xNode); } -sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) +sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeVisible(xNode); } -void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) +void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->expandNode(xNode); } -void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) +void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->collapseNode(xNode); } -void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) { maTreeExpansionListeners.addInterface( xListener ); if( getPeer().is() && (maTreeExpansionListeners.getLength() == 1) ) @@ -357,7 +357,7 @@ void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeEx } -void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) { if( getPeer().is() && (maTreeExpansionListeners.getLength() == 1) ) { @@ -369,49 +369,49 @@ void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTre } -Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) +Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeForLocation(x,y); } -Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) +Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getClosestNodeForLocation(x,y); } -awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) throw (IllegalArgumentException, RuntimeException, std::exception) +awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeRect( Node ); } -sal_Bool SAL_CALL UnoTreeControl::isEditing( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoTreeControl::isEditing( ) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isEditing(); } -sal_Bool SAL_CALL UnoTreeControl::stopEditing() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoTreeControl::stopEditing() { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->stopEditing(); } -void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::cancelEditing() { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->cancelEditing(); } -void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->startEditingAtNode(xNode); } -void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) { maTreeEditListeners.addInterface( xListener ); if( getPeer().is() && (maTreeEditListeners.getLength() == 1) ) @@ -423,7 +423,7 @@ void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditLis } -void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) { if( getPeer().is() && (maTreeEditListeners.getLength() == 1) ) { @@ -438,7 +438,7 @@ void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEdit // XComponent -void SAL_CALL UnoTreeControl::dispose( ) throw(RuntimeException, std::exception) +void SAL_CALL UnoTreeControl::dispose( ) { lang::EventObject aEvt; aEvt.Source = static_cast< ::cppu::OWeakObject* >(this); @@ -447,7 +447,7 @@ void SAL_CALL UnoTreeControl::dispose( ) throw(RuntimeException, std::exception UnoControl::dispose(); } -void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -460,7 +460,7 @@ void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk } -void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node ) throw (RuntimeException, css::util::VetoException, std::exception) +void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node ) { ::comphelper::OInterfaceIteratorHelper2 aIt( *this ); while( aIt.hasMoreElements() ) @@ -484,7 +484,7 @@ void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNo } } -void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNode >& Node, const OUString& NewText ) throw (RuntimeException, std::exception) +void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNode >& Node, const OUString& NewText ) { ::comphelper::OInterfaceIteratorHelper2 aIt( *this ); while( aIt.hasMoreElements() ) diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index 6b014d84d5e1..e40f9410185e 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -43,18 +43,16 @@ public: UnoControlModel* Clone() const override; // css::beans::XMultiPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // css::io::XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getServiceName() override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("stardiv.Toolkit.TreeControlModel"); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 1); diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 0f925a5566fa..d150b242cc13 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -53,23 +53,23 @@ public: void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode ); // XMutableTreeDataModel - virtual css::uno::Reference< css::awt::tree::XMutableTreeNode > SAL_CALL createNode( const css::uno::Any& DisplayValue, sal_Bool ChildrenOnDemand ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRoot( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& RootNode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tree::XMutableTreeNode > SAL_CALL createNode( const css::uno::Any& DisplayValue, sal_Bool ChildrenOnDemand ) override; + virtual void SAL_CALL setRoot( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& RootNode ) override; // XTreeDataModel - virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getRoot( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getRoot( ) override; + virtual void SAL_CALL addTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) override; + virtual void SAL_CALL removeTreeDataModelListener( const css::uno::Reference< css::awt::tree::XTreeDataModelListener >& Listener ) override; // XComponent - virtual void SAL_CALL dispose( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override; // 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: bool mbDisposed; @@ -89,32 +89,32 @@ public: void broadcast_changes(const Reference< XTreeNode >& xNode, bool bNew); // XMutableTreeNode - virtual css::uno::Any SAL_CALL getDataValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDataValue( const css::uno::Any& _datavalue ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendChild( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertChildByIndex( ::sal_Int32 Index, const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHasChildrenOnDemand( sal_Bool ChildrenOnDemand ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayValue( const css::uno::Any& Value ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getDataValue() override; + virtual void SAL_CALL setDataValue( const css::uno::Any& _datavalue ) override; + virtual void SAL_CALL appendChild( const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) override; + virtual void SAL_CALL insertChildByIndex( ::sal_Int32 Index, const css::uno::Reference< css::awt::tree::XMutableTreeNode >& ChildNode ) override; + virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) override; + virtual void SAL_CALL setHasChildrenOnDemand( sal_Bool ChildrenOnDemand ) override; + virtual void SAL_CALL setDisplayValue( const css::uno::Any& Value ) override; + virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) override; + virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) override; + virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) override; // XTreeNode - virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getIndex( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasChildrenOnDemand( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getDisplayValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNodeGraphicURL( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExpandedGraphicURL( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCollapsedGraphicURL( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) override; + virtual ::sal_Int32 SAL_CALL getChildCount( ) override; + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getParent( ) override; + virtual ::sal_Int32 SAL_CALL getIndex( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) override; + virtual sal_Bool SAL_CALL hasChildrenOnDemand( ) override; + virtual css::uno::Any SAL_CALL getDisplayValue( ) override; + virtual OUString SAL_CALL getNodeGraphicURL( ) override; + virtual OUString SAL_CALL getExpandedGraphicURL( ) override; + virtual OUString SAL_CALL getCollapsedGraphicURL( ) 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; static Reference< XTreeNode > getReference( MutableTreeNode* pNode ) { @@ -164,12 +164,12 @@ void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTr } } -Reference< XMutableTreeNode > SAL_CALL MutableTreeDataModel::createNode( const Any& aValue, sal_Bool bChildrenOnDemand ) throw (RuntimeException, std::exception) +Reference< XMutableTreeNode > SAL_CALL MutableTreeDataModel::createNode( const Any& aValue, sal_Bool bChildrenOnDemand ) { return new MutableTreeNode( this, aValue, bChildrenOnDemand ); } -void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >& xNode ) { if( !xNode.is() ) throw IllegalArgumentException(); @@ -196,23 +196,23 @@ void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode > } } -Reference< XTreeNode > SAL_CALL MutableTreeDataModel::getRoot( ) throw (RuntimeException, std::exception) +Reference< XTreeNode > SAL_CALL MutableTreeDataModel::getRoot( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mxRootNode; } -void SAL_CALL MutableTreeDataModel::addTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeDataModel::addTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) { BrdcstHelper.addListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener ); } -void SAL_CALL MutableTreeDataModel::removeTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeDataModel::removeTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) { BrdcstHelper.removeListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener ); } -void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeDataModel::dispose() { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -225,27 +225,27 @@ void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException, std::exce } } -void SAL_CALL MutableTreeDataModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeDataModel::addEventListener( const Reference< XEventListener >& xListener ) { BrdcstHelper.addListener( cppu::UnoType<XEventListener>::get(), xListener ); } -void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEventListener >& xListener ) { BrdcstHelper.removeListener( cppu::UnoType<XEventListener>::get(), xListener ); } -OUString SAL_CALL MutableTreeDataModel::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL MutableTreeDataModel::getImplementationName( ) { return OUString( "toolkit.MutableTreeDataModel" ); } -sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames( ) { Sequence<OUString> aSeq { "com.sun.star.awt.tree.MutableTreeDataModel" }; return aSeq; @@ -291,19 +291,19 @@ void MutableTreeNode::broadcast_changes(const Reference< XTreeNode >& xNode, boo } } -Any SAL_CALL MutableTreeNode::getDataValue() throw (RuntimeException, std::exception) +Any SAL_CALL MutableTreeNode::getDataValue() { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maDataValue; } -void SAL_CALL MutableTreeNode::setDataValue( const Any& _datavalue ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::setDataValue( const Any& _datavalue ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); maDataValue = _datavalue; } -void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >& xChildNode ) throw (IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >& xChildNode ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); Reference< XTreeNode > xNode( xChildNode.get() ); @@ -319,7 +319,7 @@ void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >& broadcast_changes( xNode, true ); } -void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const Reference< XMutableTreeNode >& xChildNode ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const Reference< XMutableTreeNode >& xChildNode ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -343,7 +343,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const broadcast_changes( xNode, true ); } -void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -367,7 +367,7 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw broadcast_changes( getReference( xImpl.get() ), false ); } -void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDemand ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDemand ) { bool bChanged; @@ -381,7 +381,7 @@ void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDeman broadcast_changes(); } -void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue ) { { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -391,7 +391,7 @@ void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue ) throw (Runti broadcast_changes(); } -void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL ) { bool bChanged; @@ -405,7 +405,7 @@ void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL ) throw ( broadcast_changes(); } -void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL ) { bool bChanged; @@ -419,7 +419,7 @@ void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL ) thr broadcast_changes(); } -void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception) +void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL ) { bool bChanged; @@ -433,7 +433,7 @@ void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL ) th broadcast_changes(); } -Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException,RuntimeException, std::exception) +Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -442,19 +442,19 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd return getReference( maChildren[nChildIndex].get() ); } -sal_Int32 SAL_CALL MutableTreeNode::getChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL MutableTreeNode::getChildCount( ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return (sal_Int32)maChildren.size(); } -Reference< XTreeNode > SAL_CALL MutableTreeNode::getParent( ) throw (RuntimeException, std::exception) +Reference< XTreeNode > SAL_CALL MutableTreeNode::getParent( ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return getReference( mpParent ); } -sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNode ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNode ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -472,47 +472,47 @@ sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNod return -1; } -sal_Bool SAL_CALL MutableTreeNode::hasChildrenOnDemand( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL MutableTreeNode::hasChildrenOnDemand( ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return mbHasChildrenOnDemand; } -Any SAL_CALL MutableTreeNode::getDisplayValue( ) throw (RuntimeException, std::exception) +Any SAL_CALL MutableTreeNode::getDisplayValue( ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maDisplayValue; } -OUString SAL_CALL MutableTreeNode::getNodeGraphicURL( ) throw (RuntimeException, std::exception) +OUString SAL_CALL MutableTreeNode::getNodeGraphicURL( ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maNodeGraphicURL; } -OUString SAL_CALL MutableTreeNode::getExpandedGraphicURL( ) throw (RuntimeException, std::exception) +OUString SAL_CALL MutableTreeNode::getExpandedGraphicURL( ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maExpandedGraphicURL; } -OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL( ) throw (RuntimeException, std::exception) +OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL( ) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maCollapsedGraphicURL; } -OUString SAL_CALL MutableTreeNode::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL MutableTreeNode::getImplementationName( ) { return OUString( "toolkit.MutableTreeNode" ); } -sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames( ) { Sequence<OUString> aSeq { "com.sun.star.awt.tree.MutableTreeNode" }; return aSeq; diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 3bf3d5d51d43..c074859e02ba 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -341,7 +341,7 @@ UnoControl::DisposeAccessibleContext(Reference<XComponent> const& xContextComp) } } -void UnoControl::dispose( ) throw(RuntimeException, std::exception) +void UnoControl::dispose( ) { Reference< XWindowPeer > xPeer; Reference<XComponent> xAccessibleComp; @@ -380,14 +380,14 @@ void UnoControl::dispose( ) throw(RuntimeException, std::exception) setContext( Reference< XInterface > () ); } -void UnoControl::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::addEventListener( const Reference< XEventListener >& rxListener ) { ::osl::MutexGuard aGuard( GetMutex() ); maDisposeListeners.addInterface( rxListener ); } -void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -400,7 +400,7 @@ bool UnoControl::requiresNewPeer( const OUString& /* _rPropertyName */ ) const } // XPropertiesChangeListener -void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception) +void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvents ) { Sequence< PropertyChangeEvent > aEvents( rEvents ); { @@ -660,7 +660,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent } } -void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException, std::exception) +void UnoControl::disposing( const EventObject& rEvt ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // do not compare differing types in case of multiple inheritance @@ -684,7 +684,7 @@ void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException, st } -void SAL_CALL UnoControl::setOutputSize( const awt::Size& aSize ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControl::setOutputSize( const awt::Size& aSize ) { Reference< XWindow2 > xPeerWindow; { @@ -711,33 +711,33 @@ namespace } } -awt::Size SAL_CALL UnoControl::getOutputSize( ) throw (RuntimeException, std::exception) +awt::Size SAL_CALL UnoControl::getOutputSize( ) { return lcl_askPeer( getPeer(), &XWindow2::getOutputSize, awt::Size() ); } -sal_Bool SAL_CALL UnoControl::isVisible( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoControl::isVisible( ) { return lcl_askPeer( getPeer(), &XWindow2::isVisible, maComponentInfos.bVisible ); } -sal_Bool SAL_CALL UnoControl::isActive( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoControl::isActive( ) { return lcl_askPeer( getPeer(), &XWindow2::isActive, false ); } -sal_Bool SAL_CALL UnoControl::isEnabled( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoControl::isEnabled( ) { return lcl_askPeer( getPeer(), &XWindow2::isEnabled, maComponentInfos.bEnable ); } -sal_Bool SAL_CALL UnoControl::hasFocus( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL UnoControl::hasFocus( ) { return lcl_askPeer( getPeer(), &XWindow2::hasFocus, false ); } // XWindow -void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(RuntimeException, std::exception) +void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) { Reference< XWindow > xWindow; { @@ -760,7 +760,7 @@ void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 xWindow->setPosSize( X, Y, Width, Height, Flags ); } -awt::Rectangle UnoControl::getPosSize( ) throw(RuntimeException, std::exception) +awt::Rectangle UnoControl::getPosSize( ) { awt::Rectangle aRect( maComponentInfos.nX, maComponentInfos.nY, maComponentInfos.nWidth, maComponentInfos.nHeight); Reference< XWindow > xWindow; @@ -775,7 +775,7 @@ awt::Rectangle UnoControl::getPosSize( ) throw(RuntimeException, std::exception return aRect; } -void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException, std::exception) +void UnoControl::setVisible( sal_Bool bVisible ) { Reference< XWindow > xWindow; { @@ -789,7 +789,7 @@ void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException, std::ex xWindow->setVisible( bVisible ); } -void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException, std::exception) +void UnoControl::setEnable( sal_Bool bEnable ) { Reference< XWindow > xWindow; { @@ -803,7 +803,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException, std::exce xWindow->setEnable( bEnable ); } -void UnoControl::setFocus( ) throw(RuntimeException, std::exception) +void UnoControl::setFocus( ) { Reference< XWindow > xWindow; { @@ -814,7 +814,7 @@ void UnoControl::setFocus( ) throw(RuntimeException, std::exception) xWindow->setFocus(); } -void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -827,7 +827,7 @@ void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListen xPeerWindow->addWindowListener( &maWindowListeners ); } -void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -840,7 +840,7 @@ void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxLis xPeerWindow->removeWindowListener( &maWindowListeners ); } -void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -853,7 +853,7 @@ void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener xPeerWindow->addFocusListener( &maFocusListeners ); } -void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -866,7 +866,7 @@ void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListe xPeerWindow->removeFocusListener( &maFocusListeners ); } -void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -879,7 +879,7 @@ void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) t xPeerWindow->addKeyListener( &maKeyListeners); } -void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -892,7 +892,7 @@ void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener xPeerWindow->removeKeyListener( &maKeyListeners); } -void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -905,7 +905,7 @@ void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener xPeerWindow->addMouseListener( &maMouseListeners); } -void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -918,7 +918,7 @@ void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListe xPeerWindow->removeMouseListener( &maMouseListeners ); } -void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -931,7 +931,7 @@ void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener > xPeerWindow->addMouseMotionListener( &maMouseMotionListeners); } -void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -944,7 +944,7 @@ void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListene xPeerWindow->removeMouseMotionListener( &maMouseMotionListeners ); } -void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -957,7 +957,7 @@ void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener xPeerWindow->addPaintListener( &maPaintListeners); } -void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListener ) throw(RuntimeException, std::exception) +void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListener ) { Reference< XWindow > xPeerWindow; { @@ -971,7 +971,7 @@ void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListe } // XView -sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw(RuntimeException, std::exception) +sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) { Reference< XView > xView; { @@ -983,18 +983,18 @@ sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw( return !xView.is() || xView->setGraphics( rDevice ); } -Reference< XGraphics > UnoControl::getGraphics( ) throw(RuntimeException, std::exception) +Reference< XGraphics > UnoControl::getGraphics( ) { return mxGraphics; } -awt::Size UnoControl::getSize( ) throw(RuntimeException, std::exception) +awt::Size UnoControl::getSize( ) { ::osl::MutexGuard aGuard( GetMutex() ); return awt::Size( maComponentInfos.nWidth, maComponentInfos.nHeight ); } -void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException, std::exception) +void UnoControl::draw( sal_Int32 x, sal_Int32 y ) { Reference< XWindowPeer > xDrawPeer; Reference< XView > xDrawPeerView; @@ -1023,7 +1023,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException, std::e xDrawPeer->dispose(); } -void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException, std::exception) +void UnoControl::setZoom( float fZoomX, float fZoomY ) { Reference< XView > xView; { @@ -1039,14 +1039,14 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException, s } // XControl -void UnoControl::setContext( const Reference< XInterface >& rxContext ) throw(RuntimeException, std::exception) +void UnoControl::setContext( const Reference< XInterface >& rxContext ) { ::osl::MutexGuard aGuard( GetMutex() ); mxContext = rxContext; } -Reference< XInterface > UnoControl::getContext( ) throw(RuntimeException, std::exception) +Reference< XInterface > UnoControl::getContext( ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -1078,7 +1078,7 @@ void UnoControl::peerCreated() xWindow->addPaintListener( &maPaintListeners ); } -void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Reference< XWindowPeer >& rParentPeer ) throw(RuntimeException, std::exception) +void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Reference< XWindowPeer >& rParentPeer ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); if ( !mxModel.is() ) @@ -1320,13 +1320,13 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer } } -Reference< XWindowPeer > UnoControl::getPeer() throw(RuntimeException, std::exception) +Reference< XWindowPeer > UnoControl::getPeer() { ::osl::MutexGuard aGuard( GetMutex() ); return mxPeer; } -sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception) +sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -1364,17 +1364,17 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw return mxModel.is(); } -Reference< XControlModel > UnoControl::getModel( ) throw(RuntimeException, std::exception) +Reference< XControlModel > UnoControl::getModel( ) { return mxModel; } -Reference< XView > UnoControl::getView( ) throw(RuntimeException, std::exception) +Reference< XView > UnoControl::getView( ) { return static_cast< XView* >( this ); } -void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exception) +void UnoControl::setDesignMode( sal_Bool bOn ) { ModeChangeEvent aModeChangeEvent; @@ -1409,36 +1409,36 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exce maModeChangeListeners.notifyEach( &XModeChangeListener::modeChanged, aModeChangeEvent ); } -sal_Bool UnoControl::isDesignMode( ) throw(RuntimeException, std::exception) +sal_Bool UnoControl::isDesignMode( ) { return mbDesignMode; } -sal_Bool UnoControl::isTransparent( ) throw(RuntimeException, std::exception) +sal_Bool UnoControl::isTransparent( ) { return false; } // XServiceInfo -OUString UnoControl::getImplementationName( ) throw(RuntimeException, std::exception) +OUString UnoControl::getImplementationName( ) { OSL_FAIL( "This method should be overridden!" ); return OUString(); } -sal_Bool UnoControl::supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception) +sal_Bool UnoControl::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > UnoControl::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > UnoControl::getSupportedServiceNames( ) { OUString sName( "com.sun.star.awt.UnoControl" ); return Sequence< OUString >( &sName, 1 ); } -Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) { // creation of the context will certainly require the SolarMutex ... SolarMutexGuard aSolarGuard; @@ -1473,30 +1473,30 @@ Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) th return xCurrentContext; } -void SAL_CALL UnoControl::addModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControl::addModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( GetMutex() ); maModeChangeListeners.addInterface( _rxListener ); } -void SAL_CALL UnoControl::removeModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL UnoControl::removeModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( GetMutex() ); maModeChangeListeners.removeInterface( _rxListener ); } -void SAL_CALL UnoControl::addModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL UnoControl::addModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) { throw NoSupportException( ); } -void SAL_CALL UnoControl::removeModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL UnoControl::removeModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) { throw NoSupportException( ); } -awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException, std::exception) +awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, ::sal_Int16 i_TargetUnit ) { Reference< XUnitConversion > xPeerConversion; { @@ -1509,7 +1509,7 @@ awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, } -awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException, std::exception) +awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, ::sal_Int16 i_SourceUnit ) { Reference< XUnitConversion > xPeerConversion; { @@ -1522,7 +1522,7 @@ awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, } -awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException, std::exception) +awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sal_Int16 i_TargetUnit ) { Reference< XUnitConversion > xPeerConversion; { @@ -1535,7 +1535,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sa } -awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException, std::exception) +awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sal_Int16 i_SourceUnit ) { Reference< XUnitConversion > xPeerConversion; { @@ -1548,7 +1548,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sa } -uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() throw (RuntimeException, std::exception) +uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() { Reference< awt::XStyleSettingsSupplier > xPeerSupplier; { diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index d752eb177b9a..d64d9f75562c 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -354,21 +354,19 @@ public: : mxControlContainer( xControlContainer ) {} // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw( uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& evt ) override; }; void SAL_CALL DialogStepChangedListener::disposing( const lang::EventObject& /*_rSource*/) - throw( uno::RuntimeException, std::exception) { mxControlContainer.clear(); } void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyChangeEvent& evt ) - throw( uno::RuntimeException, std::exception) { // evt.PropertyName HAS to be "Step" because we only use the listener for that sal_Int32 nDialogStep = 0; @@ -411,7 +409,7 @@ void UnoControlContainer::ImplActivateTabControllers() } // lang::XComponent -void UnoControlContainer::dispose( ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::dispose( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -444,7 +442,7 @@ void UnoControlContainer::dispose( ) throw(uno::RuntimeException, std::exceptio } // lang::XEventListener -void UnoControlContainer::disposing( const lang::EventObject& _rEvt ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::disposing( const lang::EventObject& _rEvt ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -456,14 +454,14 @@ void UnoControlContainer::disposing( const lang::EventObject& _rEvt ) throw(uno: } // container::XContainer -void UnoControlContainer::addContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::addContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maCListeners.addInterface( rxListener ); } -void UnoControlContainer::removeContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::removeContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -471,7 +469,7 @@ void UnoControlContainer::removeContainerListener( const uno::Reference< contain } -::sal_Int32 SAL_CALL UnoControlContainer::insert( const uno::Any& _rElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoControlContainer::insert( const uno::Any& _rElement ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -486,7 +484,7 @@ void UnoControlContainer::removeContainerListener( const uno::Reference< contain return impl_addControl( xControl ); } -void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -500,7 +498,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier impl_removeControl( _nIdentifier, xControl ); } -void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -538,7 +536,7 @@ void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, } } -uno::Any SAL_CALL UnoControlContainer::getByIdentifier( ::sal_Int32 _nIdentifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL UnoControlContainer::getByIdentifier( ::sal_Int32 _nIdentifier ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -548,7 +546,7 @@ uno::Any SAL_CALL UnoControlContainer::getByIdentifier( ::sal_Int32 _nIdentifier return uno::makeAny( xControl ); } -uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -558,19 +556,19 @@ uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers( ) th } // container::XElementAccess -uno::Type SAL_CALL UnoControlContainer::getElementType( ) throw (uno::RuntimeException, std::exception) +uno::Type SAL_CALL UnoControlContainer::getElementType( ) { return cppu::UnoType<awt::XControlModel>::get(); } -sal_Bool SAL_CALL UnoControlContainer::hasElements( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UnoControlContainer::hasElements( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return !mpControls->empty(); } // awt::XControlContainer -void UnoControlContainer::setStatusText( const OUString& rStatusText ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::setStatusText( const OUString& rStatusText ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -580,7 +578,7 @@ void UnoControlContainer::setStatusText( const OUString& rStatusText ) throw(uno xContainer->setStatusText( rStatusText ); } -uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControls( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControls( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); uno::Sequence< uno::Reference< awt::XControl > > aControls; @@ -588,7 +586,7 @@ uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControl return aControls; } -uno::Reference< awt::XControl > UnoControlContainer::getControl( const OUString& rName ) throw(uno::RuntimeException, std::exception) +uno::Reference< awt::XControl > UnoControlContainer::getControl( const OUString& rName ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mpControls->getControlForName( rName ); @@ -642,7 +640,7 @@ sal_Int32 UnoControlContainer::impl_addControl( const uno::Reference< awt::XCont return id; } -void UnoControlContainer::addControl( const OUString& rName, const uno::Reference< awt::XControl >& rControl ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::addControl( const OUString& rName, const uno::Reference< awt::XControl >& rControl ) { if ( rControl.is() ) impl_addControl( rControl, &rName ); @@ -680,7 +678,7 @@ void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Referen } } -void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& _rxControl ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& _rxControl ) { if ( _rxControl.is() ) { @@ -694,21 +692,21 @@ void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& // awt::XUnoControlContainer -void UnoControlContainer::setTabControllers( const uno::Sequence< uno::Reference< awt::XTabController > >& TabControllers ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::setTabControllers( const uno::Sequence< uno::Reference< awt::XTabController > >& TabControllers ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maTabControllers = TabControllers; } -uno::Sequence< uno::Reference< awt::XTabController > > UnoControlContainer::getTabControllers( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Reference< awt::XTabController > > UnoControlContainer::getTabControllers( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return maTabControllers; } -void UnoControlContainer::addTabController( const uno::Reference< awt::XTabController >& TabController ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::addTabController( const uno::Reference< awt::XTabController >& TabController ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -717,7 +715,7 @@ void UnoControlContainer::addTabController( const uno::Reference< awt::XTabContr maTabControllers[ nCount ] = TabController; } -void UnoControlContainer::removeTabController( const uno::Reference< awt::XTabController >& TabController ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::removeTabController( const uno::Reference< awt::XTabController >& TabController ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -734,7 +732,7 @@ void UnoControlContainer::removeTabController( const uno::Reference< awt::XTabCo } // awt::XControl -void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxToolkit, const uno::Reference< awt::XWindowPeer >& rParent ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxToolkit, const uno::Reference< awt::XWindowPeer >& rParent ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -793,7 +791,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT // awt::XWindow -void UnoControlContainer::setVisible( sal_Bool bVisible ) throw(uno::RuntimeException, std::exception) +void UnoControlContainer::setVisible( sal_Bool bVisible ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -804,13 +802,11 @@ void UnoControlContainer::setVisible( sal_Bool bVisible ) throw(uno::RuntimeExce } OUString UnoControlContainer::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlContainer"); } css::uno::Sequence<OUString> UnoControlContainer::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 342c4626bc26..f4a2d50f5d13 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -40,20 +40,18 @@ UnoControlContainerModel::UnoControlContainerModel( const css::uno::Reference< c ImplRegisterProperty( BASEPROPERTY_TEXT ); } -OUString UnoControlContainerModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlContainerModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlContainerModel ); } OUString UnoControlContainerModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlContainerModel"); } css::uno::Sequence<OUString> UnoControlContainerModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -73,7 +71,7 @@ css::uno::Any UnoControlContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId } -css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > UnoControlContainerModel::getPropertySetInfo( ) { static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 31dca8b755da..d7e0ab636a46 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -411,7 +411,7 @@ void UnoControlModel::ImplRegisterProperties( const std::vector< sal_uInt16 > &r } // css::uno::XInterface -css::uno::Any UnoControlModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any UnoControlModel::queryAggregation( const css::uno::Type & rType ) { Any aRet = UnoControlModel_Base::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -429,7 +429,7 @@ IMPLEMENT_FORWARD_REFCOUNT( UnoControlModel, UnoControlModel_Base ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlModel, UnoControlModel_Base, ::cppu::OPropertySetHelper ) -uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(css::uno::RuntimeException, std::exception) +uno::Reference< util::XCloneable > UnoControlModel::createClone() { UnoControlModel* pClone = Clone(); uno::Reference< util::XCloneable > xClone( static_cast<cppu::OWeakObject*>(pClone), uno::UNO_QUERY ); @@ -437,7 +437,7 @@ uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(css::uno } // css::lang::XComponent -void UnoControlModel::dispose( ) throw(css::uno::RuntimeException, std::exception) +void UnoControlModel::dispose( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -451,14 +451,14 @@ void UnoControlModel::dispose( ) throw(css::uno::RuntimeException, std::excepti OPropertySetHelper::disposing(); } -void UnoControlModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) +void UnoControlModel::addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maDisposeListeners.addInterface( rxListener ); } -void UnoControlModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) +void UnoControlModel::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -467,7 +467,7 @@ void UnoControlModel::removeEventListener( const css::uno::Reference< css::lang: // css::beans::XPropertyState -css::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) +css::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -479,7 +479,7 @@ css::beans::PropertyState UnoControlModel::getPropertyState( const OUString& Pro return CompareProperties( aValue, aDefault ) ? css::beans::PropertyState_DEFAULT_VALUE : css::beans::PropertyState_DIRECT_VALUE; } -css::uno::Sequence< css::beans::PropertyState > UnoControlModel::getPropertyStates( const css::uno::Sequence< OUString >& PropertyNames ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::beans::PropertyState > UnoControlModel::getPropertyStates( const css::uno::Sequence< OUString >& PropertyNames ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -495,7 +495,7 @@ css::uno::Sequence< css::beans::PropertyState > UnoControlModel::getPropertyStat return aStates; } -void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) +void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) { Any aDefaultValue; { @@ -505,7 +505,7 @@ void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw setPropertyValue( PropertyName, aDefaultValue ); } -css::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +css::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -514,7 +514,7 @@ css::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName // css::io::XPersistObjec -OUString UnoControlModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) +OUString UnoControlModel::getServiceName( ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -522,7 +522,7 @@ OUString UnoControlModel::getServiceName( ) throw(css::uno::RuntimeException, s return OUString(); } -void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) +void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -755,7 +755,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt } } -void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) +void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -1022,25 +1022,25 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre // css::lang::XServiceInfo -OUString UnoControlModel::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) +OUString UnoControlModel::getImplementationName( ) { OSL_FAIL( "This method should be overridden!" ); return OUString(); } -sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(css::uno::RuntimeException, std::exception) +sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -css::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) { OUString sName( "com.sun.star.awt.UnoControlModel" ); return Sequence< OUString >( &sName, 1 ); } -sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any& rValue ) throw (IllegalArgumentException, std::exception) +sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nPropId, const Any& rValue ) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -1166,7 +1166,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & return !CompareProperties( rConvertedValue, rOldValue ); } -void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) +void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const css::uno::Any& rValue ) { // Missing: the fake solo properties of the FontDescriptor @@ -1236,7 +1236,7 @@ void UnoControlModel::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nPr } // css::beans::XPropertySet -void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css::uno::Any& rValue ) { sal_Int32 nPropId = 0; { @@ -1251,7 +1251,7 @@ void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const css } // css::beans::XFastPropertySet -void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::Any& rValue ) { if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { @@ -1286,13 +1286,13 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::A } // css::beans::XMultiPropertySet -css::uno::Reference< css::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) { OSL_FAIL( "UnoControlModel::getPropertySetInfo() not possible!" ); return css::uno::Reference< css::beans::XPropertySetInfo >(); } -void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 2264fba931d0..9473f4a7837b 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -118,7 +118,7 @@ UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >& UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit ); } -OUString UnoControlEditModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) +OUString UnoControlEditModel::getServiceName( ) { return OUString::createFromAscii( szServiceName_UnoControlEditModel ); } @@ -154,20 +154,18 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlEditModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlEditModel"); } css::uno::Sequence<OUString> UnoControlEditModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -201,7 +199,7 @@ UnoEditControl::UnoEditControl() mbSetMaxTextLenInPeer = false; } -uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) { uno::Any aReturn = UnoControlBase::queryAggregation( rType ); if ( !aReturn.hasValue() ) @@ -209,7 +207,7 @@ uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) th return aReturn; } -uno::Any SAL_CALL UnoEditControl::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL UnoEditControl::queryInterface( const uno::Type & rType ) { return UnoControlBase::queryInterface( rType ); } @@ -240,7 +238,7 @@ OUString UnoEditControl::GetComponentServiceName() return sName; } -sal_Bool SAL_CALL UnoEditControl::setModel(const uno::Reference< awt::XControlModel >& _rModel) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL UnoEditControl::setModel(const uno::Reference< awt::XControlModel >& _rModel) { bool bReturn = UnoControlBase::setModel( _rModel ); mbHasTextProperty = ImplHasProperty( BASEPROPERTY_TEXT ); @@ -268,14 +266,14 @@ void UnoEditControl::ImplSetPeerProperty( const OUString& rPropName, const uno:: UnoControlBase::ImplSetPeerProperty( rPropName, rVal ); } -void UnoEditControl::dispose() throw(uno::RuntimeException, std::exception) +void UnoEditControl::dispose() { lang::EventObject aEvt( *this ); maTextListeners.disposeAndClear( aEvt ); UnoControl::dispose(); } -void UnoEditControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoEditControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -291,7 +289,7 @@ void UnoEditControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk } } -void UnoEditControl::textChanged(const awt::TextEvent& e) throw(uno::RuntimeException, std::exception) +void UnoEditControl::textChanged(const awt::TextEvent& e) { uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); @@ -308,17 +306,17 @@ void UnoEditControl::textChanged(const awt::TextEvent& e) throw(uno::RuntimeExce maTextListeners.textChanged( e ); } -void UnoEditControl::addTextListener(const uno::Reference< awt::XTextListener > & l) throw(uno::RuntimeException, std::exception) +void UnoEditControl::addTextListener(const uno::Reference< awt::XTextListener > & l) { maTextListeners.addInterface( l ); } -void UnoEditControl::removeTextListener(const uno::Reference< awt::XTextListener > & l) throw(uno::RuntimeException, std::exception) +void UnoEditControl::removeTextListener(const uno::Reference< awt::XTextListener > & l) { maTextListeners.removeInterface( l ); } -void UnoEditControl::setText( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void UnoEditControl::setText( const OUString& aText ) { if ( mbHasTextProperty ) { @@ -351,7 +349,7 @@ namespace } } -void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNewText ) throw(uno::RuntimeException, std::exception) +void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNewText ) { // normalize the selection - OUString::replaceAt has a strange behaviour if the min is greater than the max awt::Selection aSelection( rSel ); @@ -378,7 +376,7 @@ void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNe setSelection( aNewSelection ); } -OUString UnoEditControl::getText() throw(uno::RuntimeException, std::exception) +OUString UnoEditControl::getText() { OUString aText = maText; @@ -394,7 +392,7 @@ OUString UnoEditControl::getText() throw(uno::RuntimeException, std::exception) return aText; } -OUString UnoEditControl::getSelectedText() throw(uno::RuntimeException, std::exception) +OUString UnoEditControl::getSelectedText() { OUString sSelected; uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); @@ -404,14 +402,14 @@ OUString UnoEditControl::getSelectedText() throw(uno::RuntimeException, std::exc return sSelected; } -void UnoEditControl::setSelection( const awt::Selection& aSelection ) throw(uno::RuntimeException, std::exception) +void UnoEditControl::setSelection( const awt::Selection& aSelection ) { uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); if ( xText.is() ) xText->setSelection( aSelection ); } -awt::Selection UnoEditControl::getSelection() throw(uno::RuntimeException, std::exception) +awt::Selection UnoEditControl::getSelection() { awt::Selection aSel; uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); @@ -420,17 +418,17 @@ awt::Selection UnoEditControl::getSelection() throw(uno::RuntimeException, std:: return aSel; } -sal_Bool UnoEditControl::isEditable() throw(uno::RuntimeException, std::exception) +sal_Bool UnoEditControl::isEditable() { return !ImplGetPropertyValue_BOOL( BASEPROPERTY_READONLY ); } -void UnoEditControl::setEditable( sal_Bool bEditable ) throw(uno::RuntimeException, std::exception) +void UnoEditControl::setEditable( sal_Bool bEditable ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_READONLY ), uno::Any(!bEditable), true ); } -sal_Int16 UnoEditControl::getMaxTextLen() throw(uno::RuntimeException, std::exception) +sal_Int16 UnoEditControl::getMaxTextLen() { sal_Int16 nMaxLen = mnMaxTextLen; @@ -440,7 +438,7 @@ sal_Int16 UnoEditControl::getMaxTextLen() throw(uno::RuntimeException, std::exce return nMaxLen; } -void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) throw(uno::RuntimeException, std::exception) +void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) { if ( ImplHasProperty( BASEPROPERTY_MAXTEXTLEN) ) { @@ -456,37 +454,37 @@ void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) throw(uno::RuntimeException } } -awt::Size UnoEditControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoEditControl::getMinimumSize( ) { return Impl_getMinimumSize(); } -awt::Size UnoEditControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoEditControl::getPreferredSize( ) { return Impl_getPreferredSize(); } -awt::Size UnoEditControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) +awt::Size UnoEditControl::calcAdjustedSize( const awt::Size& rNewSize ) { return Impl_calcAdjustedSize( rNewSize ); } -awt::Size UnoEditControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(uno::RuntimeException, std::exception) +awt::Size UnoEditControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) { return Impl_getMinimumSize( nCols, nLines ); } -void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(uno::RuntimeException, std::exception) +void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) { Impl_getColumnsAndLines( nCols, nLines ); } -OUString UnoEditControl::getImplementationName( ) throw(uno::RuntimeException, std::exception) +OUString UnoEditControl::getImplementationName( ) { return OUString( "stardiv.Toolkit.UnoEditControl" ); } -uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() { uno::Sequence< OUString > aNames = UnoControlBase::getSupportedServiceNames( ); aNames.realloc( aNames.getLength() + 2 ); @@ -529,7 +527,7 @@ UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XCompon ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION ); } -OUString UnoControlFileControlModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlFileControlModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlFileControlModel ); } @@ -555,21 +553,19 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlFileControlModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlFileControlModel"); } css::uno::Sequence<OUString> UnoControlFileControlModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -600,13 +596,11 @@ OUString UnoFileControl::GetComponentServiceName() } OUString UnoFileControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoFileControl"); } css::uno::Sequence<OUString> UnoFileControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoEditControl::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -634,7 +628,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return UnoControlModel::ImplGetDefaultValue( nPropId ); } -void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) +void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -711,7 +705,7 @@ UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext osl_atomic_decrement( &m_refCount ); } -OUString UnoControlButtonModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlButtonModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlButtonModel ); } @@ -745,20 +739,18 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlButtonModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlButtonModel"); } css::uno::Sequence<OUString> UnoControlButtonModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(GraphicControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -812,7 +804,7 @@ OUString UnoButtonControl::GetComponentServiceName() return aName; } -void UnoButtonControl::dispose() throw(uno::RuntimeException, std::exception) +void UnoButtonControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -821,7 +813,7 @@ void UnoButtonControl::dispose() throw(uno::RuntimeException, std::exception) UnoControlBase::dispose(); } -void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -835,7 +827,7 @@ void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToo xPushButton->addItemListener( this ); } -void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -845,7 +837,7 @@ void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListe } } -void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -855,22 +847,22 @@ void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionLi maActionListeners.removeInterface( l ); } -void UnoButtonControl::addItemListener(const uno::Reference< awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoButtonControl::addItemListener(const uno::Reference< awt::XItemListener > & l) { maItemListeners.addInterface( l ); } -void UnoButtonControl::removeItemListener(const uno::Reference< awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoButtonControl::removeItemListener(const uno::Reference< awt::XItemListener > & l) { maItemListeners.removeInterface( l ); } -void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source ) { UnoControlBase::disposing( Source ); } -void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) { // forward to model ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16)rEvent.Selected), false ); @@ -881,12 +873,12 @@ void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) maItemListeners.itemStateChanged( aEvent ); } -void UnoButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException, std::exception) +void UnoButtonControl::setLabel( const OUString& rLabel ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(rLabel), true ); } -void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception) +void UnoButtonControl::setActionCommand( const OUString& rCommand ) { maActionCommand = rCommand; if ( getPeer().is() ) @@ -896,29 +888,27 @@ void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::R } } -awt::Size UnoButtonControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoButtonControl::getMinimumSize( ) { return Impl_getMinimumSize(); } -awt::Size UnoButtonControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoButtonControl::getPreferredSize( ) { return Impl_getPreferredSize(); } -awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) +awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) { return Impl_calcAdjustedSize( rNewSize ); } OUString UnoButtonControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoButtonControl"); } css::uno::Sequence<OUString> UnoButtonControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -945,20 +935,18 @@ UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl ); } -OUString UnoControlImageControlModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlImageControlModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlImageControlModel ); } OUString UnoControlImageControlModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlImageControlModel"); } css::uno::Sequence<OUString> UnoControlImageControlModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(GraphicControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 4); @@ -992,13 +980,13 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception) +void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) { GraphicControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); @@ -1061,7 +1049,7 @@ OUString UnoImageControlControl::GetComponentServiceName() return OUString("fixedimage"); } -void UnoImageControlControl::dispose() throw(uno::RuntimeException, std::exception) +void UnoImageControlControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -1069,34 +1057,32 @@ void UnoImageControlControl::dispose() throw(uno::RuntimeException, std::excepti UnoControl::dispose(); } -sal_Bool UnoImageControlControl::isTransparent() throw(uno::RuntimeException, std::exception) +sal_Bool UnoImageControlControl::isTransparent() { return true; } -awt::Size UnoImageControlControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoImageControlControl::getMinimumSize( ) { return Impl_getMinimumSize(); } -awt::Size UnoImageControlControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoImageControlControl::getPreferredSize( ) { return Impl_getPreferredSize(); } -awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) +awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize ) { return Impl_calcAdjustedSize( rNewSize ); } OUString UnoImageControlControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoImageControlControl"); } css::uno::Sequence<OUString> UnoImageControlControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 4); @@ -1124,7 +1110,7 @@ UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XCompon UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton ); } -OUString UnoControlRadioButtonModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlRadioButtonModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlRadioButtonModel ); } @@ -1155,21 +1141,19 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlRadioButtonModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlRadioButtonModel"); } css::uno::Sequence<OUString> UnoControlRadioButtonModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(GraphicControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -1203,7 +1187,7 @@ OUString UnoRadioButtonControl::GetComponentServiceName() return OUString("radiobutton"); } -void UnoRadioButtonControl::dispose() throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -1212,12 +1196,12 @@ void UnoRadioButtonControl::dispose() throw(uno::RuntimeException, std::exceptio } -sal_Bool UnoRadioButtonControl::isTransparent() throw(uno::RuntimeException, std::exception) +sal_Bool UnoRadioButtonControl::isTransparent() { return true; } -void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -1237,17 +1221,17 @@ void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & xVclWindowPeer->setProperty( GetPropertyName( BASEPROPERTY_AUTOTOGGLE ), css::uno::Any(true) ); } -void UnoRadioButtonControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::addItemListener(const uno::Reference < awt::XItemListener > & l) { maItemListeners.addInterface( l ); } -void UnoRadioButtonControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) { maItemListeners.removeInterface( l ); } -void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -1257,7 +1241,7 @@ void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XAction } } -void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -1267,12 +1251,12 @@ void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XAct maActionListeners.removeInterface( l ); } -void UnoRadioButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::setLabel( const OUString& rLabel ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(rLabel), true ); } -void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) { maActionCommand = rCommand; if ( getPeer().is() ) @@ -1282,13 +1266,13 @@ void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(u } } -void UnoRadioButtonControl::setState( sal_Bool bOn ) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::setState( sal_Bool bOn ) { sal_Int16 nState = bOn ? 1 : 0; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(nState), true ); } -sal_Bool UnoRadioButtonControl::getState() throw(uno::RuntimeException, std::exception) +sal_Bool UnoRadioButtonControl::getState() { sal_Int16 nState = 0; uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ) ); @@ -1296,7 +1280,7 @@ sal_Bool UnoRadioButtonControl::getState() throw(uno::RuntimeException, std::exc return nState != 0; } -void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception) +void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16)rEvent.Selected), false ); @@ -1327,29 +1311,27 @@ void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) thr // to be inconsistent with. } -awt::Size UnoRadioButtonControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoRadioButtonControl::getMinimumSize( ) { return Impl_getMinimumSize(); } -awt::Size UnoRadioButtonControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoRadioButtonControl::getPreferredSize( ) { return Impl_getPreferredSize(); } -awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) +awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) { return Impl_calcAdjustedSize( rNewSize ); } OUString UnoRadioButtonControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoRadioButtonControl"); } css::uno::Sequence<OUString> UnoRadioButtonControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -1375,7 +1357,7 @@ UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentCon UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox ); } -OUString UnoControlCheckBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlCheckBoxModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlCheckBoxModel ); } @@ -1406,20 +1388,18 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlCheckBoxModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString( "stardiv.Toolkit.UnoControlCheckBoxModel"); } css::uno::Sequence<OUString> UnoControlCheckBoxModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(GraphicControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -1452,7 +1432,7 @@ OUString UnoCheckBoxControl::GetComponentServiceName() return OUString("checkbox"); } -void UnoCheckBoxControl::dispose() throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -1460,12 +1440,12 @@ void UnoCheckBoxControl::dispose() throw(uno::RuntimeException, std::exception) UnoControlBase::dispose(); } -sal_Bool UnoCheckBoxControl::isTransparent() throw(uno::RuntimeException, std::exception) +sal_Bool UnoCheckBoxControl::isTransparent() { return true; } -void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -1478,17 +1458,17 @@ void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxT xButton->addActionListener( &maActionListeners ); } -void UnoCheckBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) { maItemListeners.addInterface( l ); } -void UnoCheckBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) { maItemListeners.removeInterface( l ); } -void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -1498,7 +1478,7 @@ void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionLis } } -void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -1508,7 +1488,7 @@ void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XAction maActionListeners.removeInterface( l ); } -void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) { maActionCommand = rCommand; if ( getPeer().is() ) @@ -1519,17 +1499,17 @@ void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) throw(uno: } -void UnoCheckBoxControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::setLabel( const OUString& rLabel ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(rLabel), true ); } -void UnoCheckBoxControl::setState( short n ) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::setState( short n ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16) n), true ); } -short UnoCheckBoxControl::getState() throw(uno::RuntimeException, std::exception) +short UnoCheckBoxControl::getState() { short nState = 0; uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ) ); @@ -1537,12 +1517,12 @@ short UnoCheckBoxControl::getState() throw(uno::RuntimeException, std::exception return nState; } -void UnoCheckBoxControl::enableTriState( sal_Bool b ) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::enableTriState( sal_Bool b ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TRISTATE ), uno::Any(b), true ); } -void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception) +void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any((sal_Int16) rEvent.Selected), false ); @@ -1550,29 +1530,27 @@ void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw( maItemListeners.itemStateChanged( rEvent ); } -awt::Size UnoCheckBoxControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoCheckBoxControl::getMinimumSize( ) { return Impl_getMinimumSize(); } -awt::Size UnoCheckBoxControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoCheckBoxControl::getPreferredSize( ) { return Impl_getPreferredSize(); } -awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) +awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) { return Impl_calcAdjustedSize( rNewSize ); } OUString UnoCheckBoxControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoCheckBoxControl"); } css::uno::Sequence<OUString> UnoCheckBoxControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -1598,7 +1576,7 @@ UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink ); } -OUString UnoControlFixedHyperlinkModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlFixedHyperlinkModel::getServiceName() { return OUString( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ); } @@ -1633,7 +1611,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -1664,7 +1642,7 @@ OUString UnoFixedHyperlinkControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XFixedHyperlink* >(this)), @@ -1679,37 +1657,37 @@ IMPL_XTYPEPROVIDER_START( UnoFixedHyperlinkControl ) UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END -sal_Bool UnoFixedHyperlinkControl::isTransparent() throw(uno::RuntimeException, std::exception) +sal_Bool UnoFixedHyperlinkControl::isTransparent() { return true; } -void UnoFixedHyperlinkControl::setText( const OUString& Text ) throw(uno::RuntimeException, std::exception) +void UnoFixedHyperlinkControl::setText( const OUString& Text ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(Text), true ); } -OUString UnoFixedHyperlinkControl::getText() throw(uno::RuntimeException, std::exception) +OUString UnoFixedHyperlinkControl::getText() { return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL ); } -void UnoFixedHyperlinkControl::setURL( const OUString& URL ) throw(css::uno::RuntimeException, std::exception) +void UnoFixedHyperlinkControl::setURL( const OUString& URL ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_URL ), uno::Any(URL), true ); } -OUString UnoFixedHyperlinkControl::getURL( ) throw(css::uno::RuntimeException, std::exception) +OUString UnoFixedHyperlinkControl::getURL( ) { return ImplGetPropertyValue_UString( BASEPROPERTY_URL ); } -void UnoFixedHyperlinkControl::setAlignment( short nAlign ) throw(uno::RuntimeException, std::exception) +void UnoFixedHyperlinkControl::setAlignment( short nAlign ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any((sal_Int16) nAlign), true ); } -short UnoFixedHyperlinkControl::getAlignment() throw(uno::RuntimeException, std::exception) +short UnoFixedHyperlinkControl::getAlignment() { short nAlign = 0; if ( mxModel.is() ) @@ -1720,22 +1698,22 @@ short UnoFixedHyperlinkControl::getAlignment() throw(uno::RuntimeException, std: return nAlign; } -awt::Size UnoFixedHyperlinkControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoFixedHyperlinkControl::getMinimumSize( ) { return Impl_getMinimumSize(); } -awt::Size UnoFixedHyperlinkControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoFixedHyperlinkControl::getPreferredSize( ) { return Impl_getPreferredSize(); } -awt::Size UnoFixedHyperlinkControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) +awt::Size UnoFixedHyperlinkControl::calcAdjustedSize( const awt::Size& rNewSize ) { return Impl_calcAdjustedSize( rNewSize ); } -void UnoFixedHyperlinkControl::dispose() throw(uno::RuntimeException, std::exception) +void UnoFixedHyperlinkControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -1743,7 +1721,7 @@ void UnoFixedHyperlinkControl::dispose() throw(uno::RuntimeException, std::excep UnoControlBase::dispose(); } -void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -1752,7 +1730,7 @@ void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit > xFixedHyperlink->addActionListener( &maActionListeners ); } -void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XActionListener > & l) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -1762,7 +1740,7 @@ void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XAct } } -void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -1789,7 +1767,7 @@ UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedText ); } -OUString UnoControlFixedTextModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlFixedTextModel::getServiceName() { return OUString( "stardiv.vcl.controlmodel.FixedText" ); } @@ -1820,21 +1798,19 @@ uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlFixedTextModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlFixedTextModel"); } css::uno::Sequence<OUString> UnoControlFixedTextModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -1867,7 +1843,7 @@ OUString UnoFixedTextControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XFixedText* >(this)), @@ -1882,27 +1858,27 @@ IMPL_XTYPEPROVIDER_START( UnoFixedTextControl ) UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END -sal_Bool UnoFixedTextControl::isTransparent() throw(uno::RuntimeException, std::exception) +sal_Bool UnoFixedTextControl::isTransparent() { return true; } -void UnoFixedTextControl::setText( const OUString& Text ) throw(uno::RuntimeException, std::exception) +void UnoFixedTextControl::setText( const OUString& Text ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(Text), true ); } -OUString UnoFixedTextControl::getText() throw(uno::RuntimeException, std::exception) +OUString UnoFixedTextControl::getText() { return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL ); } -void UnoFixedTextControl::setAlignment( short nAlign ) throw(uno::RuntimeException, std::exception) +void UnoFixedTextControl::setAlignment( short nAlign ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any((sal_Int16) nAlign), true ); } -short UnoFixedTextControl::getAlignment() throw(uno::RuntimeException, std::exception) +short UnoFixedTextControl::getAlignment() { short nAlign = 0; if ( mxModel.is() ) @@ -1913,29 +1889,27 @@ short UnoFixedTextControl::getAlignment() throw(uno::RuntimeException, std::exce return nAlign; } -awt::Size UnoFixedTextControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoFixedTextControl::getMinimumSize( ) { return Impl_getMinimumSize(); } -awt::Size UnoFixedTextControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoFixedTextControl::getPreferredSize( ) { return Impl_getPreferredSize(); } -awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) +awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) { return Impl_calcAdjustedSize( rNewSize ); } OUString UnoFixedTextControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoFixedTextControl"); } css::uno::Sequence<OUString> UnoFixedTextControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -1970,7 +1944,7 @@ UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XComponentCon ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE ); } -OUString UnoControlGroupBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlGroupBoxModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlGroupBoxModel ); } @@ -1996,20 +1970,18 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlGroupBoxModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlGroupBoxModel"); } css::uno::Sequence<OUString> UnoControlGroupBoxModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -2041,19 +2013,17 @@ OUString UnoGroupBoxControl::GetComponentServiceName() return OUString("groupbox"); } -sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException, std::exception) +sal_Bool UnoGroupBoxControl::isTransparent() { return true; } OUString UnoGroupBoxControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoGroupBoxControl"); } css::uno::Sequence<OUString> UnoGroupBoxControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -2199,13 +2169,11 @@ UnoControlListBoxModel::~UnoControlListBoxModel() } OUString UnoControlListBoxModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlListBoxModel"); } css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -2214,7 +2182,7 @@ css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames() return s; } -OUString UnoControlListBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlListBoxModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlListBoxModel ); } @@ -2243,7 +2211,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -2262,7 +2230,7 @@ namespace } -void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception, std::exception) +void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -2313,14 +2281,14 @@ void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCo } -::sal_Int32 SAL_CALL UnoControlListBoxModel::getItemCount() throw (RuntimeException, std::exception) +::sal_Int32 SAL_CALL UnoControlListBoxModel::getItemCount() { ::osl::MutexGuard aGuard( GetMutex() ); return m_xData->getItemCount(); } -void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2333,7 +2301,7 @@ void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const } -void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2345,7 +2313,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, c } -void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2357,7 +2325,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, } -void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2368,7 +2336,7 @@ void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) thro } -void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::removeAllItems( ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2379,7 +2347,7 @@ void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (css::uno::Runtim } -void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2391,7 +2359,7 @@ void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, cons } -void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2403,7 +2371,7 @@ void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, con } -void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2416,7 +2384,7 @@ void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPositi } -void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, const Any& i_rDataValue ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, const Any& i_rDataValue ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); ListItem& rItem( m_xData->getItem( i_nPosition ) ); @@ -2424,7 +2392,7 @@ void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, cons } -OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) { ::osl::MutexGuard aGuard( GetMutex() ); const ListItem& rItem( m_xData->getItem( i_nPosition ) ); @@ -2432,7 +2400,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) } -OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) { ::osl::MutexGuard aGuard( GetMutex() ); const ListItem& rItem( m_xData->getItem( i_nPosition ) ); @@ -2440,7 +2408,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition } -beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition ) { ::osl::MutexGuard aGuard( GetMutex() ); const ListItem& rItem( m_xData->getItem( i_nPosition ) ); @@ -2448,7 +2416,7 @@ beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAn } -Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); const ListItem& rItem( m_xData->getItem( i_nPosition ) ); @@ -2456,21 +2424,21 @@ Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) thro } -Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems( ) throw (RuntimeException, std::exception) +Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems( ) { ::osl::MutexGuard aGuard( GetMutex() ); return m_xData->getAllItems(); } -void SAL_CALL UnoControlListBoxModel::addItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::addItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) { if ( i_Listener.is() ) m_aItemListListeners.addInterface( i_Listener ); } -void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) { if ( i_Listener.is() ) m_aItemListListeners.removeInterface( i_Listener ); @@ -2648,13 +2616,11 @@ OUString UnoListBoxControl::GetComponentServiceName() } OUString UnoListBoxControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoListBoxControl"); } css::uno::Sequence<OUString> UnoListBoxControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -2663,7 +2629,7 @@ css::uno::Sequence<OUString> UnoListBoxControl::getSupportedServiceNames() return s; } -void UnoListBoxControl::dispose() throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -2712,7 +2678,7 @@ void UnoListBoxControl::ImplSetPeerProperty( const OUString& rPropName, const un UnoControl::ImplSetPeerProperty( rPropName, rVal ); } -void UnoListBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -2723,7 +2689,7 @@ void UnoListBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxTo xListBox->addActionListener( &maActionListeners ); } -void UnoListBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -2733,7 +2699,7 @@ void UnoListBoxControl::addActionListener(const uno::Reference< awt::XActionList } } -void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -2743,23 +2709,23 @@ void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionL maActionListeners.removeInterface( l ); } -void UnoListBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) { maItemListeners.addInterface( l ); } -void UnoListBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) { maItemListeners.removeInterface( l ); } -void UnoListBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) { uno::Sequence<OUString> aSeq { aItem }; addItems( aSeq, nPos ); } -void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -2791,7 +2757,7 @@ void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_In ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), uno::Any(aNewSeq), true ); } -void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -2821,7 +2787,7 @@ void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(un } } -sal_Int16 UnoListBoxControl::getItemCount() throw(uno::RuntimeException, std::exception) +sal_Int16 UnoListBoxControl::getItemCount() { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -2829,7 +2795,7 @@ sal_Int16 UnoListBoxControl::getItemCount() throw(uno::RuntimeException, std::ex return (sal_Int16)aSeq.getLength(); } -OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) +OUString UnoListBoxControl::getItem( sal_Int16 nPos ) { OUString aItem; uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); @@ -2840,7 +2806,7 @@ OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeExceptio return aItem; } -uno::Sequence< OUString> UnoListBoxControl::getItems() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString> UnoListBoxControl::getItems() { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -2848,7 +2814,7 @@ uno::Sequence< OUString> UnoListBoxControl::getItems() throw(uno::RuntimeExcepti return aSeq; } -sal_Int16 UnoListBoxControl::getSelectedItemPos() throw(uno::RuntimeException, std::exception) +sal_Int16 UnoListBoxControl::getSelectedItemPos() { sal_Int16 n = -1; if ( getPeer().is() ) @@ -2859,7 +2825,7 @@ sal_Int16 UnoListBoxControl::getSelectedItemPos() throw(uno::RuntimeException, s return n; } -uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() { uno::Sequence<sal_Int16> aSeq; if ( getPeer().is() ) @@ -2870,7 +2836,7 @@ uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::Run return aSeq; } -OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException, std::exception) +OUString UnoListBoxControl::getSelectedItem() { OUString aItem; if ( getPeer().is() ) @@ -2881,7 +2847,7 @@ OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException, std:: return aItem; } -uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() { uno::Sequence< OUString> aSeq; if ( getPeer().is() ) @@ -2892,7 +2858,7 @@ uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() throw(uno::Runtim return aSeq; } -void UnoListBoxControl::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) { if ( getPeer().is() ) { @@ -2902,7 +2868,7 @@ void UnoListBoxControl::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw( ImplUpdateSelectedItemsProperty(); } -void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) { if ( getPeer().is() ) { @@ -2912,7 +2878,7 @@ void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositio ImplUpdateSelectedItemsProperty(); } -void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) { if ( getPeer().is() ) { @@ -2922,7 +2888,7 @@ void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) th ImplUpdateSelectedItemsProperty(); } -void UnoListBoxControl::makeVisible( sal_Int16 nEntry ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::makeVisible( sal_Int16 nEntry ) { if ( getPeer().is() ) { @@ -2931,27 +2897,27 @@ void UnoListBoxControl::makeVisible( sal_Int16 nEntry ) throw(uno::RuntimeExcept } } -void UnoListBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::setDropDownLineCount( sal_Int16 nLines ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), uno::Any((sal_Int16) nLines), true ); } -sal_Int16 UnoListBoxControl::getDropDownLineCount() throw(uno::RuntimeException, std::exception) +sal_Int16 UnoListBoxControl::getDropDownLineCount() { return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT ); } -sal_Bool UnoListBoxControl::isMutipleMode() throw(uno::RuntimeException, std::exception) +sal_Bool UnoListBoxControl::isMutipleMode() { return ImplGetPropertyValue_BOOL( BASEPROPERTY_MULTISELECTION ); } -void UnoListBoxControl::setMultipleMode( sal_Bool bMulti ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::setMultipleMode( sal_Bool bMulti ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTISELECTION ), uno::Any(bMulti), true ); } -void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) { ImplUpdateSelectedItemsProperty(); if ( maItemListeners.getLength() ) @@ -2973,32 +2939,32 @@ void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(u } } -awt::Size UnoListBoxControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoListBoxControl::getMinimumSize( ) { return Impl_getMinimumSize(); } -awt::Size UnoListBoxControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) +awt::Size UnoListBoxControl::getPreferredSize( ) { return Impl_getPreferredSize(); } -awt::Size UnoListBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) +awt::Size UnoListBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) { return Impl_calcAdjustedSize( rNewSize ); } -awt::Size UnoListBoxControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(uno::RuntimeException, std::exception) +awt::Size UnoListBoxControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) { return Impl_getMinimumSize( nCols, nLines ); } -void UnoListBoxControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(uno::RuntimeException, std::exception) +void UnoListBoxControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) { Impl_getColumnsAndLines( nCols, nLines ); } -sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -3018,7 +2984,7 @@ sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XContr return true; } -void SAL_CALL UnoListBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoListBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemInserted: invalid peer!" ); @@ -3026,7 +2992,7 @@ void SAL_CALL UnoListBoxControl::listItemInserted( const awt::ItemListEvent& i_r xPeerListener->listItemInserted( i_rEvent ); } -void SAL_CALL UnoListBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoListBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemRemoved: invalid peer!" ); @@ -3034,7 +3000,7 @@ void SAL_CALL UnoListBoxControl::listItemRemoved( const awt::ItemListEvent& i_rE xPeerListener->listItemRemoved( i_rEvent ); } -void SAL_CALL UnoListBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoListBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemModified: invalid peer!" ); @@ -3042,7 +3008,7 @@ void SAL_CALL UnoListBoxControl::listItemModified( const awt::ItemListEvent& i_r xPeerListener->listItemModified( i_rEvent ); } -void SAL_CALL UnoListBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoListBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::allItemsRemoved: invalid peer!" ); @@ -3050,7 +3016,7 @@ void SAL_CALL UnoListBoxControl::allItemsRemoved( const lang::EventObject& i_rEv xPeerListener->allItemsRemoved( i_rEvent ); } -void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::itemListChanged: invalid peer!" ); @@ -3076,13 +3042,11 @@ UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentCon } OUString UnoControlComboBoxModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlComboBoxModel"); } css::uno::Sequence<OUString> UnoControlComboBoxModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -3091,7 +3055,7 @@ css::uno::Sequence<OUString> UnoControlComboBoxModel::getSupportedServiceNames() return s; } -uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -3109,11 +3073,11 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe } -OUString UnoControlComboBoxModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlComboBoxModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlComboBoxModel ); } -void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception, std::exception) +void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -3175,13 +3139,11 @@ UnoComboBoxControl::UnoComboBoxControl() } OUString UnoComboBoxControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString( "stardiv.Toolkit.UnoComboBoxControl"); } css::uno::Sequence<OUString> UnoComboBoxControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoEditControl::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -3195,7 +3157,7 @@ OUString UnoComboBoxControl::GetComponentServiceName() return OUString("combobox"); } -void UnoComboBoxControl::dispose() throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -3203,7 +3165,7 @@ void UnoComboBoxControl::dispose() throw(uno::RuntimeException, std::exception) maItemListeners.disposeAndClear( aEvt ); UnoControl::dispose(); } -uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XComboBox* >(this)) ); @@ -3247,7 +3209,7 @@ void UnoComboBoxControl::ImplSetPeerProperty( const OUString& rPropName, const u UnoEditControl::ImplSetPeerProperty( rPropName, rVal ); } -void UnoComboBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoEditControl::createPeer( rxToolkit, rParentPeer ); @@ -3258,7 +3220,7 @@ void UnoComboBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxT xComboBox->addItemListener( &maItemListeners ); } -void UnoComboBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -3268,7 +3230,7 @@ void UnoComboBoxControl::addActionListener(const uno::Reference< awt::XActionLis } } -void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -3278,7 +3240,7 @@ void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XAction maActionListeners.removeInterface( l ); } -void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) { maItemListeners.addInterface( l ); if( getPeer().is() && maItemListeners.getLength() == 1 ) @@ -3288,7 +3250,7 @@ void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListen } } -void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) { if( getPeer().is() && maItemListeners.getLength() == 1 ) { @@ -3298,7 +3260,7 @@ void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemLis } maItemListeners.removeInterface( l ); } -void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) { if ( maItemListeners.getLength() ) { @@ -3318,7 +3280,7 @@ void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw( } } } -sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -3338,7 +3300,7 @@ sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XCont return true; } -void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemInserted: invalid peer!" ); @@ -3346,7 +3308,7 @@ void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_ xPeerListener->listItemInserted( i_rEvent ); } -void SAL_CALL UnoComboBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoComboBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemRemoved: invalid peer!" ); @@ -3354,7 +3316,7 @@ void SAL_CALL UnoComboBoxControl::listItemRemoved( const awt::ItemListEvent& i_r xPeerListener->listItemRemoved( i_rEvent ); } -void SAL_CALL UnoComboBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoComboBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemModified: invalid peer!" ); @@ -3362,7 +3324,7 @@ void SAL_CALL UnoComboBoxControl::listItemModified( const awt::ItemListEvent& i_ xPeerListener->listItemModified( i_rEvent ); } -void SAL_CALL UnoComboBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoComboBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::allItemsRemoved: invalid peer!" ); @@ -3370,7 +3332,7 @@ void SAL_CALL UnoComboBoxControl::allItemsRemoved( const lang::EventObject& i_rE xPeerListener->allItemsRemoved( i_rEvent ); } -void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception) +void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::itemListChanged: invalid peer!" ); @@ -3378,13 +3340,13 @@ void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rE xPeerListener->itemListChanged( i_rEvent ); } -void UnoComboBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) { uno::Sequence<OUString> aSeq { aItem }; addItems( aSeq, nPos ); } -void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -3416,7 +3378,7 @@ void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_I ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), Any(aNewSeq), true ); } -void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -3446,7 +3408,7 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(u } } -sal_Int16 UnoComboBoxControl::getItemCount() throw(uno::RuntimeException, std::exception) +sal_Int16 UnoComboBoxControl::getItemCount() { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -3454,7 +3416,7 @@ sal_Int16 UnoComboBoxControl::getItemCount() throw(uno::RuntimeException, std::e return (sal_Int16)aSeq.getLength(); } -OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) +OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) { OUString aItem; uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); @@ -3465,7 +3427,7 @@ OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeExcepti return aItem; } -uno::Sequence< OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString> UnoComboBoxControl::getItems() { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -3473,12 +3435,12 @@ uno::Sequence< OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeExcept return aSeq; } -void UnoComboBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::RuntimeException, std::exception) +void UnoComboBoxControl::setDropDownLineCount( sal_Int16 nLines ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), uno::Any(nLines), true ); } -sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException, std::exception) +sal_Int16 UnoComboBoxControl::getDropDownLineCount() { return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT ); } @@ -3502,7 +3464,7 @@ UnoSpinFieldControl::UnoSpinFieldControl() } // uno::XInterface -uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XSpinField* >(this)) ); @@ -3515,7 +3477,7 @@ IMPL_XTYPEPROVIDER_START( UnoSpinFieldControl ) UnoEditControl::getTypes() IMPL_XTYPEPROVIDER_END -void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoEditControl::createPeer( rxToolkit, rParentPeer ); @@ -3526,7 +3488,7 @@ void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx } // css::awt::XSpinField -void UnoSpinFieldControl::addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) { maSpinListeners.addInterface( l ); if( getPeer().is() && maSpinListeners.getLength() == 1 ) @@ -3536,7 +3498,7 @@ void UnoSpinFieldControl::addSpinListener( const css::uno::Reference< css::awt:: } } -void UnoSpinFieldControl::removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) throw(css::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) { if( getPeer().is() && maSpinListeners.getLength() == 1 ) { @@ -3546,35 +3508,35 @@ void UnoSpinFieldControl::removeSpinListener( const css::uno::Reference< css::aw maSpinListeners.removeInterface( l ); } -void UnoSpinFieldControl::up() throw(css::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::up() { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->up(); } -void UnoSpinFieldControl::down() throw(css::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::down() { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->down(); } -void UnoSpinFieldControl::first() throw(css::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::first() { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->first(); } -void UnoSpinFieldControl::last() throw(css::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::last() { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->last(); } -void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(css::uno::RuntimeException, std::exception) +void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) { mbRepeat = bRepeat; @@ -3592,7 +3554,7 @@ UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField ); } -OUString UnoControlDateFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlDateFieldModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlDateFieldModel ); } @@ -3619,21 +3581,19 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlDateFieldModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlDateFieldModel"); } css::uno::Sequence<OUString> UnoControlDateFieldModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -3667,7 +3627,7 @@ OUString UnoDateFieldControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XDateField* >(this)) ); @@ -3680,7 +3640,7 @@ IMPL_XTYPEPROVIDER_START( UnoDateFieldControl ) UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END -void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer ); @@ -3692,7 +3652,7 @@ void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx } -void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) { uno::Reference< awt::XVclWindowPeer > xPeer( getPeer(), uno::UNO_QUERY ); @@ -3733,37 +3693,37 @@ void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt GetTextListeners().textChanged( e ); } -void UnoDateFieldControl::setDate( const util::Date& Date ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::setDate( const util::Date& Date ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATE ), uno::Any(Date), true ); } -util::Date UnoDateFieldControl::getDate() throw(uno::RuntimeException, std::exception) +util::Date UnoDateFieldControl::getDate() { return ImplGetPropertyValue_Date( BASEPROPERTY_DATE ); } -void UnoDateFieldControl::setMin( const util::Date& Date ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::setMin( const util::Date& Date ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMIN ), uno::Any(Date), true ); } -util::Date UnoDateFieldControl::getMin() throw(uno::RuntimeException, std::exception) +util::Date UnoDateFieldControl::getMin() { return ImplGetPropertyValue_Date( BASEPROPERTY_DATEMIN ); } -void UnoDateFieldControl::setMax( const util::Date& Date ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::setMax( const util::Date& Date ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMAX ), uno::Any(Date), true ); } -util::Date UnoDateFieldControl::getMax() throw(uno::RuntimeException, std::exception) +util::Date UnoDateFieldControl::getMax() { return ImplGetPropertyValue_Date( BASEPROPERTY_DATEMAX ); } -void UnoDateFieldControl::setFirst( const util::Date& Date ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::setFirst( const util::Date& Date ) { mnFirst = Date; if ( getPeer().is() ) @@ -3773,12 +3733,12 @@ void UnoDateFieldControl::setFirst( const util::Date& Date ) throw(uno::RuntimeE } } -util::Date UnoDateFieldControl::getFirst() throw(uno::RuntimeException, std::exception) +util::Date UnoDateFieldControl::getFirst() { return mnFirst; } -void UnoDateFieldControl::setLast( const util::Date& Date ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::setLast( const util::Date& Date ) { mnLast = Date; if ( getPeer().is() ) @@ -3788,12 +3748,12 @@ void UnoDateFieldControl::setLast( const util::Date& Date ) throw(uno::RuntimeEx } } -util::Date UnoDateFieldControl::getLast() throw(uno::RuntimeException, std::exception) +util::Date UnoDateFieldControl::getLast() { return mnLast; } -void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) { mbLongFormat = bLong ? TRISTATE_TRUE : TRISTATE_FALSE; if ( getPeer().is() ) @@ -3803,12 +3763,12 @@ void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeExce } } -sal_Bool UnoDateFieldControl::isLongFormat() throw(uno::RuntimeException, std::exception) +sal_Bool UnoDateFieldControl::isLongFormat() { return mbLongFormat == TRISTATE_TRUE; } -void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::setEmpty() { if ( getPeer().is() ) { @@ -3817,7 +3777,7 @@ void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException, std::exception } } -sal_Bool UnoDateFieldControl::isEmpty() throw(uno::RuntimeException, std::exception) +sal_Bool UnoDateFieldControl::isEmpty() { bool bEmpty = false; if ( getPeer().is() ) @@ -3828,24 +3788,22 @@ sal_Bool UnoDateFieldControl::isEmpty() throw(uno::RuntimeException, std::except return bEmpty; } -void UnoDateFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) +void UnoDateFieldControl::setStrictFormat( sal_Bool bStrict ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true ); } -sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) +sal_Bool UnoDateFieldControl::isStrictFormat() { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } OUString UnoDateFieldControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoDateFieldControl"); } css::uno::Sequence<OUString> UnoDateFieldControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoSpinFieldControl::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -3871,7 +3829,7 @@ UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField ); } -OUString UnoControlTimeFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlTimeFieldModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlTimeFieldModel ); } @@ -3898,21 +3856,19 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlTimeFieldModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlTimeFieldModel"); } css::uno::Sequence<OUString> UnoControlTimeFieldModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -3945,7 +3901,7 @@ OUString UnoTimeFieldControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XTimeField* >(this)) ); @@ -3958,7 +3914,7 @@ IMPL_XTYPEPROVIDER_START( UnoTimeFieldControl ) UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END -void UnoTimeFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer ); @@ -3967,7 +3923,7 @@ void UnoTimeFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx xField->setLast( mnLast ); } -void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) { // also change the text property (#i25106#) uno::Reference< awt::XVclWindowPeer > xPeer( getPeer(), uno::UNO_QUERY ); @@ -3986,37 +3942,37 @@ void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt GetTextListeners().textChanged( e ); } -void UnoTimeFieldControl::setTime( const util::Time& Time ) throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::setTime( const util::Time& Time ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIME ), Any(Time), true ); } -util::Time UnoTimeFieldControl::getTime() throw(uno::RuntimeException, std::exception) +util::Time UnoTimeFieldControl::getTime() { return ImplGetPropertyValue_Time( BASEPROPERTY_TIME ); } -void UnoTimeFieldControl::setMin( const util::Time& Time ) throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::setMin( const util::Time& Time ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMIN ), uno::Any(Time), true ); } -util::Time UnoTimeFieldControl::getMin() throw(uno::RuntimeException, std::exception) +util::Time UnoTimeFieldControl::getMin() { return ImplGetPropertyValue_Time( BASEPROPERTY_TIMEMIN ); } -void UnoTimeFieldControl::setMax( const util::Time& Time ) throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::setMax( const util::Time& Time ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMAX ), uno::Any(Time), true ); } -util::Time UnoTimeFieldControl::getMax() throw(uno::RuntimeException, std::exception) +util::Time UnoTimeFieldControl::getMax() { return ImplGetPropertyValue_Time( BASEPROPERTY_TIMEMAX ); } -void UnoTimeFieldControl::setFirst( const util::Time& Time ) throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::setFirst( const util::Time& Time ) { mnFirst = Time; if ( getPeer().is() ) @@ -4026,12 +3982,12 @@ void UnoTimeFieldControl::setFirst( const util::Time& Time ) throw(uno::RuntimeE } } -util::Time UnoTimeFieldControl::getFirst() throw(uno::RuntimeException, std::exception) +util::Time UnoTimeFieldControl::getFirst() { return mnFirst; } -void UnoTimeFieldControl::setLast( const util::Time& Time ) throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::setLast( const util::Time& Time ) { mnLast = Time; if ( getPeer().is() ) @@ -4041,12 +3997,12 @@ void UnoTimeFieldControl::setLast( const util::Time& Time ) throw(uno::RuntimeEx } } -util::Time UnoTimeFieldControl::getLast() throw(uno::RuntimeException, std::exception) +util::Time UnoTimeFieldControl::getLast() { return mnLast; } -void UnoTimeFieldControl::setEmpty() throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::setEmpty() { if ( getPeer().is() ) { @@ -4055,7 +4011,7 @@ void UnoTimeFieldControl::setEmpty() throw(uno::RuntimeException, std::exception } } -sal_Bool UnoTimeFieldControl::isEmpty() throw(uno::RuntimeException, std::exception) +sal_Bool UnoTimeFieldControl::isEmpty() { bool bEmpty = false; if ( getPeer().is() ) @@ -4066,24 +4022,22 @@ sal_Bool UnoTimeFieldControl::isEmpty() throw(uno::RuntimeException, std::except return bEmpty; } -void UnoTimeFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) +void UnoTimeFieldControl::setStrictFormat( sal_Bool bStrict ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true ); } -sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) +sal_Bool UnoTimeFieldControl::isStrictFormat() { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } OUString UnoTimeFieldControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoTimeFieldControl"); } css::uno::Sequence<OUString> UnoTimeFieldControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoSpinFieldControl::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4109,7 +4063,7 @@ UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField ); } -OUString UnoControlNumericFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlNumericFieldModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlNumericFieldModel ); } @@ -4136,21 +4090,19 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlNumericFieldModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlNumericFieldModel"); } css::uno::Sequence<OUString> UnoControlNumericFieldModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4183,7 +4135,7 @@ OUString UnoNumericFieldControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XNumericField* >(this)) ); @@ -4196,7 +4148,7 @@ IMPL_XTYPEPROVIDER_START( UnoNumericFieldControl ) UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END -void UnoNumericFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer ); @@ -4206,7 +4158,7 @@ void UnoNumericFieldControl::createPeer( const uno::Reference< awt::XToolkit > & } -void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) { uno::Reference < awt::XNumericField > xField( getPeer(), uno::UNO_QUERY ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), uno::Any(xField->getValue()), false ); @@ -4215,37 +4167,37 @@ void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::R GetTextListeners().textChanged( e ); } -void UnoNumericFieldControl::setValue( double Value ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::setValue( double Value ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), uno::Any(Value), true ); } -double UnoNumericFieldControl::getValue() throw(uno::RuntimeException, std::exception) +double UnoNumericFieldControl::getValue() { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUE_DOUBLE ); } -void UnoNumericFieldControl::setMin( double Value ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::setMin( double Value ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), uno::Any(Value), true ); } -double UnoNumericFieldControl::getMin() throw(uno::RuntimeException, std::exception) +double UnoNumericFieldControl::getMin() { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMIN_DOUBLE ); } -void UnoNumericFieldControl::setMax( double Value ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::setMax( double Value ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), uno::Any(Value), true ); } -double UnoNumericFieldControl::getMax() throw(uno::RuntimeException, std::exception) +double UnoNumericFieldControl::getMax() { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMAX_DOUBLE ); } -void UnoNumericFieldControl::setFirst( double Value ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::setFirst( double Value ) { mnFirst = Value; if ( getPeer().is() ) @@ -4255,12 +4207,12 @@ void UnoNumericFieldControl::setFirst( double Value ) throw(uno::RuntimeExceptio } } -double UnoNumericFieldControl::getFirst() throw(uno::RuntimeException, std::exception) +double UnoNumericFieldControl::getFirst() { return mnFirst; } -void UnoNumericFieldControl::setLast( double Value ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::setLast( double Value ) { mnLast = Value; if ( getPeer().is() ) @@ -4270,29 +4222,27 @@ void UnoNumericFieldControl::setLast( double Value ) throw(uno::RuntimeException } } -double UnoNumericFieldControl::getLast() throw(uno::RuntimeException, std::exception) +double UnoNumericFieldControl::getLast() { return mnLast; } -void UnoNumericFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::setStrictFormat( sal_Bool bStrict ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true ); } -sal_Bool UnoNumericFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) +sal_Bool UnoNumericFieldControl::isStrictFormat() { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } OUString UnoNumericFieldControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoNumericFieldControl"); } css::uno::Sequence<OUString> UnoNumericFieldControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoSpinFieldControl::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4301,22 +4251,22 @@ css::uno::Sequence<OUString> UnoNumericFieldControl::getSupportedServiceNames() return s; } -void UnoNumericFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::setSpinSize( double Digits ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), uno::Any(Digits), true ); } -double UnoNumericFieldControl::getSpinSize() throw(uno::RuntimeException, std::exception) +double UnoNumericFieldControl::getSpinSize() { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUESTEP_DOUBLE ); } -void UnoNumericFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::RuntimeException, std::exception) +void UnoNumericFieldControl::setDecimalDigits( sal_Int16 Digits ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), uno::Any(Digits), true ); } -sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException, std::exception) +sal_Int16 UnoNumericFieldControl::getDecimalDigits() { return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } @@ -4338,7 +4288,7 @@ UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XCo UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField ); } -OUString UnoControlCurrencyFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlCurrencyFieldModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlCurrencyFieldModel ); } @@ -4369,21 +4319,19 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlCurrencyFieldModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlCurrencyFieldModel"); } css::uno::Sequence<OUString> UnoControlCurrencyFieldModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4416,7 +4364,7 @@ OUString UnoCurrencyFieldControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XCurrencyField* >(this)) ); @@ -4429,7 +4377,7 @@ IMPL_XTYPEPROVIDER_START( UnoCurrencyFieldControl ) UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END -void UnoCurrencyFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) { UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer ); @@ -4438,7 +4386,7 @@ void UnoCurrencyFieldControl::createPeer( const uno::Reference< awt::XToolkit > xField->setLast( mnLast ); } -void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) { uno::Reference < awt::XCurrencyField > xField( getPeer(), uno::UNO_QUERY ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), uno::Any(xField->getValue()), false ); @@ -4447,37 +4395,37 @@ void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) throw(uno:: GetTextListeners().textChanged( e ); } -void UnoCurrencyFieldControl::setValue( double Value ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::setValue( double Value ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), Any(Value), true ); } -double UnoCurrencyFieldControl::getValue() throw(uno::RuntimeException, std::exception) +double UnoCurrencyFieldControl::getValue() { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUE_DOUBLE ); } -void UnoCurrencyFieldControl::setMin( double Value ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::setMin( double Value ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), uno::Any(Value), true ); } -double UnoCurrencyFieldControl::getMin() throw(uno::RuntimeException, std::exception) +double UnoCurrencyFieldControl::getMin() { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMIN_DOUBLE ); } -void UnoCurrencyFieldControl::setMax( double Value ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::setMax( double Value ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), uno::Any(Value), true ); } -double UnoCurrencyFieldControl::getMax() throw(uno::RuntimeException, std::exception) +double UnoCurrencyFieldControl::getMax() { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMAX_DOUBLE ); } -void UnoCurrencyFieldControl::setFirst( double Value ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::setFirst( double Value ) { mnFirst = Value; if ( getPeer().is() ) @@ -4487,12 +4435,12 @@ void UnoCurrencyFieldControl::setFirst( double Value ) throw(uno::RuntimeExcepti } } -double UnoCurrencyFieldControl::getFirst() throw(uno::RuntimeException, std::exception) +double UnoCurrencyFieldControl::getFirst() { return mnFirst; } -void UnoCurrencyFieldControl::setLast( double Value ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::setLast( double Value ) { mnLast = Value; if ( getPeer().is() ) @@ -4502,30 +4450,28 @@ void UnoCurrencyFieldControl::setLast( double Value ) throw(uno::RuntimeExceptio } } -double UnoCurrencyFieldControl::getLast() throw(uno::RuntimeException, std::exception) +double UnoCurrencyFieldControl::getLast() { return mnLast; } -void UnoCurrencyFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::setStrictFormat( sal_Bool bStrict ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true ); } -sal_Bool UnoCurrencyFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) +sal_Bool UnoCurrencyFieldControl::isStrictFormat() { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } OUString UnoCurrencyFieldControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoCurrencyFieldControl"); } css::uno::Sequence<OUString> UnoCurrencyFieldControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoSpinFieldControl::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4534,22 +4480,22 @@ UnoCurrencyFieldControl::getSupportedServiceNames() return s; } -void UnoCurrencyFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::setSpinSize( double Digits ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), uno::Any(Digits), true ); } -double UnoCurrencyFieldControl::getSpinSize() throw(uno::RuntimeException, std::exception) +double UnoCurrencyFieldControl::getSpinSize() { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUESTEP_DOUBLE ); } -void UnoCurrencyFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::RuntimeException, std::exception) +void UnoCurrencyFieldControl::setDecimalDigits( sal_Int16 Digits ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), uno::Any(Digits), true ); } -sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeException, std::exception) +sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() { return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } @@ -4571,7 +4517,7 @@ UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField ); } -OUString UnoControlPatternFieldModel::getServiceName() throw(css::uno::RuntimeException, std::exception) +OUString UnoControlPatternFieldModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlPatternFieldModel ); } @@ -4597,21 +4543,19 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlPatternFieldModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlPatternFieldModel"); } css::uno::Sequence<OUString> UnoControlPatternFieldModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4667,7 +4611,7 @@ void UnoPatternFieldControl::ImplSetPeerProperty( const OUString& rPropName, con // uno::XInterface -uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XPatternField* >(this)) ); @@ -4680,46 +4624,44 @@ IMPL_XTYPEPROVIDER_START( UnoPatternFieldControl ) UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END -void UnoPatternFieldControl::setString( const OUString& rString ) throw(uno::RuntimeException, std::exception) +void UnoPatternFieldControl::setString( const OUString& rString ) { setText( rString ); } -OUString UnoPatternFieldControl::getString() throw(uno::RuntimeException, std::exception) +OUString UnoPatternFieldControl::getString() { return getText(); } -void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(uno::RuntimeException, std::exception) +void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString& LiteralMask ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_EDITMASK ), uno::Any(EditMask), true ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LITERALMASK ), uno::Any(LiteralMask), true ); } -void UnoPatternFieldControl::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(uno::RuntimeException, std::exception) +void UnoPatternFieldControl::getMasks( OUString& EditMask, OUString& LiteralMask ) { EditMask = ImplGetPropertyValue_UString( BASEPROPERTY_EDITMASK ); LiteralMask = ImplGetPropertyValue_UString( BASEPROPERTY_LITERALMASK ); } -void UnoPatternFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) +void UnoPatternFieldControl::setStrictFormat( sal_Bool bStrict ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), uno::Any(bStrict), true ); } -sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) +sal_Bool UnoPatternFieldControl::isStrictFormat() { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } OUString UnoPatternFieldControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoPatternFieldControl"); } css::uno::Sequence<OUString> UnoPatternFieldControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoSpinFieldControl::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4757,7 +4699,7 @@ UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XCompon ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MIN ); } -OUString UnoControlProgressBarModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) +OUString UnoControlProgressBarModel::getServiceName( ) { return OUString::createFromAscii( szServiceName_UnoControlProgressBarModel ); } @@ -4784,21 +4726,19 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlProgressBarModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlProgressBarModel"); } css::uno::Sequence<OUString> UnoControlProgressBarModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4829,7 +4769,7 @@ OUString UnoProgressBarControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) +uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XProgressBar* >(this)) ); @@ -4843,22 +4783,22 @@ IMPL_XTYPEPROVIDER_START( UnoProgressBarControl ) IMPL_XTYPEPROVIDER_END // css::awt::XProgressBar -void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) +void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_FILLCOLOR ), uno::Any(nColor), true ); } -void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor ) throw(css::uno::RuntimeException, std::exception) +void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BACKGROUNDCOLOR ), uno::Any(nColor), true ); } -void UnoProgressBarControl::setValue( sal_Int32 nValue ) throw(css::uno::RuntimeException, std::exception) +void UnoProgressBarControl::setValue( sal_Int32 nValue ) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE ), uno::Any(nValue), true ); } -void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css::uno::RuntimeException, std::exception ) +void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) { uno::Any aMin; uno::Any aMax; @@ -4880,19 +4820,17 @@ void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(css ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE_MAX ), aMax, true ); } -sal_Int32 UnoProgressBarControl::getValue() throw(css::uno::RuntimeException, std::exception) +sal_Int32 UnoProgressBarControl::getValue() { return ImplGetPropertyValue_INT32( BASEPROPERTY_PROGRESSVALUE ); } OUString UnoProgressBarControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoProgressBarControl"); } css::uno::Sequence<OUString> UnoProgressBarControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4927,7 +4865,7 @@ UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XComponentC ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); } -OUString UnoControlFixedLineModel::getServiceName( ) throw(css::uno::RuntimeException, std::exception) +OUString UnoControlFixedLineModel::getServiceName( ) { return OUString::createFromAscii( szServiceName_UnoControlFixedLineModel ); } @@ -4953,21 +4891,19 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertySetInfo( ) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } OUString UnoControlFixedLineModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlFixedLineModel"); } css::uno::Sequence<OUString> UnoControlFixedLineModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlModel::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -4999,19 +4935,17 @@ OUString UnoFixedLineControl::GetComponentServiceName() return OUString("FixedLine"); } -sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException, std::exception) +sal_Bool UnoFixedLineControl::isTransparent() { return true; } OUString UnoFixedLineControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoFixedLineControl"); } css::uno::Sequence<OUString> UnoFixedLineControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); |