diff options
Diffstat (limited to 'toolkit/source/controls')
33 files changed, 1161 insertions, 1161 deletions
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index c9b2a04ac261..352aa44d65c7 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) + sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { // we do not have children return 0; } - Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { // we do not have children throw IndexOutOfBoundsException(); } - Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent( ) throw (RuntimeException, std::exception) { 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) + sal_Int16 SAL_CALL OAccessibleControlContext::getAccessibleRole( ) throw (RuntimeException, std::exception) { return AccessibleRole::SHAPE; } - OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OContextEntryGuard aGuard( this ); return getModelStringProperty( "HelpText" ); } - OUString SAL_CALL OAccessibleControlContext::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleControlContext::getAccessibleName( ) throw (RuntimeException, std::exception) { OContextEntryGuard aGuard( this ); return getModelStringProperty( "Name" ); } - Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { return NULL; } - Reference< XAccessibleStateSet > SAL_CALL OAccessibleControlContext::getAccessibleStateSet( ) throw (RuntimeException) + Reference< XAccessibleStateSet > SAL_CALL OAccessibleControlContext::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); // no OContextEntryGuard here, as we do not want to throw an exception in case we're not alive anymore @@ -192,7 +192,7 @@ namespace toolkit #if OSL_DEBUG_LEVEL > 0 _rSource #endif - ) throw ( RuntimeException ) + ) throw ( RuntimeException, std::exception ) { OSL_ENSURE( Reference< XPropertySet >( _rSource.Source, UNO_QUERY ).get() == m_xControlModel.get(), "OAccessibleControlContext::disposing: where did this come from?" ); @@ -300,14 +300,14 @@ namespace toolkit } - Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ ) throw (RuntimeException, std::exception) { // no children at all return NULL; } - void SAL_CALL OAccessibleControlContext::grabFocus( ) throw (RuntimeException) + void SAL_CALL OAccessibleControlContext::grabFocus( ) throw (RuntimeException, std::exception) { OSL_FAIL( "OAccessibleControlContext::grabFocus: !isFocusTraversable, but grabFocus!" ); } @@ -320,7 +320,7 @@ namespace toolkit } - sal_Int32 SAL_CALL OAccessibleControlContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL OAccessibleControlContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; // want to do some VCL stuff here ... @@ -346,7 +346,7 @@ namespace toolkit } - sal_Int32 SAL_CALL OAccessibleControlContext::getBackground( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL OAccessibleControlContext::getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; // want to do some VCL stuff here ... diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 729912c5903c..efadefca260b 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -59,26 +59,26 @@ public: OUString GetComponentServiceName(); // XAnimation - virtual void SAL_CALL startAnimation( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL stopAnimation( ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isAnimationRunning( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL startAnimation( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL stopAnimation( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isAnimationRunning( ) throw (css::uno::RuntimeException, std::exception); // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception); + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception); // XControl - sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& i_rModel ) throw ( css::uno::RuntimeException ); - 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); + sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& i_rModel ) throw ( css::uno::RuntimeException, std::exception ); + 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); // XContainerListener - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException); - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException); + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException); + virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception); }; AnimatedImagesControl::AnimatedImagesControl() @@ -93,7 +93,7 @@ public: } - void SAL_CALL AnimatedImagesControl::startAnimation( ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControl::startAnimation( ) throw (RuntimeException, std::exception) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); if ( xAnimation.is() ) @@ -101,7 +101,7 @@ public: } - void SAL_CALL AnimatedImagesControl::stopAnimation( ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControl::stopAnimation( ) throw (RuntimeException, std::exception) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); if ( xAnimation.is() ) @@ -109,7 +109,7 @@ public: } - ::sal_Bool SAL_CALL AnimatedImagesControl::isAnimationRunning( ) throw (RuntimeException) + ::sal_Bool SAL_CALL AnimatedImagesControl::isAnimationRunning( ) throw (RuntimeException, std::exception) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); if ( xAnimation.is() ) @@ -118,13 +118,13 @@ public: } - OUString SAL_CALL AnimatedImagesControl::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL AnimatedImagesControl::getImplementationName( ) throw(RuntimeException, std::exception) { return OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" ); } - Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { Sequence< OUString > aServices( AnimatedImagesControl_Base::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); @@ -148,7 +148,7 @@ public: } - sal_Bool SAL_CALL AnimatedImagesControl::setModel( const Reference< XControlModel >& i_rModel ) throw ( RuntimeException ) + sal_Bool SAL_CALL AnimatedImagesControl::setModel( const Reference< XControlModel >& i_rModel ) throw ( RuntimeException, std::exception ) { const Reference< XAnimatedImages > xOldContainer( getModel(), UNO_QUERY ); const Reference< XAnimatedImages > xNewContainer( i_rModel, UNO_QUERY ); @@ -168,7 +168,7 @@ public: } - void SAL_CALL AnimatedImagesControl::createPeer( const Reference< XToolkit >& i_toolkit, const Reference< XWindowPeer >& i_parentPeer ) throw(RuntimeException) + void SAL_CALL AnimatedImagesControl::createPeer( const Reference< XToolkit >& i_toolkit, const Reference< XWindowPeer >& i_parentPeer ) throw(RuntimeException, std::exception) { AnimatedImagesControl_Base::createPeer( i_toolkit, i_parentPeer ); @@ -176,7 +176,7 @@ public: } - void SAL_CALL AnimatedImagesControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); if ( xPeerListener.is() ) @@ -184,7 +184,7 @@ public: } - void SAL_CALL AnimatedImagesControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); if ( xPeerListener.is() ) @@ -192,7 +192,7 @@ public: } - void SAL_CALL AnimatedImagesControl::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControl::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); if ( xPeerListener.is() ) @@ -200,7 +200,7 @@ public: } - void SAL_CALL AnimatedImagesControl::disposing( const EventObject& i_event ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControl::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) { UnoControlBase::disposing( i_event ); } @@ -277,26 +277,26 @@ namespace toolkit { } - Reference< css::beans::XPropertySetInfo > SAL_CALL AnimatedImagesControlModel::getPropertySetInfo( ) throw(RuntimeException) + Reference< css::beans::XPropertySetInfo > SAL_CALL AnimatedImagesControlModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - OUString SAL_CALL AnimatedImagesControlModel::getServiceName() throw(RuntimeException) + OUString SAL_CALL AnimatedImagesControlModel::getServiceName() throw(RuntimeException, std::exception) { return OUString("com.sun.star.awt.AnimatedImagesControlModel"); } - OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) throw(RuntimeException, std::exception) { return OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel"); } - Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.awt.AnimatedImagesControlModel"; @@ -305,7 +305,7 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 i_handle, const Any& i_value ) throw (Exception) + void SAL_CALL AnimatedImagesControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 i_handle, const Any& i_value ) throw (Exception, std::exception) { switch ( i_handle ) { @@ -363,7 +363,7 @@ namespace toolkit { } - ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getStepTime() throw (RuntimeException) + ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getStepTime() throw (RuntimeException, std::exception) { sal_Int32 nStepTime( 100 ); OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_STEP_TIME ) ) >>= nStepTime ); @@ -371,13 +371,13 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::setStepTime( ::sal_Int32 i_stepTime ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControlModel::setStepTime( ::sal_Int32 i_stepTime ) throw (RuntimeException, std::exception) { setPropertyValue( GetPropertyName( BASEPROPERTY_STEP_TIME ), makeAny( i_stepTime ) ); } - ::sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat() throw (RuntimeException) + ::sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat() throw (RuntimeException, std::exception) { bool bAutoRepeat( true ); OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ) ) >>= bAutoRepeat ); @@ -385,13 +385,13 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::setAutoRepeat( ::sal_Bool i_autoRepeat ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControlModel::setAutoRepeat( ::sal_Bool i_autoRepeat ) throw (RuntimeException, std::exception) { setPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ), makeAny( i_autoRepeat ) ); } - ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode() throw (RuntimeException) + ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode() throw (RuntimeException, std::exception) { sal_Int16 nImageScaleMode( ImageScaleMode::ANISOTROPIC ); OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ) ) >>= nImageScaleMode ); @@ -399,13 +399,13 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::setScaleMode( ::sal_Int16 i_scaleMode ) throw (IllegalArgumentException, RuntimeException) + void SAL_CALL AnimatedImagesControlModel::setScaleMode( ::sal_Int16 i_scaleMode ) throw (IllegalArgumentException, RuntimeException, std::exception) { setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ), makeAny( i_scaleMode ) ); } - ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getImageSetCount( ) throw (RuntimeException) + ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getImageSetCount( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( GetBroadcastHelper().bDisposed || GetBroadcastHelper().bInDispose ) @@ -415,7 +415,7 @@ namespace toolkit { } - Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException) + Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( GetBroadcastHelper().bDisposed || GetBroadcastHelper().bInDispose ) @@ -427,7 +427,7 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // sanity checks @@ -444,7 +444,7 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // sanity checks @@ -461,7 +461,7 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::removeImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AnimatedImagesControlModel::removeImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // sanity checks @@ -480,13 +480,13 @@ namespace toolkit { } - void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception) { BrdcstHelper.addListener( cppu::UnoType<XContainerListener>::get(), i_listener ); } - void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception) { BrdcstHelper.removeListener( cppu::UnoType<XContainerListener>::get(), i_listener ); } diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 06a983f94b12..54766f011b57 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -263,7 +263,7 @@ Any ControlModelContainerBase::ImplGetDefaultValue( sal_uInt16 nPropId ) const return *pHelper; } -void SAL_CALL ControlModelContainerBase::dispose( ) throw(RuntimeException) +void SAL_CALL ControlModelContainerBase::dispose( ) throw(RuntimeException, std::exception) { // tell our listeners @@ -300,7 +300,7 @@ void SAL_CALL ControlModelContainerBase::dispose( ) throw(RuntimeException) } // XMultiPropertySet -Reference< XPropertySetInfo > ControlModelContainerBase::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > ControlModelContainerBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -328,7 +328,7 @@ ControlModelContainerBase::UnoControlModelHolderList::iterator ControlModelConta } // ::XMultiServiceFactory -Reference< XInterface > ControlModelContainerBase::createInstance( const OUString& aServiceSpecifier ) throw(Exception, RuntimeException) +Reference< XInterface > ControlModelContainerBase::createInstance( const OUString& aServiceSpecifier ) throw(Exception, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -415,7 +415,7 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const OUStrin return xNewModel; } -Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& i_arguments ) throw(Exception, RuntimeException) +Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& i_arguments ) throw(Exception, RuntimeException, std::exception) { const Reference< XInterface > xInstance( createInstance( ServiceSpecifier ) ); const Reference< XInitialization > xInstanceInit( xInstance, UNO_QUERY ); @@ -424,7 +424,7 @@ Reference< XInterface > ControlModelContainerBase::createInstanceWithArguments( return xInstance; } -Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw(RuntimeException) +Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw(RuntimeException, std::exception) { static Sequence< OUString >* pNamesSeq = NULL; if ( !pNamesSeq ) @@ -462,30 +462,30 @@ Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw } // XContainer -void ControlModelContainerBase::addContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException) +void ControlModelContainerBase::addContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception) { maContainerListeners.addInterface( l ); } -void ControlModelContainerBase::removeContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException) +void ControlModelContainerBase::removeContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception) { maContainerListeners.removeInterface( l ); } // XElementAcces -Type ControlModelContainerBase::getElementType() throw(RuntimeException) +Type ControlModelContainerBase::getElementType() throw(RuntimeException, std::exception) { Type aType = getCppuType( ( Reference< XControlModel>* ) NULL ); return aType; } -sal_Bool ControlModelContainerBase::hasElements() throw(RuntimeException) +sal_Bool ControlModelContainerBase::hasElements() throw(RuntimeException, std::exception) { return !maModels.empty(); } // XNameContainer, XNameReplace, XNameAccess -void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) +void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -531,7 +531,7 @@ void ControlModelContainerBase::replaceByName( const OUString& aName, const Any& implNotifyTabModelChange( aName ); } -Any ControlModelContainerBase::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any ControlModelContainerBase::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName ); if ( maModels.end() == aElementPos ) @@ -540,7 +540,7 @@ Any ControlModelContainerBase::getByName( const OUString& aName ) throw(NoSuchEl return makeAny( aElementPos->first ); } -Sequence< OUString > ControlModelContainerBase::getElementNames() throw(RuntimeException) +Sequence< OUString > ControlModelContainerBase::getElementNames() throw(RuntimeException, std::exception) { Sequence< OUString > aNames( maModels.size() ); @@ -553,12 +553,12 @@ Sequence< OUString > ControlModelContainerBase::getElementNames() throw(RuntimeE return aNames; } -sal_Bool ControlModelContainerBase::hasByName( const OUString& aName ) throw(RuntimeException) +sal_Bool ControlModelContainerBase::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) { return maModels.end() != ImplFindElement( aName ); } -void ControlModelContainerBase::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void ControlModelContainerBase::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -622,7 +622,7 @@ void ControlModelContainerBase::insertByName( const OUString& aName, const Any& implNotifyTabModelChange( aName ); } -void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -667,19 +667,19 @@ void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSu } -sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl( ) throw (RuntimeException) +sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl( ) throw (RuntimeException, std::exception) { return sal_True; } -void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) throw (RuntimeException, std::exception) { OSL_TRACE( "ControlModelContainerBase::setGroupControl: explicit grouping not supported" ); } -void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Reference< XControlModel > >& _rControls ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Reference< XControlModel > >& _rControls ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -716,7 +716,7 @@ void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Refer typedef ::std::multimap< sal_Int32, Reference< XControlModel >, ::std::less< sal_Int32 > > MapIndexToModel; -Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels( ) throw (RuntimeException) +Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -764,7 +764,7 @@ Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getCo } -void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& ) throw (RuntimeException, std::exception) { // 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 @@ -774,7 +774,7 @@ void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XC } ////----- XInitialization ------------------------------------------------------------------- -void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) +void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArguments) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) { if ( rArguments.getLength() == 1 ) { @@ -786,19 +786,19 @@ void SAL_CALL ControlModelContainerBase::initialize (const Sequence<Any>& rArgum else m_nTabPageId = -1; } -::sal_Int16 SAL_CALL ControlModelContainerBase::getTabPageID() throw (::com::sun::star::uno::RuntimeException) +::sal_Int16 SAL_CALL ControlModelContainerBase::getTabPageID() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_nTabPageId; } -::sal_Bool SAL_CALL ControlModelContainerBase::getEnabled() throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL ControlModelContainerBase::getEnabled() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_bEnabled; } -void SAL_CALL ControlModelContainerBase::setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlModelContainerBase::setEnabled( ::sal_Bool _enabled ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_bEnabled = _enabled; } -OUString SAL_CALL ControlModelContainerBase::getTitle() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ControlModelContainerBase::getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XPropertySet> xThis(*this,UNO_QUERY); @@ -806,25 +806,25 @@ OUString SAL_CALL ControlModelContainerBase::getTitle() throw (::com::sun::star: xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle; return sTitle; } -void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlModelContainerBase::setTitle( const OUString& _title ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XPropertySet> xThis(*this,UNO_QUERY); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),makeAny(_title)); } -OUString SAL_CALL ControlModelContainerBase::getImageURL() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ControlModelContainerBase::getImageURL() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_sImageURL; } -void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& _imageurl ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_sImageURL = _imageurl; } -OUString SAL_CALL ControlModelContainerBase::getToolTip() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ControlModelContainerBase::getToolTip() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_sTooltip; } -void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_sTooltip = _tooltip; } @@ -856,7 +856,7 @@ namespace } -sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -866,7 +866,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) +void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, OUString& _rName ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -890,7 +890,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< } -void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -899,13 +899,13 @@ void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, } -void SAL_CALL ControlModelContainerBase::addChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::addChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException, std::exception) { maChangeListeners.addInterface( _rxListener ); } -void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException, std::exception) { maChangeListeners.removeInterface( _rxListener ); } @@ -1070,7 +1070,7 @@ void ControlModelContainerBase::implUpdateGroupStructure() } -void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1096,7 +1096,7 @@ void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEve } -void SAL_CALL ControlModelContainerBase::disposing( const EventObject& /*rEvent*/ ) throw (RuntimeException) +void SAL_CALL ControlModelContainerBase::disposing( const EventObject& /*rEvent*/ ) throw (RuntimeException, std::exception) { } @@ -1146,7 +1146,7 @@ ResourceListener::~ResourceListener() // XInterface Any SAL_CALL ResourceListener::queryInterface( const Type& rType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -1252,7 +1252,7 @@ void ResourceListener::stopListening() // XModifyListener void SAL_CALL ResourceListener::modified( const lang::EventObject& aEvent ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Reference< util::XModifyListener > xListener; @@ -1281,7 +1281,7 @@ throw ( RuntimeException ) // XEventListener void SAL_CALL ResourceListener::disposing( const EventObject& Source ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Reference< lang::XEventListener > xListener; Reference< resource::XStringResourceResolver > xResource; @@ -1371,7 +1371,7 @@ ControlContainerBase::~ControlContainerBase() { } -void ControlContainerBase::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) +void ControlContainerBase::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; UnoControlContainer::createPeer( rxToolkit, rParentPeer ); @@ -1474,7 +1474,7 @@ void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl ) xW->setPosSize( nX, nY, nWidth, nHeight, PosSize::POSSIZE ); } -void ControlContainerBase::dispose() throw(RuntimeException) +void ControlContainerBase::dispose() throw(RuntimeException, std::exception) { EventObject aEvt; aEvt.Source = static_cast< ::cppu::OWeakObject* >( this ); @@ -1494,12 +1494,12 @@ void ControlContainerBase::dispose() throw(RuntimeException) void SAL_CALL ControlContainerBase::disposing( const EventObject& Source ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { UnoControlContainer::disposing( Source ); } -sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException) +sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1572,7 +1572,7 @@ sal_Bool ControlContainerBase::setModel( const Reference< XControlModel >& rxMod return bRet; } -void ControlContainerBase::setDesignMode( sal_Bool bOn ) throw(RuntimeException) +void ControlContainerBase::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1591,7 +1591,7 @@ void ControlContainerBase::setDesignMode( sal_Bool bOn ) throw(RuntimeException) mxTabController->activateTabOrder(); } -void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw(RuntimeException) +void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1615,7 +1615,7 @@ void ControlContainerBase::elementInserted( const ContainerEvent& Event ) throw( } } -void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException) +void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1636,7 +1636,7 @@ void ControlContainerBase::elementRemoved( const ContainerEvent& Event ) throw(R } } -void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException) +void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1755,7 +1755,7 @@ void ControlContainerBase::removingControl( const Reference< XControl >& _rxCont } -void SAL_CALL ControlContainerBase::changesOccurred( const ChangesEvent& ) throw (RuntimeException) +void SAL_CALL ControlContainerBase::changesOccurred( const ChangesEvent& ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; // a tab controller model may have changed diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 63eb71e29212..521ebfc14e4e 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -79,7 +79,7 @@ class SimpleNamedThingContainer : public SimpleNameContainer_BASE ::osl::Mutex m_aMutex; public: // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess - virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -89,14 +89,14 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); return uno::makeAny( things[ aName ] ); } - virtual Sequence< OUString > SAL_CALL getElementNames( ) throw(RuntimeException) + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); Sequence< OUString > aResult( things.size() ); @@ -107,12 +107,12 @@ public: *pName = it->first; return aResult; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) { ::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) + virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -122,18 +122,18 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); things.erase( things.find( aName ) ); } - virtual Type SAL_CALL getElementType( ) throw (RuntimeException) + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) { return cppu::UnoType<T>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return ( things.size() > 0 ); @@ -152,7 +152,7 @@ protected: css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // ::cppu::OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception); + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception); public: UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlDialogModel( const UnoControlDialogModel& rModel ); @@ -160,10 +160,10 @@ public: UnoControlModel* Clone() const; // css::beans::XMultiPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception); // css::io::XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception); // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlDialogModel, ControlModelContainerBase, "com.sun.star.awt.UnoControlDialogModel" ) @@ -236,7 +236,7 @@ UnoControlModel* UnoControlDialogModel::Clone() const } -OUString UnoControlDialogModel::getServiceName( ) throw(RuntimeException) +OUString UnoControlDialogModel::getServiceName( ) throw(RuntimeException, std::exception) { return OUString("stardiv.vcl.controlmodel.Dialog"); } @@ -275,13 +275,13 @@ Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // XMultiPropertySet -Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > UnoControlDialogModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) +void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) { ControlModelContainerBase::setFastPropertyValue_NoBroadcast( nHandle, rValue ); try @@ -329,7 +329,7 @@ OUString UnoDialogControl::GetComponentServiceName() return OUString("TabPage"); } -void UnoDialogControl::dispose() throw(RuntimeException) +void UnoDialogControl::dispose() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -341,12 +341,12 @@ void UnoDialogControl::dispose() throw(RuntimeException) void SAL_CALL UnoDialogControl::disposing( const EventObject& Source ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { ControlContainerBase::disposing( Source ); } -sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException) +sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception) { // #Can we move all the Resource stuff to the ControlContainerBase ? SolarMutexGuard aGuard; @@ -355,7 +355,7 @@ sal_Bool UnoDialogControl::setModel( const Reference< XControlModel >& rxModel ) return bRet; } -void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) +void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -415,7 +415,7 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes } } -void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException) +void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException, std::exception) { maTopWindowListeners.addInterface( rxListener ); if( getPeer().is() && maTopWindowListeners.getLength() == 1 ) @@ -425,7 +425,7 @@ void UnoDialogControl::addTopWindowListener( const Reference< XTopWindowListener } } -void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException) +void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListener >& rxListener ) throw (RuntimeException, std::exception) { if( getPeer().is() && maTopWindowListeners.getLength() == 1 ) { @@ -435,7 +435,7 @@ void UnoDialogControl::removeTopWindowListener( const Reference< XTopWindowListe maTopWindowListeners.removeInterface( rxListener ); } -void UnoDialogControl::toFront( ) throw (RuntimeException) +void UnoDialogControl::toFront( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -446,7 +446,7 @@ void UnoDialogControl::toFront( ) throw (RuntimeException) } } -void UnoDialogControl::toBack( ) throw (RuntimeException) +void UnoDialogControl::toBack( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -457,7 +457,7 @@ void UnoDialogControl::toBack( ) throw (RuntimeException) } } -void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) throw (RuntimeException) +void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; mxMenuBar = rxMenuBar; @@ -475,7 +475,7 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize } // ::com::sun::star::awt::XWindowListener void SAL_CALL UnoDialogControl::windowResized( const ::com::sun::star::awt::WindowEvent& e ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -516,7 +516,7 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL UnoDialogControl::windowMoved( const ::com::sun::star::awt::WindowEvent& e ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -541,31 +541,31 @@ throw (::com::sun::star::uno::RuntimeException) } } -void SAL_CALL UnoDialogControl::windowShown( const EventObject& e ) throw (RuntimeException) +void SAL_CALL UnoDialogControl::windowShown( const EventObject& e ) throw (RuntimeException, std::exception) { (void)e; } -void SAL_CALL UnoDialogControl::windowHidden( const EventObject& e ) throw (RuntimeException) +void SAL_CALL UnoDialogControl::windowHidden( const EventObject& e ) throw (RuntimeException, std::exception) { (void)e; } -void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) throw (RuntimeException) +void SAL_CALL UnoDialogControl::endDialog( ::sal_Int32 i_result ) throw (RuntimeException, std::exception) { Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY ); if ( xPeerDialog.is() ) xPeerDialog->endDialog( i_result ); } -void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id ) throw (RuntimeException) +void SAL_CALL UnoDialogControl::setHelpId( const OUString& i_id ) throw (RuntimeException, std::exception) { Reference< XDialog2 > xPeerDialog( getPeer(), UNO_QUERY ); if ( xPeerDialog.is() ) xPeerDialog->setHelpId( i_id ); } -void UnoDialogControl::setTitle( const OUString& Title ) throw(RuntimeException) +void UnoDialogControl::setTitle( const OUString& Title ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; Any aAny; @@ -573,13 +573,13 @@ void UnoDialogControl::setTitle( const OUString& Title ) throw(RuntimeException) ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ), aAny, true ); } -OUString UnoDialogControl::getTitle() throw(RuntimeException) +OUString UnoDialogControl::getTitle() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return ImplGetPropertyValue_UString( BASEPROPERTY_TITLE ); } -sal_Int16 UnoDialogControl::execute() throw(RuntimeException) +sal_Int16 UnoDialogControl::execute() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int16 nDone = -1; @@ -596,7 +596,7 @@ sal_Int16 UnoDialogControl::execute() throw(RuntimeException) return nDone; } -void UnoDialogControl::endExecute() throw(RuntimeException) +void UnoDialogControl::endExecute() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( getPeer().is() ) @@ -613,7 +613,7 @@ void UnoDialogControl::endExecute() throw(RuntimeException) // XModifyListener void SAL_CALL UnoDialogControl::modified( const lang::EventObject& /*rEvent*/ ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { ImplUpdateResourceResolver(); } @@ -662,29 +662,29 @@ UnoMultiPageControl::~UnoMultiPageControl() } // XTabListener -void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException) +void SAL_CALL UnoMultiPageControl::inserted( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) { } -void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException) +void SAL_CALL UnoMultiPageControl::removed( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) { } void SAL_CALL UnoMultiPageControl::changed( SAL_UNUSED_PARAMETER ::sal_Int32, - SAL_UNUSED_PARAMETER const Sequence< NamedValue >& ) throw (RuntimeException) + SAL_UNUSED_PARAMETER const Sequence< NamedValue >& ) throw (RuntimeException, std::exception) { } -void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException) +void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), false ); } -void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException) +void SAL_CALL UnoMultiPageControl::deactivated( SAL_UNUSED_PARAMETER ::sal_Int32 ) throw (RuntimeException, std::exception) { } -void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) throw (RuntimeException) +void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) throw (RuntimeException, std::exception) { } -void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException) +void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -693,7 +693,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException) } // com::sun::star::awt::XSimpleTabController -::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() throw (RuntimeException) +::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() throw (RuntimeException, std::exception) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -701,7 +701,7 @@ void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException) return xMultiPage->insertTab(); } -void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException) +void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -709,7 +709,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) +void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -717,7 +717,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) +Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -725,7 +725,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) +void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -735,7 +735,7 @@ void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOut } -::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() throw (RuntimeException) +::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() throw (RuntimeException, std::exception) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( !xMultiPage.is() ) @@ -743,7 +743,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) +void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException, std::exception) { maTabListeners.addInterface( Listener ); Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); @@ -751,7 +751,7 @@ void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener xMultiPage->addTabListener( &maTabListeners ); } -void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException) +void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException, std::exception) { Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY ); if ( xMultiPage.is() && maTabListeners.getLength() == 1 ) @@ -806,7 +806,7 @@ void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxCo } -void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) +void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -896,7 +896,7 @@ UnoMultiPageModel::Clone() const return pClone; } -OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoMultiPageModel ); } @@ -924,13 +924,13 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Reference< XServiceInfo > xInfo; aElement >>= xInfo; @@ -946,7 +946,7 @@ void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement } -sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) throw (RuntimeException) +sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) throw (RuntimeException, std::exception) { return sal_True; } @@ -1016,7 +1016,7 @@ UnoPageModel::Clone() const return pClone; } -OUString UnoPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoPageModel ); } @@ -1044,14 +1044,14 @@ uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) throw (RuntimeException) +sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) throw (RuntimeException, std::exception) { return sal_False; } @@ -1181,7 +1181,7 @@ UnoFrameModel::Clone() const return pClone; } -OUString UnoFrameModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoFrameModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoFrameModel ); } @@ -1223,7 +1223,7 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { 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 59df35a00501..4c8c35561835 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -42,13 +42,13 @@ namespace toolkit // Methods XElementAccess Type NameContainer_Impl::getElementType() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mType; } sal_Bool NameContainer_Impl::hasElements() - throw(RuntimeException) + throw(RuntimeException, std::exception) { bool bRet = (mnElementCount > 0); return bRet; @@ -56,7 +56,7 @@ sal_Bool NameContainer_Impl::hasElements() // Methods XNameAccess Any NameContainer_Impl::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); if( aIt == mHashMap.end() ) @@ -69,13 +69,13 @@ Any NameContainer_Impl::getByName( const OUString& aName ) } Sequence< OUString > NameContainer_Impl::getElementNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mNames; } sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); bool bRet = ( aIt != mHashMap.end() ); @@ -85,7 +85,7 @@ sal_Bool NameContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Type aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -112,7 +112,7 @@ void NameContainer_Impl::replaceByName( const OUString& aName, const Any& aEleme // Methods XNameContainer void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Type aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -140,7 +140,7 @@ void NameContainer_Impl::insertByName( const OUString& aName, const Any& aElemen } void NameContainer_Impl::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( Name ); if( aIt == mHashMap.end() ) @@ -174,12 +174,12 @@ void NameContainer_Impl::removeByName( const OUString& Name ) } // Methods XContainer -void NameContainer_Impl::addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException) +void NameContainer_Impl::addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) { maContainerListeners.addInterface( l ); } -void NameContainer_Impl::removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException) +void NameContainer_Impl::removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) { maContainerListeners.removeInterface( l ); } diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 9691838fc87d..28aa22cf505e 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -163,13 +163,13 @@ namespace toolkit } - OUString UnoControlFormattedFieldModel::getServiceName() throw(RuntimeException) + OUString UnoControlFormattedFieldModel::getServiceName() throw(RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlFormattedFieldModel ); } - void SAL_CALL UnoControlFormattedFieldModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) + void SAL_CALL UnoControlFormattedFieldModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -260,7 +260,7 @@ namespace toolkit } - void UnoControlFormattedFieldModel::dispose( ) throw(RuntimeException) + void UnoControlFormattedFieldModel::dispose( ) throw(RuntimeException, std::exception) { UnoControlModel::dispose(); @@ -302,7 +302,7 @@ namespace toolkit } - void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { bool bSettingValue = false; bool bSettingText = false; @@ -411,7 +411,7 @@ namespace toolkit // beans::XMultiPropertySet - Reference< XPropertySetInfo > UnoControlFormattedFieldModel::getPropertySetInfo( ) throw(RuntimeException) + Reference< XPropertySetInfo > UnoControlFormattedFieldModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -433,7 +433,7 @@ namespace toolkit } - void UnoFormattedFieldControl::textChanged(const TextEvent& e) throw(RuntimeException) + void UnoFormattedFieldControl::textChanged(const TextEvent& e) throw(RuntimeException, std::exception) { Reference< XVclWindowPeer > xPeer(getPeer(), UNO_QUERY); OSL_ENSURE(xPeer.is(), "UnoFormattedFieldControl::textChanged : what kind of peer do I have ?"); diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index be15946a4da7..0525980f23dc 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) + Sequence< Type > SAL_CALL OGeometryControlModel_Base::getTypes( ) throw (RuntimeException, std::exception) { // our own types Sequence< Type > aTypes = ::comphelper::concatSequences( @@ -244,7 +244,7 @@ } - Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType ) throw(RuntimeException) + Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn; if (_rType.equals(::getCppuType(static_cast< Reference< XCloneable>* >(NULL))) && !m_bCloneable) @@ -269,7 +269,7 @@ } - Any SAL_CALL OGeometryControlModel_Base::queryInterface( const Type& _rType ) throw(RuntimeException) + Any SAL_CALL OGeometryControlModel_Base::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { return OGCM_Base::queryInterface(_rType); } @@ -309,7 +309,7 @@ } - void SAL_CALL OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception) + void SAL_CALL OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception, std::exception) { OPropertyContainer::setFastPropertyValue_NoBroadcast(_nHandle, _rValue); } @@ -349,13 +349,13 @@ } - Reference< XPropertySetInfo> SAL_CALL OGeometryControlModel_Base::getPropertySetInfo() throw(RuntimeException) + Reference< XPropertySetInfo> SAL_CALL OGeometryControlModel_Base::getPropertySetInfo() throw(RuntimeException, std::exception) { return OPropertySetAggregationHelper::createPropertySetInfo(getInfoHelper()); } - Reference< XCloneable > SAL_CALL OGeometryControlModel_Base::createClone( ) throw(RuntimeException) + Reference< XCloneable > SAL_CALL OGeometryControlModel_Base::createClone( ) throw(RuntimeException, std::exception) { 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) + Reference< XNameContainer > SAL_CALL OGeometryControlModel_Base::getEvents() throw(RuntimeException, std::exception) { if( !mxEventContainer.is() ) mxEventContainer = (XNameContainer*)new toolkit::ScriptEventContainer(); @@ -587,7 +587,7 @@ } - Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId( ) throw (RuntimeException) + Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId( ) throw (RuntimeException, std::exception) { return theOCommonGeometryControlModelImplementationId::get().getImplementationId(); } @@ -605,7 +605,7 @@ }; - void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) + void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) { OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 95ac0f9631a1..f2d00f393855 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -58,25 +58,25 @@ public: virtual ~DefaultGridColumnModel(); // XGridColumnModel - virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL createColumn( ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL addColumn(const css::uno::Reference< css::awt::grid::XGridColumn > & column) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); - virtual void SAL_CALL removeColumn( ::sal_Int32 i_columnIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException); - virtual css::uno::Sequence< css::uno::Reference< css::awt::grid::XGridColumn > > SAL_CALL getColumns() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) throw (css::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL createColumn( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL addColumn(const css::uno::Reference< css::awt::grid::XGridColumn > & column) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); + virtual void SAL_CALL removeColumn( ::sal_Int32 i_columnIndex ) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception); + virtual css::uno::Sequence< css::uno::Reference< css::awt::grid::XGridColumn > > SAL_CALL getColumns() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) throw (css::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception); // XContainer - virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception); // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); @@ -138,13 +138,13 @@ private: } - ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (RuntimeException) + ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (RuntimeException, std::exception) { return m_aColumns.size(); } - Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn( ) throw (RuntimeException) + Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn( ) throw (RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return new GridColumn(); @@ -152,7 +152,7 @@ private: ::sal_Int32 SAL_CALL DefaultGridColumnModel::addColumn( const Reference< XGridColumn > & i_column ) - throw (RuntimeException, css::lang::IllegalArgumentException) + throw (RuntimeException, css::lang::IllegalArgumentException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -178,7 +178,7 @@ private: void SAL_CALL DefaultGridColumnModel::removeColumn( ::sal_Int32 i_columnIndex ) - throw (RuntimeException, css::lang::IndexOutOfBoundsException) + throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -227,7 +227,7 @@ private: } - Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() throw (RuntimeException) + Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() throw (RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return ::comphelper::containerToSequence( m_aColumns ); @@ -235,7 +235,7 @@ private: Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::getColumn(::sal_Int32 index) - throw (css::lang::IndexOutOfBoundsException, RuntimeException) + throw (css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -246,7 +246,7 @@ private: } - void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) throw (RuntimeException) + void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) throw (RuntimeException, std::exception) { ::std::vector< ContainerEvent > aRemovedColumns; ::std::vector< ContainerEvent > aInsertedColumns; @@ -330,17 +330,17 @@ private: } - OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString("stardiv.Toolkit.DefaultGridColumnModel"); } - sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException) + sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, i_serviceName); } - Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DefaultGridColumnModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { const OUString aServiceName("com.sun.star.awt.grid.DefaultGridColumnModel"); const Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -348,14 +348,14 @@ private: } - void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception) { if ( i_listener.is() ) m_aContainerListeners.addInterface( i_listener ); } - void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException, std::exception) { if ( i_listener.is() ) m_aContainerListeners.removeInterface( i_listener ); @@ -392,7 +392,7 @@ private: } - Reference< css::util::XCloneable > SAL_CALL DefaultGridColumnModel::createClone( ) throw (RuntimeException) + Reference< css::util::XCloneable > SAL_CALL DefaultGridColumnModel::createClone( ) throw (RuntimeException, std::exception) { ::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 614555e4ae0e..7c764b585177 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -57,38 +57,38 @@ public: virtual ~DefaultGridDataModel(); // XMutableGridDataModel - virtual void SAL_CALL addRow( const Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException); - 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); - 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); - 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); - virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL removeAllRows( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - 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); - virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addRow( const Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, std::exception); + 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); + 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); + 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); + virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAllRows( ) throw (css::uno::RuntimeException, std::exception); + 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); + 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); + virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + 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); + virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception); // XGridDataModel - virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 Row ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 Row ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 Row ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 Row ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); private: typedef ::std::pair< Any, Any > CellData; @@ -149,14 +149,14 @@ private: } - ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return impl_getRowCount_nolck(); } - ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nColumnCount; @@ -202,21 +202,21 @@ private: } - Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException) + Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) { ::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) + Any SAL_CALL DefaultGridDataModel::getCellToolTip( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) { ::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) + Any SAL_CALL DefaultGridDataModel::getRowHeading( ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -227,7 +227,7 @@ private: } - Sequence< Any > SAL_CALL DefaultGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Sequence< Any > SAL_CALL DefaultGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -259,19 +259,19 @@ private: } - void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException) + void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, std::exception) { 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) + void SAL_CALL DefaultGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException, std::exception) { 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) + void SAL_CALL DefaultGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -294,7 +294,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) + 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) { if ( i_headings.getLength() != i_data.getLength() ) throw IllegalArgumentException( OUString(), *this, -1 ); @@ -333,7 +333,7 @@ private: } - void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -351,7 +351,7 @@ private: } - void SAL_CALL DefaultGridDataModel::removeAllRows( ) throw (RuntimeException) + void SAL_CALL DefaultGridDataModel::removeAllRows( ) throw (RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -366,7 +366,7 @@ private: } - void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -380,7 +380,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) + 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) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -420,7 +420,7 @@ private: } - void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -437,14 +437,14 @@ private: } - void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::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) + void SAL_CALL DefaultGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -454,13 +454,13 @@ private: } - void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException) + void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException) + void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } @@ -483,17 +483,17 @@ private: } - OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString("stardiv.Toolkit.DefaultGridDataModel"); } - sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } - Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { static const OUString aServiceName("com.sun.star.awt.grid.DefaultGridDataModel"); static const Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -501,7 +501,7 @@ private: } - Reference< css::util::XCloneable > SAL_CALL DefaultGridDataModel::createClone( ) throw (RuntimeException) + Reference< css::util::XCloneable > SAL_CALL DefaultGridDataModel::createClone( ) throw (RuntimeException, std::exception) { return new DefaultGridDataModel( *this ); } diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index dd8654b78f06..e654f56671d8 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -93,106 +93,106 @@ namespace toolkit } - ::com::sun::star::uno::Any SAL_CALL GridColumn::getIdentifier() throw (::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL GridColumn::getIdentifier() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_aIdentifier; } - void SAL_CALL GridColumn::setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); m_aIdentifier = value; } - ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nColumnWidth; } - void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_set( m_nColumnWidth, value, "ColumnWidth" ); } - ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nMaxWidth; } - void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_set( m_nMaxWidth, value, "MaxWidth" ); } - ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nMinWidth; } - void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_set( m_nMinWidth, value, "MinWidth" ); } - OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sTitle; } - void SAL_CALL GridColumn::setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_set( m_sTitle, value, "Title" ); } - OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException) + OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sHelpText; } - void SAL_CALL GridColumn::setHelpText( const OUString & value ) throw (RuntimeException) + void SAL_CALL GridColumn::setHelpText( const OUString & value ) throw (RuntimeException, std::exception) { impl_set( m_sHelpText, value, "HelpText" ); } - sal_Bool SAL_CALL GridColumn::getResizeable() throw (::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL GridColumn::getResizeable() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_bResizeable; } - void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_set( m_bResizeable, bool(value), "Resizeable" ); } - ::sal_Int32 SAL_CALL GridColumn::getFlexibility() throw (RuntimeException) + ::sal_Int32 SAL_CALL GridColumn::getFlexibility() throw (RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nFlexibility; } - void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException) + void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException, std::exception) { if ( i_value < 0 ) throw IllegalArgumentException( OUString(), *this, 1 ); @@ -200,26 +200,26 @@ namespace toolkit } - HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException) + HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_eHorizontalAlign; } - void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_set( m_eHorizontalAlign, align, "HorizontalAlign" ); } - void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException) + void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<XGridColumnListener>::get(), xListener ); } - void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException) + void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XGridColumnListener>::get(), xListener ); } @@ -233,7 +233,7 @@ namespace toolkit } - ::sal_Int32 SAL_CALL GridColumn::getIndex() throw (RuntimeException) + ::sal_Int32 SAL_CALL GridColumn::getIndex() throw (RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nIndex; @@ -247,30 +247,30 @@ namespace toolkit } - ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex() throw(RuntimeException) + ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex() throw(RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nDataColumnIndex; } - void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(RuntimeException) + void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(RuntimeException, std::exception) { impl_set( m_nDataColumnIndex, i_dataColumnIndex, "DataColumnIndex" ); } - OUString SAL_CALL GridColumn::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL GridColumn::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString( "org.openoffice.comp.toolkit.GridColumn" ); } - sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName ) throw (RuntimeException) + sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, i_serviceName); } - ::com::sun::star::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException) + ::com::sun::star::uno::Sequence< OUString > SAL_CALL GridColumn::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { const OUString aServiceName("com.sun.star.awt.grid.GridColumn"); const Sequence< OUString > aSeq( &aServiceName, 1 ); @@ -278,13 +278,13 @@ namespace toolkit } - Reference< XCloneable > SAL_CALL GridColumn::createClone( ) throw (RuntimeException) + Reference< XCloneable > SAL_CALL GridColumn::createClone( ) throw (RuntimeException, std::exception) { return new GridColumn( *this ); } - sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) throw(RuntimeException) + sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) throw(RuntimeException, std::exception) { 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 ef0f1325151f..e9a783be8285 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -48,43 +48,43 @@ public: virtual ~GridColumn(); // ::com::sun::star::awt::grid::XGridColumn - virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getColumnWidth() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getMaxWidth() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getMinWidth() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getResizeable() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setResizeable(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getFlexibility() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHelpText(const OUString & value) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getIndex() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::style::HorizontalAlignment SAL_CALL getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHorizontalAlign(::com::sun::star::style::HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addGridColumnListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeGridColumnListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getColumnWidth() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setColumnWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getMaxWidth() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMaxWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getMinWidth() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMinWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getResizeable() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setResizeable(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getFlexibility() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFlexibility( ::sal_Int32 _flexibility ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getHelpText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setHelpText(const OUString & value) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getIndex() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getDataColumnIndex() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::style::HorizontalAlignment SAL_CALL getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setHorizontalAlign(::com::sun::star::style::HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addGridColumnListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeGridColumnListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XCloneable (base of XGridColumn) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XUnoTunnel and friends - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& i_identifier ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& i_identifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelId() throw(); static GridColumn* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_component ); diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 6fae5db67ee6..c8969566d269 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -178,7 +178,7 @@ namespace } -void SAL_CALL UnoGridModel::dispose( ) throw(RuntimeException) +void SAL_CALL UnoGridModel::dispose( ) throw(RuntimeException, std::exception) { lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ) ); lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL ) ); @@ -187,7 +187,7 @@ void SAL_CALL UnoGridModel::dispose( ) throw(RuntimeException) } -void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) +void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) { Any aOldSubModel; if ( ( nHandle == BASEPROPERTY_GRID_COLUMNMODEL ) || ( nHandle == BASEPROPERTY_GRID_DATAMODEL ) ) @@ -208,7 +208,7 @@ void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, } -OUString UnoGridModel::getServiceName() throw(RuntimeException) +OUString UnoGridModel::getServiceName() throw(RuntimeException, std::exception) { return OUString("com.sun.star.awt.grid.UnoControlGridModel"); } @@ -260,7 +260,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const // XMultiPropertySet -Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -289,7 +289,7 @@ OUString UnoGridControl::GetComponentServiceName() } -void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException) +void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -298,7 +298,7 @@ void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException) } -void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) +void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -347,7 +347,7 @@ namespace } -sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model ) throw(RuntimeException) +sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model ) throw(RuntimeException, std::exception) { lcl_setEventForwarding( getModel(), m_pEventForwarder, false ); if ( !UnoGridControl_Base::setModel( i_model ) ) @@ -357,90 +357,90 @@ sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_ } -::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getRowAtPoint( x, y ); } -::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getColumnAtPoint( x, y ); } -::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn( ) throw (RuntimeException) +::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn( ) throw (RuntimeException, std::exception) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getCurrentColumn(); } -::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow( ) throw (RuntimeException) +::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow( ) throw (RuntimeException, std::exception) { 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) +void SAL_CALL UnoGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException, std::exception) { 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 ) +void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception ) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectRow( i_rowIndex ); } -void SAL_CALL UnoGridControl::selectAllRows() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UnoGridControl::selectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectAllRows(); } -void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException ) +void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, std::exception ) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectRow( i_rowIndex ); } -void SAL_CALL UnoGridControl::deselectAllRows() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UnoGridControl::deselectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectAllRows(); } -::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->getSelectedRows(); } -::sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->hasSelectedRows(); } -::sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->isRowSelected( index ); } -void SAL_CALL UnoGridControl::addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UnoGridControl::addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aSelectionListeners.addInterface( listener ); } -void SAL_CALL UnoGridControl::removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UnoGridControl::removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aSelectionListeners.removeInterface( listener ); } diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index 1ebcf6d9a773..23547377f190 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -53,16 +53,16 @@ public: UnoControlModel* Clone() const; // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); // OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoGridModel, UnoControlModel, "com.sun.star.awt.grid.UnoControlGridModel" ) @@ -83,29 +83,29 @@ public: OUString GetComponentServiceName(); // ::com::sun::star::lang::XComponent - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::awt::XControl - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::awt::grid::XGridControl - virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getCurrentColumn( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getCurrentRow( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::util::VetoException); + virtual ::sal_Int32 SAL_CALL getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getCurrentColumn( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getCurrentRow( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::util::VetoException, std::exception); // ::com::sun::star::awt::grid::XGridRowSelection - virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException ); - virtual void SAL_CALL selectAllRows() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException ); - virtual void SAL_CALL deselectAllRows() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasSelectedRows() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ); + virtual void SAL_CALL selectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ); + virtual void SAL_CALL deselectAllRows() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasSelectedRows() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoGridControl, UnoControlBase, "com.sun.star.awt.grid.UnoControlGrid" ) diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx index 14b00678c0b3..f45aa4874389 100644 --- a/toolkit/source/controls/grid/grideventforwarder.cxx +++ b/toolkit/source/controls/grid/grideventforwarder.cxx @@ -67,7 +67,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException) + void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -75,7 +75,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException) + void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -83,7 +83,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException) + void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -91,7 +91,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException) + void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -99,7 +99,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException) + void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -107,7 +107,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException) + void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -115,7 +115,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException) + void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException, std::exception) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); if ( xPeer.is() ) @@ -123,7 +123,7 @@ namespace toolkit } - void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event ) throw (RuntimeException) + void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) { 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 41a356e97f2c..e3655a6da84f 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(); // XGridDataListener - virtual void SAL_CALL rowsInserted( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rowsRemoved( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL dataChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rowHeadingChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rowsInserted( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rowsRemoved( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dataChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rowHeadingChanged( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& i_event ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: UnoGridControl& m_parent; diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 7c8627b3ee36..cd2e28c24e2b 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -77,64 +77,64 @@ protected: public: // XSortableGridData - virtual void SAL_CALL sortByColumn( ::sal_Int32 ColumnIndex, ::sal_Bool SortAscending ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL removeColumnSort( ) throw (css::uno::RuntimeException); - virtual css::beans::Pair< ::sal_Int32, ::sal_Bool > SAL_CALL getCurrentSortOrder( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL sortByColumn( ::sal_Int32 ColumnIndex, ::sal_Bool SortAscending ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeColumnSort( ) throw (css::uno::RuntimeException, std::exception); + virtual css::beans::Pair< ::sal_Int32, ::sal_Bool > SAL_CALL getCurrentSortOrder( ) throw (css::uno::RuntimeException, std::exception); // XMutableGridDataModel - virtual void SAL_CALL addRow( const css::uno::Any& Heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException); - 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); - 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); - 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); - virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL removeAllRows( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL updateCellData( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - 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); - virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL updateCellToolTip( ::sal_Int32 ColumnIndex, ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addRow( const css::uno::Any& Heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, std::exception); + 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); + 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); + 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); + virtual void SAL_CALL removeRow( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAllRows( ) throw (css::uno::RuntimeException, std::exception); + 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); + 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); + virtual void SAL_CALL updateRowHeading( ::sal_Int32 RowIndex, const css::uno::Any& Heading ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + 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); + virtual void SAL_CALL updateRowToolTip( ::sal_Int32 RowIndex, const css::uno::Any& Value ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeGridDataListener( const css::uno::Reference< css::awt::grid::XGridDataListener >& Listener ) throw (css::uno::RuntimeException, std::exception); // XGridDataModel - virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getCellData( ::sal_Int32 Column, ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getCellToolTip( ::sal_Int32 Column, ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getRowHeading( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getRowData( ::sal_Int32 RowIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XGridDataListener - virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException); - virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException); - virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException); - virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException); + virtual void SAL_CALL rowsInserted( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL rowsRemoved( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL dataChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL rowHeadingChanged( const css::awt::grid::GridDataEvent& Event ) throw (css::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException); + virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) throw (css::uno::RuntimeException, std::exception); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( ) throw (); virtual void SAL_CALL release( ) throw (); // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception); private: /** translates the given public index into one to be passed to our delegator @@ -312,7 +312,7 @@ private: } - Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) throw (RuntimeException) + Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { Any aReturn( SortableGridDataModel_Base::queryInterface( aType ) ); if ( !aReturn.hasValue() ) @@ -333,14 +333,14 @@ private: } - Sequence< Type > SAL_CALL SortableGridDataModel::getTypes( ) throw (RuntimeException) + Sequence< Type > SAL_CALL SortableGridDataModel::getTypes( ) throw (RuntimeException, std::exception) { 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) + Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId( ) throw (RuntimeException, std::exception) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); @@ -358,7 +358,7 @@ private: } - void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) throw (Exception, RuntimeException) + void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) throw (Exception, RuntimeException, std::exception) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -416,7 +416,7 @@ private: } - void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -476,7 +476,7 @@ private: } - void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -537,7 +537,7 @@ private: } - void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -547,7 +547,7 @@ private: } - void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -557,7 +557,7 @@ private: } - void SAL_CALL SortableGridDataModel::disposing( const EventObject& i_event ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) { // not interested in OSL_UNUSED( i_event ); @@ -651,7 +651,7 @@ private: } - void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, ::sal_Bool i_sortAscending ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, ::sal_Bool i_sortAscending ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -694,7 +694,7 @@ private: } - void SAL_CALL SortableGridDataModel::removeColumnSort( ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::removeColumnSort( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -702,7 +702,7 @@ private: } - css::beans::Pair< ::sal_Int32, ::sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder( ) throw (RuntimeException) + css::beans::Pair< ::sal_Int32, ::sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -711,7 +711,7 @@ private: } - void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -722,7 +722,7 @@ private: } - void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException) + void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -733,7 +733,7 @@ private: } - void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException) + void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -747,7 +747,7 @@ private: } - void SAL_CALL SortableGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException) + 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) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -761,7 +761,7 @@ private: } - void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -774,7 +774,7 @@ private: } - void SAL_CALL SortableGridDataModel::removeAllRows( ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::removeAllRows( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -785,7 +785,7 @@ private: } - void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -798,7 +798,7 @@ private: } - void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + 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) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -811,7 +811,7 @@ private: } - void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -824,7 +824,7 @@ private: } - void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -837,7 +837,7 @@ private: } - void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -850,19 +850,19 @@ private: } - void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException) + void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() throw (RuntimeException) + ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -873,7 +873,7 @@ private: } - ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() throw (RuntimeException) + ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -884,7 +884,7 @@ private: } - Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -897,7 +897,7 @@ private: } - Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -910,7 +910,7 @@ private: } - Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -923,7 +923,7 @@ private: } - Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -955,7 +955,7 @@ private: } - Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone( ) throw (RuntimeException) + Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this, rBHelper ); DBG_CHECK_ME(); @@ -964,17 +964,17 @@ private: } - OUString SAL_CALL SortableGridDataModel::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL SortableGridDataModel::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString( "org.openoffice.comp.toolkit.SortableGridDataModel" ); } - ::sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, i_serviceName); } - Sequence< OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SortableGridDataModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { Sequence< OUString > aServiceNames(1); aServiceNames[0] = OUString("com.sun.star.awt.grid.SortableGridDataModel"); diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 08dfb3a27059..f7a09455bcf4 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -75,7 +75,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException) + OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlRoadmapModel ); } @@ -111,7 +111,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( ) throw (Exception, ::com::sun::star::uno::RuntimeException) + Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( ) throw (Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ORoadmapEntry* pRoadmapItem = new ORoadmapEntry(); Reference< XInterface > xNewRoadmapItem = (::cppu::OWeakObject*)pRoadmapItem; @@ -119,7 +119,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException) + Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException, std::exception) { // Todo: implementation of the arguments handling ORoadmapEntry* pRoadmapItem = new ORoadmapEntry(); @@ -132,7 +132,7 @@ static void lcl_throwIndexOutOfBoundsException( ) - ::com::sun::star::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -156,19 +156,19 @@ static void lcl_throwIndexOutOfBoundsException( ) // beans::XMultiPropertySet - Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo( ) throw(RuntimeException) + Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - sal_Int32 SAL_CALL UnoControlRoadmapModel::getCount() throw(RuntimeException) + sal_Int32 SAL_CALL UnoControlRoadmapModel::getCount() throw(RuntimeException, std::exception) { return maRoadmapItems.size(); } - Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if (( Index >= (sal_Int32)maRoadmapItems.size()) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -262,7 +262,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& _Element) - throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -286,7 +286,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index) - throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -317,7 +317,7 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::replaceByIndex( const sal_Int32 Index, const Any& _Element) - throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Reference< XInterface > xRoadmapItem; _Element >>= xRoadmapItem; @@ -330,25 +330,25 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Type SAL_CALL UnoControlRoadmapModel::getElementType() throw(RuntimeException) + Type SAL_CALL UnoControlRoadmapModel::getElementType() throw(RuntimeException, std::exception) { Type aType = getCppuType( ( Reference< XPropertySet>* ) NULL ); return aType; } - sal_Bool SAL_CALL UnoControlRoadmapModel::hasElements() throw(RuntimeException) + sal_Bool SAL_CALL UnoControlRoadmapModel::hasElements() throw(RuntimeException, std::exception) { return !maRoadmapItems.empty(); } - void SAL_CALL UnoControlRoadmapModel::addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL UnoControlRoadmapModel::addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { maContainerListeners.addInterface( xListener ); } - void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { maContainerListeners.removeInterface( xListener ); } @@ -367,7 +367,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 ) +sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& _rModel) throw ( RuntimeException, std::exception ) { @@ -393,7 +393,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& - void UnoRoadmapControl::dispose() throw(RuntimeException) + void UnoRoadmapControl::dispose() throw(RuntimeException, std::exception) { EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -403,7 +403,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& -void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(RuntimeException) +void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) { Reference< XInterface > xRoadmapItem; rEvent.Element >>= xRoadmapItem; @@ -422,7 +422,7 @@ void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(Run } -void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(RuntimeException) +void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) { Reference< XContainerListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -435,7 +435,7 @@ void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(Runt } -void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(RuntimeException) +void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) { Reference< XContainerListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -443,7 +443,7 @@ void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(Run } -void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) throw (RuntimeException) +void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) throw (RuntimeException, std::exception) { sal_Int16 CurItemIndex = sal::static_int_cast< sal_Int16 >(rEvent.ItemId); Any aAny; @@ -456,7 +456,7 @@ void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) thr } -void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException) +void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) { maItemListeners.addInterface( l ); if( getPeer().is() && maItemListeners.getLength() == 1 ) @@ -467,7 +467,7 @@ void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener } -void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException) +void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) { if( getPeer().is() && maItemListeners.getLength() == 1 ) { @@ -479,7 +479,7 @@ void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListe } -void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) +void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception) { Reference< XPropertyChangeListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index 3dd1467436b5..a4ffe51c53bb 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -71,24 +71,24 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe ::com::sun::star::uno::Reference< ::com::sun::star:: beans::XPropertySetInfo > SAL_CALL ORoadmapEntry::getPropertySetInfo() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } -OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ORoadmapEntry::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString aStr("com.sun.star.comp.toolkit.RoadmapItem"); return aStr; } -sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index c93362eff131..2729e7abd05b 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -37,14 +37,14 @@ public: virtual UnoControlModel* Clone() const; // XPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception); // XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception); // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception); + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception); protected: ~SpinningProgressControlModel(); @@ -95,26 +95,26 @@ protected: } - Reference< beans::XPropertySetInfo > SAL_CALL SpinningProgressControlModel::getPropertySetInfo( ) throw(RuntimeException) + Reference< beans::XPropertySetInfo > SAL_CALL SpinningProgressControlModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - OUString SAL_CALL SpinningProgressControlModel::getServiceName() throw(RuntimeException) + OUString SAL_CALL SpinningProgressControlModel::getServiceName() throw(RuntimeException, std::exception) { return OUString("com.sun.star.awt.SpinningProgressControlModel"); } - OUString SAL_CALL SpinningProgressControlModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL SpinningProgressControlModel::getImplementationName( ) throw(RuntimeException, std::exception) { return OUString("org.openoffice.comp.toolkit.SpinningProgressControlModel"); } - Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { 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 07948f485fa8..273d9173f25e 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -158,7 +158,7 @@ void StdTabController::ImplActivateControl( bool bFirst ) const } // XInterface -Any StdTabController::queryAggregation( const Type & rType ) throw(RuntimeException) +Any StdTabController::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = ::cppu::queryInterface( rType, (static_cast< XTabController* >(this)), @@ -173,35 +173,35 @@ IMPL_XTYPEPROVIDER_START( StdTabController ) getCppuType( ( Reference< XServiceInfo>* ) NULL ) IMPL_XTYPEPROVIDER_END -void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) throw(RuntimeException) +void StdTabController::setModel( const Reference< XTabControllerModel >& Model ) throw(RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); mxModel = Model; } -Reference< XTabControllerModel > StdTabController::getModel( ) throw(RuntimeException) +Reference< XTabControllerModel > StdTabController::getModel( ) throw(RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mxModel; } -void StdTabController::setContainer( const Reference< XControlContainer >& Container ) throw(RuntimeException) +void StdTabController::setContainer( const Reference< XControlContainer >& Container ) throw(RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); mxControlContainer = Container; } -Reference< XControlContainer > StdTabController::getContainer( ) throw(RuntimeException) +Reference< XControlContainer > StdTabController::getContainer( ) throw(RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mxControlContainer; } -Sequence< Reference< XControl > > StdTabController::getControls( ) throw(RuntimeException) +Sequence< Reference< XControl > > StdTabController::getControls( ) throw(RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -227,7 +227,7 @@ Sequence< Reference< XControl > > StdTabController::getControls( ) throw(Runtim return aSeq; } -void StdTabController::autoTabOrder( ) throw(RuntimeException) +void StdTabController::autoTabOrder( ) throw(RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -292,7 +292,7 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException) mxModel->setControlModels( aNewSeq ); } -void StdTabController::activateTabOrder( ) throw(RuntimeException) +void StdTabController::activateTabOrder( ) throw(RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -347,7 +347,7 @@ void StdTabController::activateTabOrder( ) throw(RuntimeException) } } -void StdTabController::activateFirst( ) throw(RuntimeException) +void StdTabController::activateFirst( ) throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); //TODO: necessary? @@ -355,7 +355,7 @@ void StdTabController::activateFirst( ) throw(RuntimeException) ImplActivateControl( true ); } -void StdTabController::activateLast( ) throw(RuntimeException) +void StdTabController::activateLast( ) throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); //TODO: necessary? diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index a718f2afc727..5c58e5c43dfa 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -212,7 +212,7 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star // ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any StdTabControllerModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any StdTabControllerModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< ::com::sun::star::awt::XTabControllerModel* >(this)), @@ -229,21 +229,21 @@ IMPL_XTYPEPROVIDER_START( StdTabControllerModel ) getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>* ) NULL ) IMPL_XTYPEPROVIDER_END -sal_Bool StdTabControllerModel::getGroupControl( ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool StdTabControllerModel::getGroupControl( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mbGroupControl; } -void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::setGroupControl( sal_Bool GroupControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); mbGroupControl = GroupControl; } -void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Controls ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -251,7 +251,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque ImplSetControlModels( maControls, Controls ); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > StdTabControllerModel::getControlModels( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > StdTabControllerModel::getControlModels( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -261,7 +261,7 @@ void StdTabControllerModel::setControlModels( const ::com::sun::star::uno::Seque return aSeq; } -void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& Group, const OUString& GroupName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -299,7 +299,7 @@ void StdTabControllerModel::setGroup( const ::com::sun::star::uno::Sequence< ::c maControls.push_back( pNewEntry ); } -sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno::RuntimeException) +sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -317,7 +317,7 @@ sal_Int32 StdTabControllerModel::getGroupCount( ) throw(::com::sun::star::uno:: return nGroups; } -void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup, OUString& rName ) throw(::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup, OUString& rName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -344,7 +344,7 @@ void StdTabControllerModel::getGroup( sal_Int32 nGroup, ::com::sun::star::uno::S rGroup = aSeq; } -void StdTabControllerModel::getGroupByName( const OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup ) throw(::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::getGroupByName( const OUString& rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& rGroup ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -368,12 +368,12 @@ void StdTabControllerModel::getGroupByName( const OUString& rName, ::com::sun::s // ::com::sun::star::io::XPersistObject -OUString StdTabControllerModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString StdTabControllerModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_TabControllerModel ); } -void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -397,7 +397,7 @@ void StdTabControllerModel::write( const ::com::sun::star::uno::Reference< ::com } } -void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void StdTabControllerModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 0df53a77f9f4..5abbdf63773f 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -59,7 +59,7 @@ UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Referenc ImplRegisterProperty( BASEPROPERTY_TEXT ); } -OUString UnoControlTabPageContainerModel::getServiceName() throw(RuntimeException) +OUString UnoControlTabPageContainerModel::getServiceName() throw(RuntimeException, std::exception) { return OUString("com.sun.star.awt.tab.UnoControlTabPageContainerModel"); } @@ -87,7 +87,7 @@ uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropI } return *pHelper; } -Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo( ) throw(RuntimeException) +Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlTabPageContainerModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -127,14 +127,14 @@ namespace } } -Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPage( ::sal_Int16 i_tabPageID ) throw (RuntimeException) +Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPage( ::sal_Int16 i_tabPageID ) throw (RuntimeException, std::exception) { 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) +Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const OUString& i_resourceURL ) throw (RuntimeException, std::exception) { Sequence< Any > aInitArgs(2); aInitArgs[0] <<= i_tabPageID; @@ -142,7 +142,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage return lcl_createTabPageModel( m_xContext, aInitArgs, this ); } -void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const com::sun::star::uno::Any& aElement) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException) +void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const com::sun::star::uno::Any& aElement) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; uno::Reference < XTabPageModel > xTabPageModel; @@ -169,22 +169,22 @@ void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex (OWeakObject *)this, 2 ); } -void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } // XIndexReplace -void SAL_CALL UnoControlTabPageContainerModel::replaceByIndex( ::sal_Int32 /*Index*/, const uno::Any& /*Element*/ ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL UnoControlTabPageContainerModel::replaceByIndex( ::sal_Int32 /*Index*/, const uno::Any& /*Element*/ ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } // XIndexAccess -::sal_Int32 SAL_CALL UnoControlTabPageContainerModel::getCount( ) throw (uno::RuntimeException) +::sal_Int32 SAL_CALL UnoControlTabPageContainerModel::getCount( ) throw (uno::RuntimeException, std::exception) { ::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) +uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( nIndex < 0 || nIndex > sal_Int32(m_aTabPageVector.size()) ) @@ -193,23 +193,23 @@ uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nInde } // XElementAccess -uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType( ) throw (uno::RuntimeException) +uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType( ) throw (uno::RuntimeException, std::exception) { return ::getCppuType(static_cast< Reference< com::sun::star::awt::XControlModel>* >(NULL)); } -::sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements( ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements( ) throw (uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return !m_aTabPageVector.empty(); } // XContainer -void UnoControlTabPageContainerModel::addContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException) +void UnoControlTabPageContainerModel::addContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception) { maContainerListeners.addInterface( l ); } -void UnoControlTabPageContainerModel::removeContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException) +void UnoControlTabPageContainerModel::removeContainerListener( const Reference< XContainerListener >& l ) throw(RuntimeException, std::exception) { maContainerListeners.removeInterface( l ); } @@ -228,7 +228,7 @@ OUString UnoControlTabPageContainer::GetComponentServiceName() return OUString("TabPageContainer"); } -void SAL_CALL UnoControlTabPageContainer::dispose( ) throw(RuntimeException) +void SAL_CALL UnoControlTabPageContainer::dispose( ) throw(RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -236,7 +236,7 @@ void SAL_CALL UnoControlTabPageContainer::dispose( ) throw(RuntimeException) UnoControl::dispose(); } -void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) +void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -248,43 +248,43 @@ void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit // XTabPageContainer -::sal_Int16 SAL_CALL UnoControlTabPageContainer::getActiveTabPageID() throw (RuntimeException) +::sal_Int16 SAL_CALL UnoControlTabPageContainer::getActiveTabPageID() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getActiveTabPageID(); } -void SAL_CALL UnoControlTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (RuntimeException) +void SAL_CALL UnoControlTabPageContainer::setActiveTabPageID( ::sal_Int16 _activetabpageid ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); xTPContainer->setActiveTabPageID(_activetabpageid); } -::sal_Int16 SAL_CALL UnoControlTabPageContainer::getTabPageCount( ) throw (RuntimeException) +::sal_Int16 SAL_CALL UnoControlTabPageContainer::getTabPageCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getTabPageCount(); } -::sal_Bool SAL_CALL UnoControlTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex ) throw (RuntimeException) +::sal_Bool SAL_CALL UnoControlTabPageContainer::isTabPageActive( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->isTabPageActive(tabPageIndex); } -Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException) +Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPage( ::sal_Int16 tabPageIndex ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getTabPage(tabPageIndex); } -Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException) +Reference< ::com::sun::star::awt::tab::XTabPage > SAL_CALL UnoControlTabPageContainer::getTabPageByID( ::sal_Int16 tabPageID ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; Reference< XTabPageContainer > xTPContainer( getPeer(), UNO_QUERY_THROW ); return xTPContainer->getTabPageByID(tabPageID); } -void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException) +void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) { m_aTabPageListeners.addInterface( listener ); if( getPeer().is() && m_aTabPageListeners.getLength() == 1 ) @@ -293,7 +293,7 @@ void SAL_CALL UnoControlTabPageContainer::addTabPageContainerListener( const Ref xTabPageContainer->addTabPageContainerListener( &m_aTabPageListeners ); } } -void SAL_CALL UnoControlTabPageContainer::removeTabPageContainerListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException) +void SAL_CALL UnoControlTabPageContainer::removeTabPageContainerListener( const Reference< ::com::sun::star::awt::tab::XTabPageContainerListener >& listener ) throw (RuntimeException, std::exception) { if( getPeer().is() && m_aTabPageListeners.getLength() == 1 ) { @@ -321,7 +321,7 @@ void UnoControlTabPageContainer::updateFromModel() xContainerListener->elementInserted( aEvent ); } } -void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< ::com::sun::star::awt::XControl >& Control ) throw (RuntimeException) +void SAL_CALL UnoControlTabPageContainer::addControl( const OUString& Name, const Reference< ::com::sun::star::awt::XControl >& Control ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ControlContainerBase::addControl(Name,Control); diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 6b925ab9dc3a..be844d1fd8f9 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -58,12 +58,12 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c ImplRegisterProperty( BASEPROPERTY_HELPURL ); } -OUString SAL_CALL UnoControlTabPageModel::getImplementationName() throw(css::uno::RuntimeException) +OUString SAL_CALL UnoControlTabPageModel::getImplementationName() throw(css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlTabPageModel"); } -css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServiceNames() throw(css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aNames = ControlModelContainerBase::getSupportedServiceNames( ); aNames.realloc( aNames.getLength() + 1 ); @@ -71,7 +71,7 @@ css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServ return aNames; } -OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException) +OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException, std::exception) { return OUString("com.sun.star.awt.tab.UnoControlTabPageModel"); } @@ -103,14 +103,14 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return *pHelper; } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlTabPageModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } ////----- XInitialization ------------------------------------------------------------------- void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArguments) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nPageId = -1; if ( rArguments.getLength() == 1 ) @@ -180,26 +180,26 @@ OUString UnoControlTabPage::GetComponentServiceName() } OUString SAL_CALL UnoControlTabPage::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlTabPage"); } sal_Bool SAL_CALL UnoControlTabPage::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL UnoControlTabPage::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.awt.tab.UnoControlTabPage"); return aSeq; } -void UnoControlTabPage::dispose() throw(RuntimeException) +void UnoControlTabPage::dispose() throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -208,12 +208,12 @@ void UnoControlTabPage::dispose() throw(RuntimeException) ControlContainerBase::dispose(); } -void SAL_CALL UnoControlTabPage::disposing( const lang::EventObject& Source )throw(RuntimeException) +void SAL_CALL UnoControlTabPage::disposing( const lang::EventObject& Source )throw(RuntimeException, std::exception) { ControlContainerBase::disposing( Source ); } -void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) +void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ImplUpdateResourceResolver(); @@ -239,7 +239,7 @@ static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize } // ::com::sun::star::awt::XWindowListener void SAL_CALL UnoControlTabPage::windowResized( const ::com::sun::star::awt::WindowEvent& e ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -277,7 +277,7 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL UnoControlTabPage::windowMoved( const ::com::sun::star::awt::WindowEvent& e ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { OutputDevice*pOutDev = Application::GetDefaultDevice(); DBG_ASSERT( pOutDev, "Missing Default Device!" ); @@ -303,13 +303,13 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL UnoControlTabPage::windowShown( const ::com::sun::star::lang::EventObject& e ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { (void)e; } void SAL_CALL UnoControlTabPage::windowHidden( const ::com::sun::star::lang::EventObject& e ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { (void)e; } diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index b48d7ac5d735..e90af2661625 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -43,7 +43,7 @@ namespace toolkit } - OUString UnoControlScrollBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) + OUString UnoControlScrollBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlScrollBarModel ); } @@ -76,7 +76,7 @@ namespace toolkit } - uno::Reference< beans::XPropertySetInfo > UnoControlScrollBarModel::getPropertySetInfo( ) throw(uno::RuntimeException) + uno::Reference< beans::XPropertySetInfo > UnoControlScrollBarModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -98,7 +98,7 @@ namespace toolkit } // ::com::sun::star::uno::XInterface - uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) + uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XAdjustmentListener* >(this)), @@ -113,7 +113,7 @@ namespace toolkit UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END - void UnoScrollBarControl::dispose() throw(uno::RuntimeException) + void UnoScrollBarControl::dispose() throw(uno::RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -121,7 +121,7 @@ namespace toolkit UnoControl::dispose(); } - void UnoScrollBarControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) + void UnoScrollBarControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -130,7 +130,7 @@ namespace toolkit } // ::com::sun::star::awt::XAdjustmentListener - void UnoScrollBarControl::adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::adjustmentValueChanged( const ::com::sun::star::awt::AdjustmentEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) { switch ( rEvent.Type ) { @@ -160,22 +160,22 @@ namespace toolkit } // ::com::sun::star::awt::XScrollBar - void UnoScrollBarControl::addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) { maAdjustmentListeners.addInterface( l ); } - void UnoScrollBarControl::removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException, std::exception) { maAdjustmentListeners.removeInterface( l ); } - void UnoScrollBarControl::setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE ), uno::makeAny( n ), true ); } - void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nValue; @@ -186,7 +186,7 @@ namespace toolkit ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), aAny, true ); } - sal_Int32 UnoScrollBarControl::getValue() throw(::com::sun::star::uno::RuntimeException) + sal_Int32 UnoScrollBarControl::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -197,12 +197,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLVALUE_MAX ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getMaximum() throw(::com::sun::star::uno::RuntimeException) + sal_Int32 UnoScrollBarControl::getMaximum() throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -213,12 +213,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINEINCREMENT ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getLineIncrement() throw(::com::sun::star::uno::RuntimeException) + sal_Int32 UnoScrollBarControl::getLineIncrement() throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -229,12 +229,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BLOCKINCREMENT ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getBlockIncrement() throw(::com::sun::star::uno::RuntimeException) + sal_Int32 UnoScrollBarControl::getBlockIncrement() throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -245,12 +245,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VISIBLESIZE ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getVisibleSize() throw(::com::sun::star::uno::RuntimeException) + sal_Int32 UnoScrollBarControl::getVisibleSize() throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) @@ -261,12 +261,12 @@ namespace toolkit return n; } - void UnoScrollBarControl::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) + void UnoScrollBarControl::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), uno::makeAny( n ), true ); } - sal_Int32 UnoScrollBarControl::getOrientation() throw(::com::sun::star::uno::RuntimeException) + sal_Int32 UnoScrollBarControl::getOrientation() throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 n = 0; if ( getPeer().is() ) diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index f1736047796c..4e50861432af 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -50,14 +50,14 @@ public: UnoControlModel* Clone() const { return new UnoSpinButtonModel( *this ); } // XMultiPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception); // XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception); // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception); + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception); }; @@ -79,36 +79,36 @@ public: OUString GetComponentServiceName(); DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase ); - css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException); + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception); - void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException); - void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException) { UnoControlBase::disposing( Source ); } - void SAL_CALL dispose( ) throw(css::uno::RuntimeException); + 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); + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) { UnoControlBase::disposing( Source ); } + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception); // XTypeProvider DECLARE_XTYPEPROVIDER() // XAdjustmentListener - void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException); + void SAL_CALL adjustmentValueChanged( const css::awt::AdjustmentEvent& rEvent ) throw(css::uno::RuntimeException, std::exception); // XSpinValue - virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( sal_Int32 value ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getValue( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMinimum( ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaximum( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSpinIncrement( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::lang::NoSupportException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getOrientation( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( sal_Int32 value ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getValue( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMinimum( sal_Int32 minValue ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMinimum( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaximum( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSpinIncrement( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getOrientation( ) throw (css::uno::RuntimeException, std::exception); // XServiceInfo - OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException); + OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception); + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception); }; @@ -141,7 +141,7 @@ public: } - OUString UnoSpinButtonModel::getServiceName( ) throw (RuntimeException) + OUString UnoSpinButtonModel::getServiceName( ) throw (RuntimeException, std::exception) { return OUString("com.sun.star.awt.UnoControlSpinButtonModel"); } @@ -178,20 +178,20 @@ public: } - Reference< XPropertySetInfo > UnoSpinButtonModel::getPropertySetInfo( ) throw(RuntimeException) + Reference< XPropertySetInfo > UnoSpinButtonModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - OUString SAL_CALL UnoSpinButtonModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL UnoSpinButtonModel::getImplementationName( ) throw(RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonModel" ); } - Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); @@ -216,7 +216,7 @@ public: } - Any UnoSpinButtonControl::queryAggregation( const Type & rType ) throw(RuntimeException) + Any UnoSpinButtonControl::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = UnoControlBase::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -228,7 +228,7 @@ public: IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoSpinButtonControl, UnoControlBase, UnoSpinButtonControl_Base ) - void UnoSpinButtonControl::dispose() throw(RuntimeException) + void UnoSpinButtonControl::dispose() throw(RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); if ( maAdjustmentListeners.getLength() ) @@ -248,13 +248,13 @@ public: } - OUString SAL_CALL UnoSpinButtonControl::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL UnoSpinButtonControl::getImplementationName( ) throw(RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonControl" ); } - Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() ); aServices.realloc( aServices.getLength() + 1 ); @@ -263,7 +263,7 @@ public: } - void UnoSpinButtonControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) + void UnoSpinButtonControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -273,7 +273,7 @@ public: } - void UnoSpinButtonControl::adjustmentValueChanged( const AdjustmentEvent& rEvent ) throw(RuntimeException) + void UnoSpinButtonControl::adjustmentValueChanged( const AdjustmentEvent& rEvent ) throw(RuntimeException, std::exception) { switch ( rEvent.Type ) { @@ -295,27 +295,27 @@ public: } - void UnoSpinButtonControl::addAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException) + void UnoSpinButtonControl::addAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); maAdjustmentListeners.addInterface( listener ); } - void UnoSpinButtonControl::removeAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException) + void UnoSpinButtonControl::removeAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); maAdjustmentListeners.removeInterface( listener ); } - void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value ) throw (RuntimeException) + void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value ) throw (RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), true ); } - void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException) + void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), true ); ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), true ); @@ -323,7 +323,7 @@ public: } - sal_Int32 SAL_CALL UnoSpinButtonControl::getValue( ) throw (RuntimeException) + sal_Int32 SAL_CALL UnoSpinButtonControl::getValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nValue = 0; @@ -336,19 +336,19 @@ public: } - void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException) + void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), true ); } - void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException) + void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), true ); } - sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum( ) throw (RuntimeException) + sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nMin = 0; @@ -361,7 +361,7 @@ public: } - sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum( ) throw (RuntimeException) + sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nMax = 0; @@ -374,13 +374,13 @@ public: } - void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException) + void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), true ); } - sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement( ) throw (RuntimeException) + sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); sal_Int32 nIncrement = 0; @@ -393,13 +393,13 @@ public: } - void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException) + void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException, std::exception) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), true ); } - sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation( ) throw (RuntimeException) + sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation( ) throw (RuntimeException, std::exception) { ::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 8151559d36d8..5a080a4b89ce 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -76,7 +76,7 @@ UnoControlModel* UnoTreeModel::Clone() const return new UnoTreeModel( *this ); } -OUString UnoTreeModel::getServiceName() throw(RuntimeException) +OUString UnoTreeModel::getServiceName() throw(RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_TreeControlModel ); } @@ -117,7 +117,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // XMultiPropertySet -Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -135,47 +135,47 @@ public: OUString GetComponentServiceName(); // css::lang::XComponent - void SAL_CALL dispose( ) throw(css::uno::RuntimeException); + void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception); // 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); + 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); // css::view::XSelectionSupplier - virtual ::sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); // css::view::XMultiSelectionSupplier - virtual ::sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual void SAL_CALL clearSelection( ) throw (css::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getSelectionCount( ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration( ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL addSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSelection( const css::uno::Any& Selection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearSelection( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getSelectionCount( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSelectionEnumeration( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createReverseSelectionEnumeration( ) throw (css::uno::RuntimeException, std::exception); // css::awt::XTreeControl - virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException); - virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (css::uno::RuntimeException); - virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException); - virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - 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); - virtual ::sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - 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); - 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); - virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException); - virtual css::awt::Rectangle SAL_CALL getNodeRect( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isEditing( ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL stopEditing( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL cancelEditing( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultExpandedGraphicURL() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultExpandedGraphicURL( const OUString& _defaultexpandedgraphicurl ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isNodeExpanded( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isNodeCollapsed( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + 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); + virtual ::sal_Bool SAL_CALL isNodeVisible( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + 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); + 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); + virtual void SAL_CALL addTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeTreeExpansionListener( const css::uno::Reference< css::awt::tree::XTreeExpansionListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (css::uno::RuntimeException, std::exception); + 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); + virtual ::sal_Bool SAL_CALL isEditing( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL stopEditing( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancelEditing( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL startEditingAtNode( const css::uno::Reference< css::awt::tree::XTreeNode >& Node ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception); // css::lang::XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoTreeControl, UnoControlBase, szServiceName_TreeControl ) @@ -204,21 +204,21 @@ OUString UnoTreeControl::GetComponentServiceName() // ::com::sun::star::view::XSelectionSupplier -sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) +sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->select( rSelection ); } -Any SAL_CALL UnoTreeControl::getSelection() throw (RuntimeException) +Any SAL_CALL UnoTreeControl::getSelection() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelection(); } -void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException) +void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { maSelectionListeners.addInterface( xListener ); if( getPeer().is() && (maSelectionListeners.getLength() == 1) ) @@ -232,7 +232,7 @@ void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSele -void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException) +void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { if( getPeer().is() && (maSelectionListeners.getLength() == 1) ) { @@ -248,14 +248,14 @@ void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XS // ::com::sun::star::view::XMultiSelectionSupplier -sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) +sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->addSelection(rSelection); } -void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) +void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->removeSelection(rSelection); @@ -263,7 +263,7 @@ void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (Il -void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException) +void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->clearSelection(); @@ -271,21 +271,21 @@ void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException) -sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() throw (RuntimeException) +sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelectionCount(); } -Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() throw (RuntimeException) +Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createSelectionEnumeration(); } -Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() throw (RuntimeException) +Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createReverseSelectionEnumeration(); } @@ -294,14 +294,14 @@ Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumera // XTreeControl -OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() throw (RuntimeException) +OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultExpandedGraphicURL(); } -void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) throw (RuntimeException) +void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) throw (RuntimeException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->setDefaultExpandedGraphicURL(_defaultexpansiongraphicurl); @@ -309,14 +309,14 @@ void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _def -OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() throw (RuntimeException) +OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultCollapsedGraphicURL(); } -void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (RuntimeException) +void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (RuntimeException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->setDefaultCollapsedGraphicURL(_defaultcollapsedgraphicurl); @@ -324,21 +324,21 @@ void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _de -sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) +sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeExpanded(xNode); } -sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) +sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeCollapsed(xNode); } -void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) +void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->makeNodeVisible(xNode); @@ -346,14 +346,14 @@ void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNo -sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) +sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeVisible(xNode); } -void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) +void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->expandNode(xNode); @@ -361,7 +361,7 @@ void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) -void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) +void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->collapseNode(xNode); @@ -369,7 +369,7 @@ void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode -void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException) +void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { maTreeExpansionListeners.addInterface( xListener ); if( getPeer().is() && (maTreeExpansionListeners.getLength() == 1) ) @@ -383,7 +383,7 @@ void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeEx -void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException) +void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { if( getPeer().is() && (maTreeExpansionListeners.getLength() == 1) ) { @@ -397,42 +397,42 @@ void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTre -Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException) +Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeForLocation(x,y); } -Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException) +Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getClosestNodeForLocation(x,y); } -awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) throw (IllegalArgumentException, RuntimeException) +awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) throw (IllegalArgumentException, RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeRect( Node ); } -sal_Bool SAL_CALL UnoTreeControl::isEditing( ) throw (RuntimeException) +sal_Bool SAL_CALL UnoTreeControl::isEditing( ) throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isEditing(); } -sal_Bool SAL_CALL UnoTreeControl::stopEditing() throw (RuntimeException) +sal_Bool SAL_CALL UnoTreeControl::stopEditing() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->stopEditing(); } -void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException) +void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->cancelEditing(); @@ -440,7 +440,7 @@ void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException) -void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException) +void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XWindowPeer > xGcc3WorkaroundTemporary( getPeer()); Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->startEditingAtNode(xNode); @@ -448,7 +448,7 @@ void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& -void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException) +void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception) { maTreeEditListeners.addInterface( xListener ); if( getPeer().is() && (maTreeEditListeners.getLength() == 1) ) @@ -462,7 +462,7 @@ void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditLis -void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException) +void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception) { if( getPeer().is() && (maTreeEditListeners.getLength() == 1) ) { @@ -478,7 +478,7 @@ void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEdit // XComponent -void SAL_CALL UnoTreeControl::dispose( ) throw(RuntimeException) +void SAL_CALL UnoTreeControl::dispose( ) throw(RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = static_cast< ::cppu::OWeakObject* >(this); @@ -487,7 +487,7 @@ void SAL_CALL UnoTreeControl::dispose( ) throw(RuntimeException) UnoControl::dispose(); } -void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) +void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -500,7 +500,7 @@ void UnoTreeControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk } -void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node ) throw (RuntimeException, ::com::sun::star::util::VetoException) +void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNode >& Node ) throw (RuntimeException, ::com::sun::star::util::VetoException, std::exception) { ::cppu::OInterfaceIteratorHelper aIt( *this ); while( aIt.hasMoreElements() ) @@ -524,7 +524,7 @@ void SAL_CALL TreeEditListenerMultiplexer::nodeEditing( const Reference< XTreeNo } } -void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNode >& Node, const OUString& NewText ) throw (RuntimeException) +void SAL_CALL TreeEditListenerMultiplexer::nodeEdited( const Reference< XTreeNode >& Node, const OUString& NewText ) throw (RuntimeException, std::exception) { ::cppu::OInterfaceIteratorHelper aIt( *this ); while( aIt.hasMoreElements() ) diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx index ecbc9328dcd9..1f7cab5fd596 100644 --- a/toolkit/source/controls/tree/treecontrol.hxx +++ b/toolkit/source/controls/tree/treecontrol.hxx @@ -45,10 +45,10 @@ public: UnoControlModel* Clone() const; // ::com::sun::star::beans::XMultiPropertySet - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::io::XPersistObject - OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoTreeModel, UnoControlModel, szServiceName_TreeControlModel ) diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index da3dd9f76876..f12d672e1475 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -59,23 +59,23 @@ public: void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >* pNodes, sal_Int32 nNodes ); // XMutableTreeDataModel - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode > SAL_CALL createNode( const ::com::sun::star::uno::Any& DisplayValue, ::sal_Bool ChildrenOnDemand ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRoot( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& RootNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode > SAL_CALL createNode( const ::com::sun::star::uno::Any& DisplayValue, ::sal_Bool ChildrenOnDemand ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRoot( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& RootNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XTreeDataModel - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getRoot( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addTreeDataModelListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModelListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTreeDataModelListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModelListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getRoot( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTreeDataModelListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModelListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeTreeDataModelListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModelListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (RuntimeException); - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException); - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException); + virtual void SAL_CALL dispose( ) throw (RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); private: bool mbDisposed; @@ -95,32 +95,32 @@ public: void broadcast_changes(const Reference< XTreeNode >& xNode, bool bNew); // XMutableTreeNode - virtual ::com::sun::star::uno::Any SAL_CALL getDataValue() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataValue( const ::com::sun::star::uno::Any& _datavalue ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL appendChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& ChildNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertChildByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& ChildNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHasChildrenOnDemand( ::sal_Bool ChildrenOnDemand ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDisplayValue( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getDataValue() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDataValue( const ::com::sun::star::uno::Any& _datavalue ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL appendChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& ChildNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertChildByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XMutableTreeNode >& ChildNode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeChildByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setHasChildrenOnDemand( ::sal_Bool ChildrenOnDemand ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDisplayValue( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setNodeGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setExpandedGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCollapsedGraphicURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XTreeNode - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasChildrenOnDemand( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getDisplayValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getNodeGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getExpandedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCollapsedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getChildAt( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasChildrenOnDemand( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getDisplayValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getNodeGraphicURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getExpandedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCollapsedGraphicURL( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); static MutableTreeNode* getImplementation( const Reference< XTreeNode >& xNode, bool bThrows ) throw (IllegalArgumentException); Reference< XTreeNode > getReference( MutableTreeNode* pNode ) @@ -175,12 +175,12 @@ void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTr } } -Reference< XMutableTreeNode > SAL_CALL MutableTreeDataModel::createNode( const Any& aValue, sal_Bool bChildrenOnDemand ) throw (RuntimeException) +Reference< XMutableTreeNode > SAL_CALL MutableTreeDataModel::createNode( const Any& aValue, sal_Bool bChildrenOnDemand ) throw (RuntimeException, std::exception) { return new MutableTreeNode( this, aValue, bChildrenOnDemand ); } -void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException) +void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) { if( !xNode.is() ) throw IllegalArgumentException(); @@ -207,23 +207,23 @@ void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode > } } -Reference< XTreeNode > SAL_CALL MutableTreeDataModel::getRoot( ) throw (RuntimeException) +Reference< XTreeNode > SAL_CALL MutableTreeDataModel::getRoot( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mxRootNode; } -void SAL_CALL MutableTreeDataModel::addTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException) +void SAL_CALL MutableTreeDataModel::addTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException, std::exception) { BrdcstHelper.addListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener ); } -void SAL_CALL MutableTreeDataModel::removeTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException) +void SAL_CALL MutableTreeDataModel::removeTreeDataModelListener( const Reference< XTreeDataModelListener >& xListener ) throw (RuntimeException, std::exception) { BrdcstHelper.removeListener( cppu::UnoType<XTreeDataModelListener>::get(), xListener ); } -void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException) +void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -236,29 +236,29 @@ void SAL_CALL MutableTreeDataModel::dispose() throw (RuntimeException) } } -void SAL_CALL MutableTreeDataModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException) +void SAL_CALL MutableTreeDataModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) { BrdcstHelper.addListener( cppu::UnoType<XEventListener>::get(), xListener ); } -void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException) +void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) { BrdcstHelper.removeListener( cppu::UnoType<XEventListener>::get(), xListener ); } -OUString SAL_CALL MutableTreeDataModel::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL MutableTreeDataModel::getImplementationName( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); static const OUString aImplName( "toolkit.MutableTreeDataModel" ); return aImplName; } -sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); static const OUString aServiceName( OUString::createFromAscii( szServiceName_MutableTreeDataModel ) ); @@ -315,19 +315,19 @@ void MutableTreeNode::broadcast_changes(const Reference< XTreeNode >& xNode, boo } } -Any SAL_CALL MutableTreeNode::getDataValue() throw (RuntimeException) +Any SAL_CALL MutableTreeNode::getDataValue() throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maDataValue; } -void SAL_CALL MutableTreeNode::setDataValue( const Any& _datavalue ) throw (RuntimeException) +void SAL_CALL MutableTreeNode::setDataValue( const Any& _datavalue ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); maDataValue = _datavalue; } -void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >& xChildNode ) throw (IllegalArgumentException, RuntimeException) +void SAL_CALL MutableTreeNode::appendChild( const Reference< XMutableTreeNode >& xChildNode ) throw (IllegalArgumentException, RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); Reference< XTreeNode > xNode( xChildNode.get() ); @@ -343,7 +343,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) +void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const Reference< XMutableTreeNode >& xChildNode ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -367,7 +367,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) +void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -391,7 +391,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) +void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDemand ) throw (RuntimeException, std::exception) { bool bChanged; @@ -405,7 +405,7 @@ void SAL_CALL MutableTreeNode::setHasChildrenOnDemand( sal_Bool bChildrenOnDeman broadcast_changes(); } -void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue ) throw (RuntimeException) +void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue ) throw (RuntimeException, std::exception) { { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -415,7 +415,7 @@ void SAL_CALL MutableTreeNode::setDisplayValue( const Any& aValue ) throw (Runti broadcast_changes(); } -void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL ) throw (RuntimeException) +void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception) { bool bChanged; @@ -429,7 +429,7 @@ void SAL_CALL MutableTreeNode::setNodeGraphicURL( const OUString& rURL ) throw ( broadcast_changes(); } -void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL ) throw (RuntimeException) +void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception) { bool bChanged; @@ -443,7 +443,7 @@ void SAL_CALL MutableTreeNode::setExpandedGraphicURL( const OUString& rURL ) thr broadcast_changes(); } -void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL ) throw (RuntimeException) +void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL ) throw (RuntimeException, std::exception) { bool bChanged; @@ -457,7 +457,7 @@ void SAL_CALL MutableTreeNode::setCollapsedGraphicURL( const OUString& rURL ) th broadcast_changes(); } -Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException,RuntimeException) +Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException,RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -466,19 +466,19 @@ Reference< XTreeNode > SAL_CALL MutableTreeNode::getChildAt( sal_Int32 nChildInd return getReference( maChildren[nChildIndex].get() ); } -sal_Int32 SAL_CALL MutableTreeNode::getChildCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL MutableTreeNode::getChildCount( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return (sal_Int32)maChildren.size(); } -Reference< XTreeNode > SAL_CALL MutableTreeNode::getParent( ) throw (RuntimeException) +Reference< XTreeNode > SAL_CALL MutableTreeNode::getParent( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return getReference( mpParent ); } -sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNode ) throw (RuntimeException) +sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNode ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); @@ -496,49 +496,49 @@ sal_Int32 SAL_CALL MutableTreeNode::getIndex( const Reference< XTreeNode >& xNod return -1; } -sal_Bool SAL_CALL MutableTreeNode::hasChildrenOnDemand( ) throw (RuntimeException) +sal_Bool SAL_CALL MutableTreeNode::hasChildrenOnDemand( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return mbHasChildrenOnDemand; } -Any SAL_CALL MutableTreeNode::getDisplayValue( ) throw (RuntimeException) +Any SAL_CALL MutableTreeNode::getDisplayValue( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maDisplayValue; } -OUString SAL_CALL MutableTreeNode::getNodeGraphicURL( ) throw (RuntimeException) +OUString SAL_CALL MutableTreeNode::getNodeGraphicURL( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maNodeGraphicURL; } -OUString SAL_CALL MutableTreeNode::getExpandedGraphicURL( ) throw (RuntimeException) +OUString SAL_CALL MutableTreeNode::getExpandedGraphicURL( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maExpandedGraphicURL; } -OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL( ) throw (RuntimeException) +OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); return maCollapsedGraphicURL; } -OUString SAL_CALL MutableTreeNode::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL MutableTreeNode::getImplementationName( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); static const OUString aImplName( "toolkit.MutableTreeNode" ); return aImplName; } -sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( maMutex ); static const OUString aServiceName( "com.sun.star.awt.tree.MutableTreeNode" ); diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 2e16a7954ddc..4724d818918d 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -351,7 +351,7 @@ UnoControl::DisposeAccessibleContext(Reference<XComponent> const& xContextComp) } } -void UnoControl::dispose( ) throw(RuntimeException) +void UnoControl::dispose( ) throw(RuntimeException, std::exception) { Reference< XWindowPeer > xPeer; Reference<XComponent> xAccessibleComp; @@ -390,14 +390,14 @@ void UnoControl::dispose( ) throw(RuntimeException) setContext( Reference< XInterface > () ); } -void UnoControl::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) +void UnoControl::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); maDisposeListeners.addInterface( rxListener ); } -void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) +void UnoControl::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -410,7 +410,7 @@ bool UnoControl::requiresNewPeer( const OUString& /* _rPropertyName */ ) const } // XPropertiesChangeListener -void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException) +void UnoControl::propertiesChange( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception) { Sequence< PropertyChangeEvent > aEvents( rEvents ); { @@ -666,7 +666,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent } } -void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException) +void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // do not compare differing types in case of multible inheritance @@ -690,7 +690,7 @@ void UnoControl::disposing( const EventObject& rEvt ) throw(RuntimeException) } -void SAL_CALL UnoControl::setOutputSize( const awt::Size& aSize ) throw (RuntimeException) +void SAL_CALL UnoControl::setOutputSize( const awt::Size& aSize ) throw (RuntimeException, std::exception) { Reference< XWindow2 > xPeerWindow; { @@ -717,33 +717,33 @@ namespace } } -awt::Size SAL_CALL UnoControl::getOutputSize( ) throw (RuntimeException) +awt::Size SAL_CALL UnoControl::getOutputSize( ) throw (RuntimeException, std::exception) { return lcl_askPeer( getPeer(), &XWindow2::getOutputSize, awt::Size() ); } -::sal_Bool SAL_CALL UnoControl::isVisible( ) throw (RuntimeException) +::sal_Bool SAL_CALL UnoControl::isVisible( ) throw (RuntimeException, std::exception) { return lcl_askPeer( getPeer(), &XWindow2::isVisible, maComponentInfos.bVisible ); } -::sal_Bool SAL_CALL UnoControl::isActive( ) throw (RuntimeException) +::sal_Bool SAL_CALL UnoControl::isActive( ) throw (RuntimeException, std::exception) { return lcl_askPeer( getPeer(), &XWindow2::isActive, sal_False ); } -::sal_Bool SAL_CALL UnoControl::isEnabled( ) throw (RuntimeException) +::sal_Bool SAL_CALL UnoControl::isEnabled( ) throw (RuntimeException, std::exception) { return lcl_askPeer( getPeer(), &XWindow2::isEnabled, maComponentInfos.bEnable ); } -::sal_Bool SAL_CALL UnoControl::hasFocus( ) throw (RuntimeException) +::sal_Bool SAL_CALL UnoControl::hasFocus( ) throw (RuntimeException, std::exception) { return lcl_askPeer( getPeer(), &XWindow2::hasFocus, sal_False ); } // XWindow -void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(RuntimeException) +void UnoControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(RuntimeException, std::exception) { Reference< XWindow > xWindow; { @@ -766,7 +766,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) +awt::Rectangle UnoControl::getPosSize( ) throw(RuntimeException, std::exception) { awt::Rectangle aRect( maComponentInfos.nX, maComponentInfos.nY, maComponentInfos.nWidth, maComponentInfos.nHeight); Reference< XWindow > xWindow; @@ -781,7 +781,7 @@ awt::Rectangle UnoControl::getPosSize( ) throw(RuntimeException) return aRect; } -void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException) +void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException, std::exception) { Reference< XWindow > xWindow; { @@ -795,7 +795,7 @@ void UnoControl::setVisible( sal_Bool bVisible ) throw(RuntimeException) xWindow->setVisible( bVisible ); } -void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException) +void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException, std::exception) { Reference< XWindow > xWindow; { @@ -809,7 +809,7 @@ void UnoControl::setEnable( sal_Bool bEnable ) throw(RuntimeException) xWindow->setEnable( bEnable ); } -void UnoControl::setFocus( ) throw(RuntimeException) +void UnoControl::setFocus( ) throw(RuntimeException, std::exception) { Reference< XWindow > xWindow; { @@ -820,7 +820,7 @@ void UnoControl::setFocus( ) throw(RuntimeException) xWindow->setFocus(); } -void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListener ) throw(RuntimeException) +void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -833,7 +833,7 @@ void UnoControl::addWindowListener( const Reference< XWindowListener >& rxListen xPeerWindow->addWindowListener( &maWindowListeners ); } -void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxListener ) throw(RuntimeException) +void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -846,7 +846,7 @@ void UnoControl::removeWindowListener( const Reference< XWindowListener >& rxLis xPeerWindow->removeWindowListener( &maWindowListeners ); } -void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener ) throw(RuntimeException) +void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -859,7 +859,7 @@ void UnoControl::addFocusListener( const Reference< XFocusListener >& rxListener xPeerWindow->addFocusListener( &maFocusListeners ); } -void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListener ) throw(RuntimeException) +void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -872,7 +872,7 @@ void UnoControl::removeFocusListener( const Reference< XFocusListener >& rxListe xPeerWindow->removeFocusListener( &maFocusListeners ); } -void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) throw(RuntimeException) +void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -885,7 +885,7 @@ void UnoControl::addKeyListener( const Reference< XKeyListener >& rxListener ) t xPeerWindow->addKeyListener( &maKeyListeners); } -void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener ) throw(RuntimeException) +void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -898,7 +898,7 @@ void UnoControl::removeKeyListener( const Reference< XKeyListener >& rxListener xPeerWindow->removeKeyListener( &maKeyListeners); } -void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener ) throw(RuntimeException) +void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -911,7 +911,7 @@ void UnoControl::addMouseListener( const Reference< XMouseListener >& rxListener xPeerWindow->addMouseListener( &maMouseListeners); } -void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListener ) throw(RuntimeException) +void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -924,7 +924,7 @@ void UnoControl::removeMouseListener( const Reference< XMouseListener >& rxListe xPeerWindow->removeMouseListener( &maMouseListeners ); } -void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) throw(RuntimeException) +void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -937,7 +937,7 @@ void UnoControl::addMouseMotionListener( const Reference< XMouseMotionListener > xPeerWindow->addMouseMotionListener( &maMouseMotionListeners); } -void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) throw(RuntimeException) +void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -950,7 +950,7 @@ void UnoControl::removeMouseMotionListener( const Reference< XMouseMotionListene xPeerWindow->removeMouseMotionListener( &maMouseMotionListeners ); } -void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener ) throw(RuntimeException) +void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -963,7 +963,7 @@ void UnoControl::addPaintListener( const Reference< XPaintListener >& rxListener xPeerWindow->addPaintListener( &maPaintListeners); } -void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListener ) throw(RuntimeException) +void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListener ) throw(RuntimeException, std::exception) { Reference< XWindow > xPeerWindow; { @@ -977,7 +977,7 @@ void UnoControl::removePaintListener( const Reference< XPaintListener >& rxListe } // XView -sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw(RuntimeException) +sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw(RuntimeException, std::exception) { Reference< XView > xView; { @@ -989,18 +989,18 @@ sal_Bool UnoControl::setGraphics( const Reference< XGraphics >& rDevice ) throw( return xView.is() ? xView->setGraphics( rDevice ) : sal_True; } -Reference< XGraphics > UnoControl::getGraphics( ) throw(RuntimeException) +Reference< XGraphics > UnoControl::getGraphics( ) throw(RuntimeException, std::exception) { return mxGraphics; } -awt::Size UnoControl::getSize( ) throw(RuntimeException) +awt::Size UnoControl::getSize( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); return awt::Size( maComponentInfos.nWidth, maComponentInfos.nHeight ); } -void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException) +void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException, std::exception) { Reference< XWindowPeer > xDrawPeer; Reference< XView > xDrawPeerView; @@ -1029,7 +1029,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException) xDrawPeer->dispose(); } -void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException) +void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException, std::exception) { Reference< XView > xView; { @@ -1045,14 +1045,14 @@ void UnoControl::setZoom( float fZoomX, float fZoomY ) throw(RuntimeException) } // XControl -void UnoControl::setContext( const Reference< XInterface >& rxContext ) throw(RuntimeException) +void UnoControl::setContext( const Reference< XInterface >& rxContext ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); mxContext = rxContext; } -Reference< XInterface > UnoControl::getContext( ) throw(RuntimeException) +Reference< XInterface > UnoControl::getContext( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -1084,7 +1084,7 @@ void UnoControl::peerCreated() xWindow->addPaintListener( &maPaintListeners ); } -void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Reference< XWindowPeer >& rParentPeer ) throw(RuntimeException) +void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Reference< XWindowPeer >& rParentPeer ) throw(RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); if ( !mxModel.is() ) @@ -1326,13 +1326,13 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer } } -Reference< XWindowPeer > UnoControl::getPeer() throw(RuntimeException) +Reference< XWindowPeer > UnoControl::getPeer() throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); return mxPeer; } -sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException) +sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -1370,17 +1370,17 @@ sal_Bool UnoControl::setModel( const Reference< XControlModel >& rxModel ) throw return mxModel.is(); } -Reference< XControlModel > UnoControl::getModel( ) throw(RuntimeException) +Reference< XControlModel > UnoControl::getModel( ) throw(RuntimeException, std::exception) { return mxModel; } -Reference< XView > UnoControl::getView( ) throw(RuntimeException) +Reference< XView > UnoControl::getView( ) throw(RuntimeException, std::exception) { return static_cast< XView* >( this ); } -void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) +void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException, std::exception) { ModeChangeEvent aModeChangeEvent; @@ -1415,36 +1415,36 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) maModeChangeListeners.notifyEach( &XModeChangeListener::modeChanged, aModeChangeEvent ); } -sal_Bool UnoControl::isDesignMode( ) throw(RuntimeException) +sal_Bool UnoControl::isDesignMode( ) throw(RuntimeException, std::exception) { return mbDesignMode; } -sal_Bool UnoControl::isTransparent( ) throw(RuntimeException) +sal_Bool UnoControl::isTransparent( ) throw(RuntimeException, std::exception) { return sal_False; } // XServiceInfo -OUString UnoControl::getImplementationName( ) throw(RuntimeException) +OUString UnoControl::getImplementationName( ) throw(RuntimeException, std::exception) { OSL_FAIL( "This method should be overloaded!" ); return OUString(); } -sal_Bool UnoControl::supportsService( const OUString& rServiceName ) throw(RuntimeException) +sal_Bool UnoControl::supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > UnoControl::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > UnoControl::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { OUString sName( "com.sun.star.awt.UnoControl" ); return Sequence< OUString >( &sName, 1 ); } -Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) throw (RuntimeException) +Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) throw (RuntimeException, std::exception) { // creation of the context will certainly require the SolarMutex ... SolarMutexGuard aSolarGuard; @@ -1479,30 +1479,30 @@ Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) th return xCurrentContext; } -void SAL_CALL UnoControl::addModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) throw (RuntimeException) +void SAL_CALL UnoControl::addModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); maModeChangeListeners.addInterface( _rxListener ); } -void SAL_CALL UnoControl::removeModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) throw (RuntimeException) +void SAL_CALL UnoControl::removeModeChangeListener( const Reference< XModeChangeListener >& _rxListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); maModeChangeListeners.removeInterface( _rxListener ); } -void SAL_CALL UnoControl::addModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) throw (NoSupportException, RuntimeException) +void SAL_CALL UnoControl::addModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) throw (NoSupportException, RuntimeException, std::exception) { throw NoSupportException( ); } -void SAL_CALL UnoControl::removeModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) throw (NoSupportException, RuntimeException) +void SAL_CALL UnoControl::removeModeChangeApproveListener( const Reference< XModeChangeApproveListener >& ) throw (NoSupportException, RuntimeException, std::exception) { throw NoSupportException( ); } -awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException) +awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XUnitConversion > xPeerConversion; { @@ -1515,7 +1515,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) +awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XUnitConversion > xPeerConversion; { @@ -1528,7 +1528,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) +awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XUnitConversion > xPeerConversion; { @@ -1541,7 +1541,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) +awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XUnitConversion > xPeerConversion; { @@ -1554,7 +1554,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sa } -uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() throw (RuntimeException) +uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() throw (RuntimeException, std::exception) { Reference< awt::XStyleSettingsSupplier > xPeerSupplier; { diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 86d4224b008b..0ee8541b865a 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -370,21 +370,21 @@ public: : mxControlContainer( xControlContainer ) {} // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw( uno::RuntimeException); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw( uno::RuntimeException, std::exception); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException); + virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException, std::exception); }; void SAL_CALL DialogStepChangedListener::disposing( const lang::EventObject& /*_rSource*/) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { mxControlContainer.clear(); } void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyChangeEvent& evt ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { // evt.PropertyName HAS to be "Step" because we only use the listener for that sal_Int32 nDialogStep = 0; @@ -427,7 +427,7 @@ void UnoControlContainer::ImplActivateTabControllers() } // lang::XComponent -void UnoControlContainer::dispose( ) throw(uno::RuntimeException) +void UnoControlContainer::dispose( ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -460,7 +460,7 @@ void UnoControlContainer::dispose( ) throw(uno::RuntimeException) } // lang::XEventListener -void UnoControlContainer::disposing( const lang::EventObject& _rEvt ) throw(uno::RuntimeException) +void UnoControlContainer::disposing( const lang::EventObject& _rEvt ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -472,14 +472,14 @@ void UnoControlContainer::disposing( const lang::EventObject& _rEvt ) throw(uno: } // container::XContainer -void UnoControlContainer::addContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) throw(uno::RuntimeException) +void UnoControlContainer::addContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maCListeners.addInterface( rxListener ); } -void UnoControlContainer::removeContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) throw(uno::RuntimeException) +void UnoControlContainer::removeContainerListener( const uno::Reference< container::XContainerListener >& rxListener ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -487,7 +487,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) +::sal_Int32 SAL_CALL UnoControlContainer::insert( const uno::Any& _rElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -502,7 +502,7 @@ void UnoControlContainer::removeContainerListener( const uno::Reference< contain return impl_addControl( xControl, NULL ); } -void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -516,7 +516,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier impl_removeControl( _nIdentifier, xControl, NULL ); } -void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -554,7 +554,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) +uno::Any SAL_CALL UnoControlContainer::getByIdentifier( ::sal_Int32 _nIdentifier ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -564,7 +564,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) +uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers( ) throw (uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -574,19 +574,19 @@ uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlContainer::getIdentifiers( ) th } // container::XElementAccess -uno::Type SAL_CALL UnoControlContainer::getElementType( ) throw (uno::RuntimeException) +uno::Type SAL_CALL UnoControlContainer::getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<awt::XControlModel>::get(); } -::sal_Bool SAL_CALL UnoControlContainer::hasElements( ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL UnoControlContainer::hasElements( ) throw (uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return !mpControls->empty(); } // awt::XControlContainer -void UnoControlContainer::setStatusText( const OUString& rStatusText ) throw(uno::RuntimeException) +void UnoControlContainer::setStatusText( const OUString& rStatusText ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -596,7 +596,7 @@ void UnoControlContainer::setStatusText( const OUString& rStatusText ) throw(uno xContainer->setStatusText( rStatusText ); } -uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControls( ) throw(uno::RuntimeException) +uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControls( ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); uno::Sequence< uno::Reference< awt::XControl > > aControls; @@ -604,7 +604,7 @@ uno::Sequence< uno::Reference< awt::XControl > > UnoControlContainer::getControl return aControls; } -uno::Reference< awt::XControl > UnoControlContainer::getControl( const OUString& rName ) throw(uno::RuntimeException) +uno::Reference< awt::XControl > UnoControlContainer::getControl( const OUString& rName ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return mpControls->getControlForName( rName ); @@ -658,7 +658,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) +void UnoControlContainer::addControl( const OUString& rName, const uno::Reference< awt::XControl >& rControl ) throw(uno::RuntimeException, std::exception) { if ( rControl.is() ) impl_addControl( rControl, &rName ); @@ -696,7 +696,7 @@ void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Referen } } -void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& _rxControl ) throw(uno::RuntimeException) +void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& _rxControl ) throw(uno::RuntimeException, std::exception) { if ( _rxControl.is() ) { @@ -711,21 +711,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) +void UnoControlContainer::setTabControllers( const uno::Sequence< uno::Reference< awt::XTabController > >& TabControllers ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maTabControllers = TabControllers; } -uno::Sequence< uno::Reference< awt::XTabController > > UnoControlContainer::getTabControllers( ) throw(uno::RuntimeException) +uno::Sequence< uno::Reference< awt::XTabController > > UnoControlContainer::getTabControllers( ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return maTabControllers; } -void UnoControlContainer::addTabController( const uno::Reference< awt::XTabController >& TabController ) throw(uno::RuntimeException) +void UnoControlContainer::addTabController( const uno::Reference< awt::XTabController >& TabController ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -734,7 +734,7 @@ void UnoControlContainer::addTabController( const uno::Reference< awt::XTabContr maTabControllers[ nCount ] = TabController; } -void UnoControlContainer::removeTabController( const uno::Reference< awt::XTabController >& TabController ) throw(uno::RuntimeException) +void UnoControlContainer::removeTabController( const uno::Reference< awt::XTabController >& TabController ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -751,7 +751,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) +void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxToolkit, const uno::Reference< awt::XWindowPeer >& rParent ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -810,7 +810,7 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT // awt::XWindow -void UnoControlContainer::setVisible( sal_Bool bVisible ) throw(uno::RuntimeException) +void UnoControlContainer::setVisible( sal_Bool bVisible ) throw(uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 6245b5203444..f3a0f171eebf 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -40,7 +40,7 @@ UnoControlContainerModel::UnoControlContainerModel( const ::com::sun::star::uno: ImplRegisterProperty( BASEPROPERTY_TEXT ); } -OUString UnoControlContainerModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlContainerModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlContainerModel ); } @@ -56,7 +56,7 @@ OUString UnoControlContainerModel::getServiceName() throw(::com::sun::star::uno: } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlContainerModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlContainerModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index fd0550664452..26ad1150424b 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -411,7 +411,7 @@ void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rId } // ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any UnoControlModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any UnoControlModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { 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(::com::sun::star::uno::RuntimeException) +uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) { UnoControlModel* pClone = Clone(); uno::Reference< util::XCloneable > xClone( (::cppu::OWeakObject*) pClone, uno::UNO_QUERY ); @@ -437,7 +437,7 @@ uno::Reference< util::XCloneable > UnoControlModel::createClone() throw(::com::s } // ::com::sun::star::lang::XComponent -void UnoControlModel::dispose( ) throw(::com::sun::star::uno::RuntimeException) +void UnoControlModel::dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -451,14 +451,14 @@ void UnoControlModel::dispose( ) throw(::com::sun::star::uno::RuntimeException) OPropertySetHelper::disposing(); } -void UnoControlModel::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) +void UnoControlModel::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); maDisposeListeners.addInterface( rxListener ); } -void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) +void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -467,7 +467,7 @@ void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Referenc // ::com::sun::star::beans::XPropertyState -::com::sun::star::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::beans::PropertyState UnoControlModel::getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -479,7 +479,7 @@ void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Referenc return CompareProperties( aValue, aDefault ) ? ::com::sun::star::beans::PropertyState_DEFAULT_VALUE : ::com::sun::star::beans::PropertyState_DIRECT_VALUE; } -::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > UnoControlModel::getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > UnoControlModel::getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -495,7 +495,7 @@ void UnoControlModel::removeEventListener( const ::com::sun::star::uno::Referenc return aStates; } -void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { Any aDefaultValue; { @@ -505,7 +505,7 @@ void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw setPropertyValue( PropertyName, aDefaultValue ); } -::com::sun::star::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any UnoControlModel::getPropertyDefault( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -514,7 +514,7 @@ void UnoControlModel::setPropertyToDefault( const OUString& PropertyName ) throw // ::com::sun::star::io::XPersistObjec -OUString UnoControlModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -522,7 +522,7 @@ OUString UnoControlModel::getServiceName( ) throw(::com::sun::star::uno::Runtim return OUString(); } -void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -755,7 +755,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: } } -void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -1022,19 +1022,19 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: // ::com::sun::star::lang::XServiceInfo -OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { OSL_FAIL( "This method should be overloaded!" ); return OUString(); } -sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -::com::sun::star::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { OUString sName( "com.sun.star.awt.UnoControlModel" ); return Sequence< OUString >( &sName, 1 ); @@ -1179,7 +1179,7 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & return !CompareProperties( rConvertedValue, rOldValue ); } -void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) +void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) { // Missing: the fake solo properties of the FontDescriptor @@ -1249,7 +1249,7 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, } // ::com::sun::star::beans::XPropertySet -void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nPropId = 0; { @@ -1264,7 +1264,7 @@ void UnoControlModel::setPropertyValue( const OUString& rPropertyName, const ::c } // ::com::sun::star::beans::XFastPropertySet -void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) { @@ -1299,13 +1299,13 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: } // ::com::sun::star::beans::XMultiPropertySet -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { OSL_FAIL( "UnoControlModel::getPropertySetInfo() not possible!" ); return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >(); } -void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void UnoControlModel::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index e69a30030dba..bf4f64ba9b52 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -69,8 +69,8 @@ using ::com::sun::star::uno::Reference; using namespace ::toolkit; #define IMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \ - OUString SAL_CALL ImplName::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return OUString( "stardiv.Toolkit." #ImplName ); } \ - ::com::sun::star::uno::Sequence< OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ + OUString SAL_CALL ImplName::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString( "stardiv.Toolkit." #ImplName ); } \ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \ aNames.realloc( aNames.getLength() + 1 ); \ @@ -126,7 +126,7 @@ UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >& UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit ); } -OUString UnoControlEditModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlEditModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlEditModel ); } @@ -162,7 +162,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -193,7 +193,7 @@ UnoEditControl::UnoEditControl() mbSetMaxTextLenInPeer = false; } -uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aReturn = UnoControlBase::queryAggregation( rType ); if ( !aReturn.hasValue() ) @@ -201,7 +201,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) +uno::Any SAL_CALL UnoEditControl::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { return UnoControlBase::queryInterface( rType ); } @@ -232,7 +232,7 @@ OUString UnoEditControl::GetComponentServiceName() return sName; } -sal_Bool SAL_CALL UnoEditControl::setModel(const uno::Reference< awt::XControlModel >& _rModel) throw ( uno::RuntimeException ) +sal_Bool SAL_CALL UnoEditControl::setModel(const uno::Reference< awt::XControlModel >& _rModel) throw ( uno::RuntimeException, std::exception ) { bool bReturn = UnoControlBase::setModel( _rModel ); mbHasTextProperty = ImplHasProperty( BASEPROPERTY_TEXT ); @@ -260,14 +260,14 @@ void UnoEditControl::ImplSetPeerProperty( const OUString& rPropName, const uno:: UnoControlBase::ImplSetPeerProperty( rPropName, rVal ); } -void UnoEditControl::dispose() throw(uno::RuntimeException) +void UnoEditControl::dispose() throw(uno::RuntimeException, std::exception) { 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) +void UnoEditControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -283,7 +283,7 @@ void UnoEditControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk } } -void UnoEditControl::textChanged(const awt::TextEvent& e) throw(uno::RuntimeException) +void UnoEditControl::textChanged(const awt::TextEvent& e) throw(uno::RuntimeException, std::exception) { uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); @@ -302,17 +302,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) +void UnoEditControl::addTextListener(const uno::Reference< awt::XTextListener > & l) throw(uno::RuntimeException, std::exception) { maTextListeners.addInterface( l ); } -void UnoEditControl::removeTextListener(const uno::Reference< awt::XTextListener > & l) throw(uno::RuntimeException) +void UnoEditControl::removeTextListener(const uno::Reference< awt::XTextListener > & l) throw(uno::RuntimeException, std::exception) { maTextListeners.removeInterface( l ); } -void UnoEditControl::setText( const OUString& aText ) throw(uno::RuntimeException) +void UnoEditControl::setText( const OUString& aText ) throw(uno::RuntimeException, std::exception) { if ( mbHasTextProperty ) { @@ -347,7 +347,7 @@ namespace } } -void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNewText ) throw(uno::RuntimeException) +void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNewText ) throw(uno::RuntimeException, std::exception) { // normalize the selection - OUString::replaceAt has a strange behaviour if the min is greater than the max awt::Selection aSelection( rSel ); @@ -374,7 +374,7 @@ void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNe setSelection( aNewSelection ); } -OUString UnoEditControl::getText() throw(uno::RuntimeException) +OUString UnoEditControl::getText() throw(uno::RuntimeException, std::exception) { OUString aText = maText; @@ -390,7 +390,7 @@ OUString UnoEditControl::getText() throw(uno::RuntimeException) return aText; } -OUString UnoEditControl::getSelectedText( void ) throw(uno::RuntimeException) +OUString UnoEditControl::getSelectedText( void ) throw(uno::RuntimeException, std::exception) { OUString sSelected; uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); @@ -400,14 +400,14 @@ OUString UnoEditControl::getSelectedText( void ) throw(uno::RuntimeException) return sSelected; } -void UnoEditControl::setSelection( const awt::Selection& aSelection ) throw(uno::RuntimeException) +void UnoEditControl::setSelection( const awt::Selection& aSelection ) throw(uno::RuntimeException, std::exception) { uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); if ( xText.is() ) xText->setSelection( aSelection ); } -awt::Selection UnoEditControl::getSelection( void ) throw(uno::RuntimeException) +awt::Selection UnoEditControl::getSelection( void ) throw(uno::RuntimeException, std::exception) { awt::Selection aSel; uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); @@ -416,19 +416,19 @@ awt::Selection UnoEditControl::getSelection( void ) throw(uno::RuntimeException) return aSel; } -sal_Bool UnoEditControl::isEditable( void ) throw(uno::RuntimeException) +sal_Bool UnoEditControl::isEditable( void ) throw(uno::RuntimeException, std::exception) { return !ImplGetPropertyValue_BOOL( BASEPROPERTY_READONLY ); } -void UnoEditControl::setEditable( sal_Bool bEditable ) throw(uno::RuntimeException) +void UnoEditControl::setEditable( sal_Bool bEditable ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= !bEditable; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_READONLY ), aAny, true ); } -sal_Int16 UnoEditControl::getMaxTextLen() throw(uno::RuntimeException) +sal_Int16 UnoEditControl::getMaxTextLen() throw(uno::RuntimeException, std::exception) { sal_Int16 nMaxLen = mnMaxTextLen; @@ -438,7 +438,7 @@ sal_Int16 UnoEditControl::getMaxTextLen() throw(uno::RuntimeException) return nMaxLen; } -void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) throw(uno::RuntimeException) +void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) throw(uno::RuntimeException, std::exception) { if ( ImplHasProperty( BASEPROPERTY_MAXTEXTLEN) ) { @@ -456,37 +456,37 @@ void UnoEditControl::setMaxTextLen( sal_Int16 nLen ) throw(uno::RuntimeException } } -awt::Size UnoEditControl::getMinimumSize( ) throw(uno::RuntimeException) +awt::Size UnoEditControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize(); } -awt::Size UnoEditControl::getPreferredSize( ) throw(uno::RuntimeException) +awt::Size UnoEditControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getPreferredSize(); } -awt::Size UnoEditControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException) +awt::Size UnoEditControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) { return Impl_calcAdjustedSize( rNewSize ); } -awt::Size UnoEditControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(uno::RuntimeException) +awt::Size UnoEditControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize( nCols, nLines ); } -void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(uno::RuntimeException) +void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(uno::RuntimeException, std::exception) { Impl_getColumnsAndLines( nCols, nLines ); } -OUString UnoEditControl::getImplementationName( ) throw(uno::RuntimeException) +OUString UnoEditControl::getImplementationName( ) throw(uno::RuntimeException, std::exception) { return OUString( "stardiv.Toolkit.UnoEditControl" ); } -uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException) +uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNames = UnoControlBase::getSupportedServiceNames( ); aNames.realloc( aNames.getLength() + 1 ); @@ -528,7 +528,7 @@ UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XCompon ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION ); } -OUString UnoControlFileControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlFileControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlFileControlModel ); } @@ -556,7 +556,7 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -602,7 +602,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return UnoControlModel::ImplGetDefaultValue( nPropId ); } -void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) +void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -679,7 +679,7 @@ UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext osl_atomic_decrement( &m_refCount ); } -OUString UnoControlButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlButtonModel ); } @@ -713,7 +713,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -764,7 +764,7 @@ OUString UnoButtonControl::GetComponentServiceName() return aName; } -void UnoButtonControl::dispose() throw(uno::RuntimeException) +void UnoButtonControl::dispose() throw(uno::RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -773,7 +773,7 @@ void UnoButtonControl::dispose() throw(uno::RuntimeException) UnoControlBase::dispose(); } -void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) +void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -787,7 +787,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) +void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -797,7 +797,7 @@ void UnoButtonControl::addActionListener(const uno::Reference< awt::XActionListe } } -void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -807,22 +807,22 @@ void UnoButtonControl::removeActionListener(const uno::Reference< awt::XActionLi maActionListeners.removeInterface( l ); } -void UnoButtonControl::addItemListener(const uno::Reference< awt::XItemListener > & l) throw(uno::RuntimeException) +void UnoButtonControl::addItemListener(const uno::Reference< awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.addInterface( l ); } -void UnoButtonControl::removeItemListener(const uno::Reference< awt::XItemListener > & l) throw(uno::RuntimeException) +void UnoButtonControl::removeItemListener(const uno::Reference< awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.removeInterface( l ); } -void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source ) throw (uno::RuntimeException) +void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) { UnoControlBase::disposing( Source ); } -void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw (uno::RuntimeException) +void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw (uno::RuntimeException, std::exception) { // forward to model uno::Any aAny; @@ -835,14 +835,14 @@ void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) maItemListeners.itemStateChanged( aEvent ); } -void UnoButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException) +void UnoButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= rLabel; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true ); } -void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException) +void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception) { maActionCommand = rCommand; if ( getPeer().is() ) @@ -852,17 +852,17 @@ void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::R } } -awt::Size UnoButtonControl::getMinimumSize( ) throw(uno::RuntimeException) +awt::Size UnoButtonControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize(); } -awt::Size UnoButtonControl::getPreferredSize( ) throw(uno::RuntimeException) +awt::Size UnoButtonControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getPreferredSize(); } -awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException) +awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) { return Impl_calcAdjustedSize( rNewSize ); } @@ -885,7 +885,7 @@ UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl ); } -OUString UnoControlImageControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlImageControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlImageControlModel ); } @@ -913,13 +913,13 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception) +void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception, std::exception) { GraphicControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); @@ -982,7 +982,7 @@ OUString UnoImageControlControl::GetComponentServiceName() return OUString("fixedimage"); } -void UnoImageControlControl::dispose() throw(uno::RuntimeException) +void UnoImageControlControl::dispose() throw(uno::RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -990,22 +990,22 @@ void UnoImageControlControl::dispose() throw(uno::RuntimeException) UnoControl::dispose(); } -sal_Bool UnoImageControlControl::isTransparent() throw(uno::RuntimeException) +sal_Bool UnoImageControlControl::isTransparent() throw(uno::RuntimeException, std::exception) { return sal_True; } -awt::Size UnoImageControlControl::getMinimumSize( ) throw(uno::RuntimeException) +awt::Size UnoImageControlControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize(); } -awt::Size UnoImageControlControl::getPreferredSize( ) throw(uno::RuntimeException) +awt::Size UnoImageControlControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getPreferredSize(); } -awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException) +awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) { return Impl_calcAdjustedSize( rNewSize ); } @@ -1027,7 +1027,7 @@ UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XCompon UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton ); } -OUString UnoControlRadioButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlRadioButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlRadioButtonModel ); } @@ -1058,7 +1058,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -1089,7 +1089,7 @@ OUString UnoRadioButtonControl::GetComponentServiceName() return OUString("radiobutton"); } -void UnoRadioButtonControl::dispose() throw(uno::RuntimeException) +void UnoRadioButtonControl::dispose() throw(uno::RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -1098,12 +1098,12 @@ void UnoRadioButtonControl::dispose() throw(uno::RuntimeException) } -sal_Bool UnoRadioButtonControl::isTransparent() throw(uno::RuntimeException) +sal_Bool UnoRadioButtonControl::isTransparent() throw(uno::RuntimeException, std::exception) { return sal_True; } -void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) +void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -1123,17 +1123,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) +void UnoRadioButtonControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.addInterface( l ); } -void UnoRadioButtonControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException) +void UnoRadioButtonControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.removeInterface( l ); } -void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -1143,7 +1143,7 @@ void UnoRadioButtonControl::addActionListener(const uno::Reference< awt::XAction } } -void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -1153,14 +1153,14 @@ void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XAct maActionListeners.removeInterface( l ); } -void UnoRadioButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException) +void UnoRadioButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= rLabel; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true ); } -void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException) +void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception) { maActionCommand = rCommand; if ( getPeer().is() ) @@ -1170,7 +1170,7 @@ void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(u } } -void UnoRadioButtonControl::setState( sal_Bool bOn ) throw(uno::RuntimeException) +void UnoRadioButtonControl::setState( sal_Bool bOn ) throw(uno::RuntimeException, std::exception) { sal_Int16 nState = bOn ? 1 : 0; uno::Any aAny; @@ -1178,7 +1178,7 @@ void UnoRadioButtonControl::setState( sal_Bool bOn ) throw(uno::RuntimeException ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, true ); } -sal_Bool UnoRadioButtonControl::getState() throw(uno::RuntimeException) +sal_Bool UnoRadioButtonControl::getState() throw(uno::RuntimeException, std::exception) { sal_Int16 nState = 0; uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ) ); @@ -1186,7 +1186,7 @@ sal_Bool UnoRadioButtonControl::getState() throw(uno::RuntimeException) return nState ? sal_True : sal_False; } -void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException) +void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= (sal_Int16)rEvent.Selected; @@ -1219,17 +1219,17 @@ void UnoRadioButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) thr // to be inconsistent with. } -awt::Size UnoRadioButtonControl::getMinimumSize( ) throw(uno::RuntimeException) +awt::Size UnoRadioButtonControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize(); } -awt::Size UnoRadioButtonControl::getPreferredSize( ) throw(uno::RuntimeException) +awt::Size UnoRadioButtonControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getPreferredSize(); } -awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException) +awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) { return Impl_calcAdjustedSize( rNewSize ); } @@ -1251,7 +1251,7 @@ UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentCon UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox ); } -OUString UnoControlCheckBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlCheckBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlCheckBoxModel ); } @@ -1282,7 +1282,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -1312,7 +1312,7 @@ OUString UnoCheckBoxControl::GetComponentServiceName() return OUString("checkbox"); } -void UnoCheckBoxControl::dispose() throw(uno::RuntimeException) +void UnoCheckBoxControl::dispose() throw(uno::RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -1320,12 +1320,12 @@ void UnoCheckBoxControl::dispose() throw(uno::RuntimeException) UnoControlBase::dispose(); } -sal_Bool UnoCheckBoxControl::isTransparent() throw(uno::RuntimeException) +sal_Bool UnoCheckBoxControl::isTransparent() throw(uno::RuntimeException, std::exception) { return sal_True; } -void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) +void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -1338,17 +1338,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) +void UnoCheckBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.addInterface( l ); } -void UnoCheckBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException) +void UnoCheckBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.removeInterface( l ); } -void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -1358,7 +1358,7 @@ void UnoCheckBoxControl::addActionListener(const uno::Reference< awt::XActionLis } } -void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -1368,7 +1368,7 @@ void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XAction maActionListeners.removeInterface( l ); } -void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException) +void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException, std::exception) { maActionCommand = rCommand; if ( getPeer().is() ) @@ -1379,21 +1379,21 @@ void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) throw(uno: } -void UnoCheckBoxControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException) +void UnoCheckBoxControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= rLabel; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true ); } -void UnoCheckBoxControl::setState( short n ) throw(uno::RuntimeException) +void UnoCheckBoxControl::setState( short n ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= (sal_Int16)n; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), aAny, true ); } -short UnoCheckBoxControl::getState() throw(uno::RuntimeException) +short UnoCheckBoxControl::getState() throw(uno::RuntimeException, std::exception) { short nState = 0; uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ) ); @@ -1401,14 +1401,14 @@ short UnoCheckBoxControl::getState() throw(uno::RuntimeException) return nState; } -void UnoCheckBoxControl::enableTriState( sal_Bool b ) throw(uno::RuntimeException) +void UnoCheckBoxControl::enableTriState( sal_Bool b ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= b; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TRISTATE ), aAny, true ); } -void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException) +void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= (sal_Int16)rEvent.Selected; @@ -1418,17 +1418,17 @@ void UnoCheckBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw( maItemListeners.itemStateChanged( rEvent ); } -awt::Size UnoCheckBoxControl::getMinimumSize( ) throw(uno::RuntimeException) +awt::Size UnoCheckBoxControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize(); } -awt::Size UnoCheckBoxControl::getPreferredSize( ) throw(uno::RuntimeException) +awt::Size UnoCheckBoxControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getPreferredSize(); } -awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException) +awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) { return Impl_calcAdjustedSize( rNewSize ); } @@ -1450,7 +1450,7 @@ UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink ); } -OUString UnoControlFixedHyperlinkModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlFixedHyperlinkModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlFixedHyperlinkModel ); } @@ -1491,7 +1491,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlFixedHyperlinkModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -1522,7 +1522,7 @@ OUString UnoFixedHyperlinkControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XFixedHyperlink* >(this)), @@ -1537,43 +1537,43 @@ IMPL_XTYPEPROVIDER_START( UnoFixedHyperlinkControl ) UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END -sal_Bool UnoFixedHyperlinkControl::isTransparent() throw(uno::RuntimeException) +sal_Bool UnoFixedHyperlinkControl::isTransparent() throw(uno::RuntimeException, std::exception) { return sal_True; } -void UnoFixedHyperlinkControl::setText( const OUString& Text ) throw(uno::RuntimeException) +void UnoFixedHyperlinkControl::setText( const OUString& Text ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Text; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true ); } -OUString UnoFixedHyperlinkControl::getText() throw(uno::RuntimeException) +OUString UnoFixedHyperlinkControl::getText() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL ); } -void UnoFixedHyperlinkControl::setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException) +void UnoFixedHyperlinkControl::setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= URL; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_URL ), aAny, true ); } -OUString UnoFixedHyperlinkControl::getURL( ) throw(::com::sun::star::uno::RuntimeException) +OUString UnoFixedHyperlinkControl::getURL( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ImplGetPropertyValue_UString( BASEPROPERTY_URL ); } -void UnoFixedHyperlinkControl::setAlignment( short nAlign ) throw(uno::RuntimeException) +void UnoFixedHyperlinkControl::setAlignment( short nAlign ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= (sal_Int16)nAlign; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), aAny, true ); } -short UnoFixedHyperlinkControl::getAlignment() throw(uno::RuntimeException) +short UnoFixedHyperlinkControl::getAlignment() throw(uno::RuntimeException, std::exception) { short nAlign = 0; if ( mxModel.is() ) @@ -1584,22 +1584,22 @@ short UnoFixedHyperlinkControl::getAlignment() throw(uno::RuntimeException) return nAlign; } -awt::Size UnoFixedHyperlinkControl::getMinimumSize( ) throw(uno::RuntimeException) +awt::Size UnoFixedHyperlinkControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize(); } -awt::Size UnoFixedHyperlinkControl::getPreferredSize( ) throw(uno::RuntimeException) +awt::Size UnoFixedHyperlinkControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getPreferredSize(); } -awt::Size UnoFixedHyperlinkControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException) +awt::Size UnoFixedHyperlinkControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) { return Impl_calcAdjustedSize( rNewSize ); } -void UnoFixedHyperlinkControl::dispose() throw(uno::RuntimeException) +void UnoFixedHyperlinkControl::dispose() throw(uno::RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -1607,7 +1607,7 @@ void UnoFixedHyperlinkControl::dispose() throw(uno::RuntimeException) UnoControlBase::dispose(); } -void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) +void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -1616,7 +1616,7 @@ void UnoFixedHyperlinkControl::createPeer( const uno::Reference< awt::XToolkit > xFixedHyperlink->addActionListener( &maActionListeners ); } -void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -1626,7 +1626,7 @@ void UnoFixedHyperlinkControl::addActionListener(const uno::Reference< awt::XAct } } -void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoFixedHyperlinkControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -1653,7 +1653,7 @@ UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedText ); } -OUString UnoControlFixedTextModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlFixedTextModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlFixedTextModel ); } @@ -1688,7 +1688,7 @@ uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -1718,7 +1718,7 @@ OUString UnoFixedTextControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XFixedText* >(this)), @@ -1733,31 +1733,31 @@ IMPL_XTYPEPROVIDER_START( UnoFixedTextControl ) UnoControlBase::getTypes() IMPL_XTYPEPROVIDER_END -sal_Bool UnoFixedTextControl::isTransparent() throw(uno::RuntimeException) +sal_Bool UnoFixedTextControl::isTransparent() throw(uno::RuntimeException, std::exception) { return sal_True; } -void UnoFixedTextControl::setText( const OUString& Text ) throw(uno::RuntimeException) +void UnoFixedTextControl::setText( const OUString& Text ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Text; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, true ); } -OUString UnoFixedTextControl::getText() throw(uno::RuntimeException) +OUString UnoFixedTextControl::getText() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL ); } -void UnoFixedTextControl::setAlignment( short nAlign ) throw(uno::RuntimeException) +void UnoFixedTextControl::setAlignment( short nAlign ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= (sal_Int16)nAlign; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), aAny, true ); } -short UnoFixedTextControl::getAlignment() throw(uno::RuntimeException) +short UnoFixedTextControl::getAlignment() throw(uno::RuntimeException, std::exception) { short nAlign = 0; if ( mxModel.is() ) @@ -1768,17 +1768,17 @@ short UnoFixedTextControl::getAlignment() throw(uno::RuntimeException) return nAlign; } -awt::Size UnoFixedTextControl::getMinimumSize( ) throw(uno::RuntimeException) +awt::Size UnoFixedTextControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize(); } -awt::Size UnoFixedTextControl::getPreferredSize( ) throw(uno::RuntimeException) +awt::Size UnoFixedTextControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getPreferredSize(); } -awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException) +awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) { return Impl_calcAdjustedSize( rNewSize ); } @@ -1809,7 +1809,7 @@ UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XComponentCon ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE ); } -OUString UnoControlGroupBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlGroupBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlGroupBoxModel ); } @@ -1837,7 +1837,7 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -1866,7 +1866,7 @@ OUString UnoGroupBoxControl::GetComponentServiceName() return OUString("groupbox"); } -sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException) +sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException, std::exception) { return sal_True; } @@ -2008,7 +2008,7 @@ UnoControlListBoxModel::~UnoControlListBoxModel() } IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName2_UnoControlListBoxModel ) -OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlListBoxModel ); } @@ -2039,7 +2039,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -2058,7 +2058,7 @@ namespace } -void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception) +void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception, std::exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -2111,14 +2111,14 @@ void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCo } -::sal_Int32 SAL_CALL UnoControlListBoxModel::getItemCount() throw (RuntimeException) +::sal_Int32 SAL_CALL UnoControlListBoxModel::getItemCount() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); return m_pData->getItemCount(); } -void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException) +void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2131,7 +2131,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) +void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2143,7 +2143,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) +void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2155,7 +2155,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, } -void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) +void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2166,7 +2166,7 @@ void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) thro } -void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2177,7 +2177,7 @@ void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (::com::sun::star } -void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException) +void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2189,7 +2189,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) +void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2201,7 +2201,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) +void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); // SYNCHRONIZED -----> @@ -2214,7 +2214,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) +void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, const Any& i_rDataValue ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); ListItem& rItem( m_pData->getItem( i_nPosition ) ); @@ -2222,7 +2222,7 @@ void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, cons } -OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); const ListItem& rItem( m_pData->getItem( i_nPosition ) ); @@ -2230,7 +2230,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) } -OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); const ListItem& rItem( m_pData->getItem( i_nPosition ) ); @@ -2238,7 +2238,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) +beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); const ListItem& rItem( m_pData->getItem( i_nPosition ) ); @@ -2246,7 +2246,7 @@ beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAn } -Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) +Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); const ListItem& rItem( m_pData->getItem( i_nPosition ) ); @@ -2254,21 +2254,21 @@ Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) thro } -Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems( ) throw (RuntimeException) +Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( GetMutex() ); return m_pData->getAllItems(); } -void SAL_CALL UnoControlListBoxModel::addItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException) +void SAL_CALL UnoControlListBoxModel::addItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException, std::exception) { if ( i_Listener.is() ) m_aItemListListeners.addInterface( i_Listener ); } -void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException) +void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException, std::exception) { if ( i_Listener.is() ) m_aItemListListeners.removeInterface( i_Listener ); @@ -2451,7 +2451,7 @@ OUString UnoListBoxControl::GetComponentServiceName() } IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox ) -void UnoListBoxControl::dispose() throw(uno::RuntimeException) +void UnoListBoxControl::dispose() throw(uno::RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -2502,7 +2502,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) +void UnoListBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -2513,7 +2513,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) +void UnoListBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -2523,7 +2523,7 @@ void UnoListBoxControl::addActionListener(const uno::Reference< awt::XActionList } } -void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -2533,24 +2533,24 @@ void UnoListBoxControl::removeActionListener(const uno::Reference< awt::XActionL maActionListeners.removeInterface( l ); } -void UnoListBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException) +void UnoListBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.addInterface( l ); } -void UnoListBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException) +void UnoListBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.removeInterface( l ); } -void UnoListBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException) +void UnoListBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString> aSeq( 1 ); aSeq.getArray()[0] = aItem; addItems( aSeq, nPos ); } -void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException) +void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -2584,7 +2584,7 @@ void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_In ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, true ); } -void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException) +void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException, std::exception) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -2616,7 +2616,7 @@ void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(un } } -sal_Int16 UnoListBoxControl::getItemCount() throw(uno::RuntimeException) +sal_Int16 UnoListBoxControl::getItemCount() throw(uno::RuntimeException, std::exception) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -2624,7 +2624,7 @@ sal_Int16 UnoListBoxControl::getItemCount() throw(uno::RuntimeException) return (sal_Int16)aSeq.getLength(); } -OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException) +OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) { OUString aItem; uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); @@ -2635,7 +2635,7 @@ OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeExceptio return aItem; } -uno::Sequence< OUString> UnoListBoxControl::getItems() throw(uno::RuntimeException) +uno::Sequence< OUString> UnoListBoxControl::getItems() throw(uno::RuntimeException, std::exception) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -2643,7 +2643,7 @@ uno::Sequence< OUString> UnoListBoxControl::getItems() throw(uno::RuntimeExcepti return aSeq; } -sal_Int16 UnoListBoxControl::getSelectedItemPos() throw(uno::RuntimeException) +sal_Int16 UnoListBoxControl::getSelectedItemPos() throw(uno::RuntimeException, std::exception) { sal_Int16 n = -1; if ( getPeer().is() ) @@ -2654,7 +2654,7 @@ sal_Int16 UnoListBoxControl::getSelectedItemPos() throw(uno::RuntimeException) return n; } -uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::RuntimeException) +uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::RuntimeException, std::exception) { uno::Sequence<sal_Int16> aSeq; if ( getPeer().is() ) @@ -2665,7 +2665,7 @@ uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::Run return aSeq; } -OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException) +OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException, std::exception) { OUString aItem; if ( getPeer().is() ) @@ -2676,7 +2676,7 @@ OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException) return aItem; } -uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() throw(uno::RuntimeException) +uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString> aSeq; if ( getPeer().is() ) @@ -2687,7 +2687,7 @@ uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() throw(uno::Runtim return aSeq; } -void UnoListBoxControl::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(uno::RuntimeException) +void UnoListBoxControl::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception) { if ( getPeer().is() ) { @@ -2697,7 +2697,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) +void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception) { if ( getPeer().is() ) { @@ -2707,7 +2707,7 @@ void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositio ImplUpdateSelectedItemsProperty(); } -void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) throw(uno::RuntimeException) +void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) throw(uno::RuntimeException, std::exception) { if ( getPeer().is() ) { @@ -2717,7 +2717,7 @@ void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) th ImplUpdateSelectedItemsProperty(); } -void UnoListBoxControl::makeVisible( sal_Int16 nEntry ) throw(uno::RuntimeException) +void UnoListBoxControl::makeVisible( sal_Int16 nEntry ) throw(uno::RuntimeException, std::exception) { if ( getPeer().is() ) { @@ -2726,31 +2726,31 @@ void UnoListBoxControl::makeVisible( sal_Int16 nEntry ) throw(uno::RuntimeExcept } } -void UnoListBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::RuntimeException) +void UnoListBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= (sal_Int16)nLines; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), aAny, true ); } -sal_Int16 UnoListBoxControl::getDropDownLineCount() throw(uno::RuntimeException) +sal_Int16 UnoListBoxControl::getDropDownLineCount() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT ); } -sal_Bool UnoListBoxControl::isMutipleMode() throw(uno::RuntimeException) +sal_Bool UnoListBoxControl::isMutipleMode() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_BOOL( BASEPROPERTY_MULTISELECTION ); } -void UnoListBoxControl::setMultipleMode( sal_Bool bMulti ) throw(uno::RuntimeException) +void UnoListBoxControl::setMultipleMode( sal_Bool bMulti ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= bMulti; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTISELECTION ), aAny, true ); } -void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException) +void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception) { ImplUpdateSelectedItemsProperty(); if ( maItemListeners.getLength() ) @@ -2772,32 +2772,32 @@ void UnoListBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(u } } -awt::Size UnoListBoxControl::getMinimumSize( ) throw(uno::RuntimeException) +awt::Size UnoListBoxControl::getMinimumSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize(); } -awt::Size UnoListBoxControl::getPreferredSize( ) throw(uno::RuntimeException) +awt::Size UnoListBoxControl::getPreferredSize( ) throw(uno::RuntimeException, std::exception) { return Impl_getPreferredSize(); } -awt::Size UnoListBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException) +awt::Size UnoListBoxControl::calcAdjustedSize( const awt::Size& rNewSize ) throw(uno::RuntimeException, std::exception) { return Impl_calcAdjustedSize( rNewSize ); } -awt::Size UnoListBoxControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(uno::RuntimeException) +awt::Size UnoListBoxControl::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(uno::RuntimeException, std::exception) { return Impl_getMinimumSize( nCols, nLines ); } -void UnoListBoxControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(uno::RuntimeException) +void UnoListBoxControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(uno::RuntimeException, std::exception) { Impl_getColumnsAndLines( nCols, nLines ); } -sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) throw ( uno::RuntimeException ) +sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -2817,7 +2817,7 @@ sal_Bool SAL_CALL UnoListBoxControl::setModel( const uno::Reference< awt::XContr return sal_True; } -void SAL_CALL UnoListBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException) +void SAL_CALL UnoListBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemInserted: invalid peer!" ); @@ -2825,7 +2825,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) +void SAL_CALL UnoListBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemRemoved: invalid peer!" ); @@ -2833,7 +2833,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) +void SAL_CALL UnoListBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::listItemModified: invalid peer!" ); @@ -2841,7 +2841,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) +void SAL_CALL UnoListBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::allItemsRemoved: invalid peer!" ); @@ -2849,7 +2849,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) +void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoListBoxControl::itemListChanged: invalid peer!" ); @@ -2876,7 +2876,7 @@ UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentCon IMPL_SERVICEINFO_DERIVED( UnoControlComboBoxModel, UnoControlModel, szServiceName2_UnoControlComboBoxModel ) -uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -2894,11 +2894,11 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe } -OUString UnoControlComboBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlComboBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlComboBoxModel ); } -void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception) +void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception, std::exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -2967,7 +2967,7 @@ OUString UnoComboBoxControl::GetComponentServiceName() return OUString("combobox"); } -void UnoComboBoxControl::dispose() throw(uno::RuntimeException) +void UnoComboBoxControl::dispose() throw(uno::RuntimeException, std::exception) { lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; @@ -2975,7 +2975,7 @@ void UnoComboBoxControl::dispose() throw(uno::RuntimeException) maItemListeners.disposeAndClear( aEvt ); UnoControl::dispose(); } -uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XComboBox* >(this)) ); @@ -3019,7 +3019,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) +void UnoComboBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoEditControl::createPeer( rxToolkit, rParentPeer ); @@ -3030,7 +3030,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) +void UnoComboBoxControl::addActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { maActionListeners.addInterface( l ); if( getPeer().is() && maActionListeners.getLength() == 1 ) @@ -3040,7 +3040,7 @@ void UnoComboBoxControl::addActionListener(const uno::Reference< awt::XActionLis } } -void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException) +void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XActionListener > & l) throw(uno::RuntimeException, std::exception) { if( getPeer().is() && maActionListeners.getLength() == 1 ) { @@ -3050,7 +3050,7 @@ void UnoComboBoxControl::removeActionListener(const uno::Reference< awt::XAction maActionListeners.removeInterface( l ); } -void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException) +void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { maItemListeners.addInterface( l ); if( getPeer().is() && maItemListeners.getLength() == 1 ) @@ -3060,7 +3060,7 @@ void UnoComboBoxControl::addItemListener(const uno::Reference < awt::XItemListen } } -void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException) +void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException, std::exception) { if( getPeer().is() && maItemListeners.getLength() == 1 ) { @@ -3070,7 +3070,7 @@ void UnoComboBoxControl::removeItemListener(const uno::Reference < awt::XItemLis } maItemListeners.removeInterface( l ); } -void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException) +void UnoComboBoxControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw(uno::RuntimeException, std::exception) { if ( maItemListeners.getLength() ) { @@ -3090,7 +3090,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 ) +sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XControlModel >& i_rModel ) throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -3110,7 +3110,7 @@ sal_Bool SAL_CALL UnoComboBoxControl::setModel( const uno::Reference< awt::XCont return sal_True; } -void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException) +void SAL_CALL UnoComboBoxControl::listItemInserted( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemInserted: invalid peer!" ); @@ -3118,7 +3118,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) +void SAL_CALL UnoComboBoxControl::listItemRemoved( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemRemoved: invalid peer!" ); @@ -3126,7 +3126,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) +void SAL_CALL UnoComboBoxControl::listItemModified( const awt::ItemListEvent& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::listItemModified: invalid peer!" ); @@ -3134,7 +3134,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) +void SAL_CALL UnoComboBoxControl::allItemsRemoved( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::allItemsRemoved: invalid peer!" ); @@ -3142,7 +3142,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) +void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rEvent ) throw (uno::RuntimeException, std::exception) { const Reference< XItemListListener > xPeerListener( getPeer(), UNO_QUERY ); OSL_ENSURE( xPeerListener.is() || !getPeer().is(), "UnoComboBoxControl::itemListChanged: invalid peer!" ); @@ -3150,14 +3150,14 @@ 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) +void UnoComboBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString> aSeq( 1 ); aSeq.getArray()[0] = aItem; addItems( aSeq, nPos ); } -void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException) +void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -3191,7 +3191,7 @@ void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_I ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ), aAny, true ); } -void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException) +void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException, std::exception) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -3223,7 +3223,7 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(u } } -sal_Int16 UnoComboBoxControl::getItemCount() throw(uno::RuntimeException) +sal_Int16 UnoComboBoxControl::getItemCount() throw(uno::RuntimeException, std::exception) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -3231,7 +3231,7 @@ sal_Int16 UnoComboBoxControl::getItemCount() throw(uno::RuntimeException) return (sal_Int16)aSeq.getLength(); } -OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException) +OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException, std::exception) { OUString aItem; uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); @@ -3242,7 +3242,7 @@ OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeExcepti return aItem; } -uno::Sequence< OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeException) +uno::Sequence< OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeException, std::exception) { uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) ); uno::Sequence< OUString> aSeq; @@ -3250,14 +3250,14 @@ uno::Sequence< OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeExcept return aSeq; } -void UnoComboBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::RuntimeException) +void UnoComboBoxControl::setDropDownLineCount( sal_Int16 nLines ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nLines; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LINECOUNT ), aAny, true ); } -sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException) +sal_Int16 UnoComboBoxControl::getDropDownLineCount() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_INT16( BASEPROPERTY_LINECOUNT ); } @@ -3281,7 +3281,7 @@ UnoSpinFieldControl::UnoSpinFieldControl() } // uno::XInterface -uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XSpinField* >(this)) ); @@ -3294,7 +3294,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) +void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoEditControl::createPeer( rxToolkit, rParentPeer ); @@ -3305,7 +3305,7 @@ void UnoSpinFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx } // ::com::sun::star::awt::XSpinField -void UnoSpinFieldControl::addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException) +void UnoSpinFieldControl::addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) { maSpinListeners.addInterface( l ); if( getPeer().is() && maSpinListeners.getLength() == 1 ) @@ -3315,7 +3315,7 @@ void UnoSpinFieldControl::addSpinListener( const ::com::sun::star::uno::Referenc } } -void UnoSpinFieldControl::removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException) +void UnoSpinFieldControl::removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if( getPeer().is() && maSpinListeners.getLength() == 1 ) { @@ -3325,35 +3325,35 @@ void UnoSpinFieldControl::removeSpinListener( const ::com::sun::star::uno::Refer maSpinListeners.removeInterface( l ); } -void UnoSpinFieldControl::up() throw(::com::sun::star::uno::RuntimeException) +void UnoSpinFieldControl::up() throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->up(); } -void UnoSpinFieldControl::down() throw(::com::sun::star::uno::RuntimeException) +void UnoSpinFieldControl::down() throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->down(); } -void UnoSpinFieldControl::first() throw(::com::sun::star::uno::RuntimeException) +void UnoSpinFieldControl::first() throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->first(); } -void UnoSpinFieldControl::last() throw(::com::sun::star::uno::RuntimeException) +void UnoSpinFieldControl::last() throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference < awt::XSpinField > xField( getPeer(), uno::UNO_QUERY ); if ( xField.is() ) xField->last(); } -void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException) +void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException, std::exception) { mbRepeat = bRepeat; @@ -3371,7 +3371,7 @@ UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField ); } -OUString UnoControlDateFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlDateFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlDateFieldModel ); } @@ -3400,7 +3400,7 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -3431,7 +3431,7 @@ OUString UnoDateFieldControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XDateField* >(this)) ); @@ -3444,7 +3444,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) +void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer ); @@ -3456,7 +3456,7 @@ void UnoDateFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx } -void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException) +void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception) { uno::Reference< awt::XVclWindowPeer > xPeer( getPeer(), uno::UNO_QUERY ); @@ -3497,43 +3497,43 @@ void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt GetTextListeners().textChanged( e ); } -void UnoDateFieldControl::setDate( const util::Date& Date ) throw(uno::RuntimeException) +void UnoDateFieldControl::setDate( const util::Date& Date ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Date; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATE ), aAny, true ); } -util::Date UnoDateFieldControl::getDate() throw(uno::RuntimeException) +util::Date UnoDateFieldControl::getDate() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_Date( BASEPROPERTY_DATE ); } -void UnoDateFieldControl::setMin( const util::Date& Date ) throw(uno::RuntimeException) +void UnoDateFieldControl::setMin( const util::Date& Date ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Date; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMIN ), aAny, true ); } -util::Date UnoDateFieldControl::getMin() throw(uno::RuntimeException) +util::Date UnoDateFieldControl::getMin() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_Date( BASEPROPERTY_DATEMIN ); } -void UnoDateFieldControl::setMax( const util::Date& Date ) throw(uno::RuntimeException) +void UnoDateFieldControl::setMax( const util::Date& Date ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Date; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DATEMAX ), aAny, true ); } -util::Date UnoDateFieldControl::getMax() throw(uno::RuntimeException) +util::Date UnoDateFieldControl::getMax() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_Date( BASEPROPERTY_DATEMAX ); } -void UnoDateFieldControl::setFirst( const util::Date& Date ) throw(uno::RuntimeException) +void UnoDateFieldControl::setFirst( const util::Date& Date ) throw(uno::RuntimeException, std::exception) { mnFirst = Date; if ( getPeer().is() ) @@ -3543,12 +3543,12 @@ void UnoDateFieldControl::setFirst( const util::Date& Date ) throw(uno::RuntimeE } } -util::Date UnoDateFieldControl::getFirst() throw(uno::RuntimeException) +util::Date UnoDateFieldControl::getFirst() throw(uno::RuntimeException, std::exception) { return mnFirst; } -void UnoDateFieldControl::setLast( const util::Date& Date ) throw(uno::RuntimeException) +void UnoDateFieldControl::setLast( const util::Date& Date ) throw(uno::RuntimeException, std::exception) { mnLast = Date; if ( getPeer().is() ) @@ -3558,12 +3558,12 @@ void UnoDateFieldControl::setLast( const util::Date& Date ) throw(uno::RuntimeEx } } -util::Date UnoDateFieldControl::getLast() throw(uno::RuntimeException) +util::Date UnoDateFieldControl::getLast() throw(uno::RuntimeException, std::exception) { return mnLast; } -void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeException) +void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeException, std::exception) { mbLongFormat = bLong ? TRISTATE_TRUE : TRISTATE_FALSE; if ( getPeer().is() ) @@ -3573,12 +3573,12 @@ void UnoDateFieldControl::setLongFormat( sal_Bool bLong ) throw(uno::RuntimeExce } } -sal_Bool UnoDateFieldControl::isLongFormat() throw(uno::RuntimeException) +sal_Bool UnoDateFieldControl::isLongFormat() throw(uno::RuntimeException, std::exception) { return mbLongFormat == TRISTATE_TRUE; } -void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException) +void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException, std::exception) { if ( getPeer().is() ) { @@ -3587,7 +3587,7 @@ void UnoDateFieldControl::setEmpty() throw(uno::RuntimeException) } } -sal_Bool UnoDateFieldControl::isEmpty() throw(uno::RuntimeException) +sal_Bool UnoDateFieldControl::isEmpty() throw(uno::RuntimeException, std::exception) { bool bEmpty = false; if ( getPeer().is() ) @@ -3598,14 +3598,14 @@ sal_Bool UnoDateFieldControl::isEmpty() throw(uno::RuntimeException) return bEmpty; } -void UnoDateFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException) +void UnoDateFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= bStrict; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true ); } -sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException) +sal_Bool UnoDateFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } @@ -3627,7 +3627,7 @@ UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentC UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField ); } -OUString UnoControlTimeFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlTimeFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlTimeFieldModel ); } @@ -3656,7 +3656,7 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -3686,7 +3686,7 @@ OUString UnoTimeFieldControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XTimeField* >(this)) ); @@ -3699,7 +3699,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) +void UnoTimeFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer ); @@ -3708,7 +3708,7 @@ void UnoTimeFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rx xField->setLast( mnLast ); } -void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException) +void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception) { // also change the text property (#i25106#) uno::Reference< awt::XVclWindowPeer > xPeer( getPeer(), uno::UNO_QUERY ); @@ -3727,43 +3727,43 @@ void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt GetTextListeners().textChanged( e ); } -void UnoTimeFieldControl::setTime( const util::Time& Time ) throw(uno::RuntimeException) +void UnoTimeFieldControl::setTime( const util::Time& Time ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Time; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIME ), aAny, true ); } -util::Time UnoTimeFieldControl::getTime() throw(uno::RuntimeException) +util::Time UnoTimeFieldControl::getTime() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_Time( BASEPROPERTY_TIME ); } -void UnoTimeFieldControl::setMin( const util::Time& Time ) throw(uno::RuntimeException) +void UnoTimeFieldControl::setMin( const util::Time& Time ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Time; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMIN ), aAny, true ); } -util::Time UnoTimeFieldControl::getMin() throw(uno::RuntimeException) +util::Time UnoTimeFieldControl::getMin() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_Time( BASEPROPERTY_TIMEMIN ); } -void UnoTimeFieldControl::setMax( const util::Time& Time ) throw(uno::RuntimeException) +void UnoTimeFieldControl::setMax( const util::Time& Time ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Time; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_TIMEMAX ), aAny, true ); } -util::Time UnoTimeFieldControl::getMax() throw(uno::RuntimeException) +util::Time UnoTimeFieldControl::getMax() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_Time( BASEPROPERTY_TIMEMAX ); } -void UnoTimeFieldControl::setFirst( const util::Time& Time ) throw(uno::RuntimeException) +void UnoTimeFieldControl::setFirst( const util::Time& Time ) throw(uno::RuntimeException, std::exception) { mnFirst = Time; if ( getPeer().is() ) @@ -3773,12 +3773,12 @@ void UnoTimeFieldControl::setFirst( const util::Time& Time ) throw(uno::RuntimeE } } -util::Time UnoTimeFieldControl::getFirst() throw(uno::RuntimeException) +util::Time UnoTimeFieldControl::getFirst() throw(uno::RuntimeException, std::exception) { return mnFirst; } -void UnoTimeFieldControl::setLast( const util::Time& Time ) throw(uno::RuntimeException) +void UnoTimeFieldControl::setLast( const util::Time& Time ) throw(uno::RuntimeException, std::exception) { mnLast = Time; if ( getPeer().is() ) @@ -3788,12 +3788,12 @@ void UnoTimeFieldControl::setLast( const util::Time& Time ) throw(uno::RuntimeEx } } -util::Time UnoTimeFieldControl::getLast() throw(uno::RuntimeException) +util::Time UnoTimeFieldControl::getLast() throw(uno::RuntimeException, std::exception) { return mnLast; } -void UnoTimeFieldControl::setEmpty() throw(uno::RuntimeException) +void UnoTimeFieldControl::setEmpty() throw(uno::RuntimeException, std::exception) { if ( getPeer().is() ) { @@ -3802,7 +3802,7 @@ void UnoTimeFieldControl::setEmpty() throw(uno::RuntimeException) } } -sal_Bool UnoTimeFieldControl::isEmpty() throw(uno::RuntimeException) +sal_Bool UnoTimeFieldControl::isEmpty() throw(uno::RuntimeException, std::exception) { bool bEmpty = false; if ( getPeer().is() ) @@ -3813,14 +3813,14 @@ sal_Bool UnoTimeFieldControl::isEmpty() throw(uno::RuntimeException) return bEmpty; } -void UnoTimeFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException) +void UnoTimeFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= bStrict; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true ); } -sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException) +sal_Bool UnoTimeFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } @@ -3842,7 +3842,7 @@ UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField ); } -OUString UnoControlNumericFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlNumericFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlNumericFieldModel ); } @@ -3871,7 +3871,7 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -3901,7 +3901,7 @@ OUString UnoNumericFieldControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XNumericField* >(this)) ); @@ -3914,7 +3914,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) +void UnoNumericFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer ); @@ -3924,7 +3924,7 @@ void UnoNumericFieldControl::createPeer( const uno::Reference< awt::XToolkit > & } -void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException) +void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception) { uno::Reference < awt::XNumericField > xField( getPeer(), uno::UNO_QUERY ); uno::Any aAny; @@ -3935,43 +3935,43 @@ void UnoNumericFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::R GetTextListeners().textChanged( e ); } -void UnoNumericFieldControl::setValue( double Value ) throw(uno::RuntimeException) +void UnoNumericFieldControl::setValue( double Value ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Value; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, true ); } -double UnoNumericFieldControl::getValue() throw(uno::RuntimeException) +double UnoNumericFieldControl::getValue() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUE_DOUBLE ); } -void UnoNumericFieldControl::setMin( double Value ) throw(uno::RuntimeException) +void UnoNumericFieldControl::setMin( double Value ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Value; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), aAny, true ); } -double UnoNumericFieldControl::getMin() throw(uno::RuntimeException) +double UnoNumericFieldControl::getMin() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMIN_DOUBLE ); } -void UnoNumericFieldControl::setMax( double Value ) throw(uno::RuntimeException) +void UnoNumericFieldControl::setMax( double Value ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Value; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), aAny, true ); } -double UnoNumericFieldControl::getMax() throw(uno::RuntimeException) +double UnoNumericFieldControl::getMax() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMAX_DOUBLE ); } -void UnoNumericFieldControl::setFirst( double Value ) throw(uno::RuntimeException) +void UnoNumericFieldControl::setFirst( double Value ) throw(uno::RuntimeException, std::exception) { mnFirst = Value; if ( getPeer().is() ) @@ -3981,12 +3981,12 @@ void UnoNumericFieldControl::setFirst( double Value ) throw(uno::RuntimeExceptio } } -double UnoNumericFieldControl::getFirst() throw(uno::RuntimeException) +double UnoNumericFieldControl::getFirst() throw(uno::RuntimeException, std::exception) { return mnFirst; } -void UnoNumericFieldControl::setLast( double Value ) throw(uno::RuntimeException) +void UnoNumericFieldControl::setLast( double Value ) throw(uno::RuntimeException, std::exception) { mnLast = Value; if ( getPeer().is() ) @@ -3996,43 +3996,43 @@ void UnoNumericFieldControl::setLast( double Value ) throw(uno::RuntimeException } } -double UnoNumericFieldControl::getLast() throw(uno::RuntimeException) +double UnoNumericFieldControl::getLast() throw(uno::RuntimeException, std::exception) { return mnLast; } -void UnoNumericFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException) +void UnoNumericFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= bStrict; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true ); } -sal_Bool UnoNumericFieldControl::isStrictFormat() throw(uno::RuntimeException) +sal_Bool UnoNumericFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } -void UnoNumericFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException) +void UnoNumericFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Digits; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), aAny, true ); } -double UnoNumericFieldControl::getSpinSize() throw(uno::RuntimeException) +double UnoNumericFieldControl::getSpinSize() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUESTEP_DOUBLE ); } -void UnoNumericFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::RuntimeException) +void UnoNumericFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Digits; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), aAny, true ); } -sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException) +sal_Int16 UnoNumericFieldControl::getDecimalDigits() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } @@ -4054,7 +4054,7 @@ UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XCo UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField ); } -OUString UnoControlCurrencyFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlCurrencyFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlCurrencyFieldModel ); } @@ -4089,7 +4089,7 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -4119,7 +4119,7 @@ OUString UnoCurrencyFieldControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XCurrencyField* >(this)) ); @@ -4132,7 +4132,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) +void UnoCurrencyFieldControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException, std::exception) { UnoSpinFieldControl::createPeer( rxToolkit, rParentPeer ); @@ -4141,7 +4141,7 @@ void UnoCurrencyFieldControl::createPeer( const uno::Reference< awt::XToolkit > xField->setLast( mnLast ); } -void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::RuntimeException, std::exception) { uno::Reference < awt::XCurrencyField > xField( getPeer(), uno::UNO_QUERY ); uno::Any aAny; @@ -4152,43 +4152,43 @@ void UnoCurrencyFieldControl::textChanged( const awt::TextEvent& e ) throw(uno:: GetTextListeners().textChanged( e ); } -void UnoCurrencyFieldControl::setValue( double Value ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::setValue( double Value ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Value; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUE_DOUBLE ), aAny, true ); } -double UnoCurrencyFieldControl::getValue() throw(uno::RuntimeException) +double UnoCurrencyFieldControl::getValue() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUE_DOUBLE ); } -void UnoCurrencyFieldControl::setMin( double Value ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::setMin( double Value ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Value; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMIN_DOUBLE ), aAny, true ); } -double UnoCurrencyFieldControl::getMin() throw(uno::RuntimeException) +double UnoCurrencyFieldControl::getMin() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMIN_DOUBLE ); } -void UnoCurrencyFieldControl::setMax( double Value ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::setMax( double Value ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Value; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUEMAX_DOUBLE ), aAny, true ); } -double UnoCurrencyFieldControl::getMax() throw(uno::RuntimeException) +double UnoCurrencyFieldControl::getMax() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUEMAX_DOUBLE ); } -void UnoCurrencyFieldControl::setFirst( double Value ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::setFirst( double Value ) throw(uno::RuntimeException, std::exception) { mnFirst = Value; if ( getPeer().is() ) @@ -4198,12 +4198,12 @@ void UnoCurrencyFieldControl::setFirst( double Value ) throw(uno::RuntimeExcepti } } -double UnoCurrencyFieldControl::getFirst() throw(uno::RuntimeException) +double UnoCurrencyFieldControl::getFirst() throw(uno::RuntimeException, std::exception) { return mnFirst; } -void UnoCurrencyFieldControl::setLast( double Value ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::setLast( double Value ) throw(uno::RuntimeException, std::exception) { mnLast = Value; if ( getPeer().is() ) @@ -4213,43 +4213,43 @@ void UnoCurrencyFieldControl::setLast( double Value ) throw(uno::RuntimeExceptio } } -double UnoCurrencyFieldControl::getLast() throw(uno::RuntimeException) +double UnoCurrencyFieldControl::getLast() throw(uno::RuntimeException, std::exception) { return mnLast; } -void UnoCurrencyFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= bStrict; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true ); } -sal_Bool UnoCurrencyFieldControl::isStrictFormat() throw(uno::RuntimeException) +sal_Bool UnoCurrencyFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } -void UnoCurrencyFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::setSpinSize( double Digits ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Digits; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_VALUESTEP_DOUBLE ), aAny, true ); } -double UnoCurrencyFieldControl::getSpinSize() throw(uno::RuntimeException) +double UnoCurrencyFieldControl::getSpinSize() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_DOUBLE( BASEPROPERTY_VALUESTEP_DOUBLE ); } -void UnoCurrencyFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::RuntimeException) +void UnoCurrencyFieldControl::setDecimalDigits( sal_Int16 Digits ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= Digits; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_DECIMALACCURACY ), aAny, true ); } -sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeException) +sal_Int16 UnoCurrencyFieldControl::getDecimalDigits() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_INT16( BASEPROPERTY_DECIMALACCURACY ); } @@ -4271,7 +4271,7 @@ UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComp UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField ); } -OUString UnoControlPatternFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlPatternFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlPatternFieldModel ); } @@ -4299,7 +4299,7 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -4352,7 +4352,7 @@ void UnoPatternFieldControl::ImplSetPeerProperty( const OUString& rPropName, con // uno::XInterface -uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XPatternField* >(this)) ); @@ -4365,17 +4365,17 @@ IMPL_XTYPEPROVIDER_START( UnoPatternFieldControl ) UnoSpinFieldControl::getTypes() IMPL_XTYPEPROVIDER_END -void UnoPatternFieldControl::setString( const OUString& rString ) throw(uno::RuntimeException) +void UnoPatternFieldControl::setString( const OUString& rString ) throw(uno::RuntimeException, std::exception) { setText( rString ); } -OUString UnoPatternFieldControl::getString() throw(uno::RuntimeException) +OUString UnoPatternFieldControl::getString() throw(uno::RuntimeException, std::exception) { return getText(); } -void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(uno::RuntimeException) +void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= EditMask; @@ -4384,20 +4384,20 @@ void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString& ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LITERALMASK ), aAny, true ); } -void UnoPatternFieldControl::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(uno::RuntimeException) +void UnoPatternFieldControl::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(uno::RuntimeException, std::exception) { EditMask = ImplGetPropertyValue_UString( BASEPROPERTY_EDITMASK ); LiteralMask = ImplGetPropertyValue_UString( BASEPROPERTY_LITERALMASK ); } -void UnoPatternFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException) +void UnoPatternFieldControl::setStrictFormat( sal_Bool bStrict ) throw(uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= bStrict; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STRICTFORMAT ), aAny, true ); } -sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException) +sal_Bool UnoPatternFieldControl::isStrictFormat() throw(uno::RuntimeException, std::exception) { return ImplGetPropertyValue_BOOL( BASEPROPERTY_STRICTFORMAT ); } @@ -4431,7 +4431,7 @@ UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XCompon ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MIN ); } -OUString UnoControlProgressBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlProgressBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlProgressBarModel ); } @@ -4460,7 +4460,7 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -4488,7 +4488,7 @@ OUString UnoProgressBarControl::GetComponentServiceName() } // uno::XInterface -uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) +uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< awt::XProgressBar* >(this)) ); @@ -4502,28 +4502,28 @@ IMPL_XTYPEPROVIDER_START( UnoProgressBarControl ) IMPL_XTYPEPROVIDER_END // ::com::sun::star::awt::XProgressBar -void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) +void UnoProgressBarControl::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nColor; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_FILLCOLOR ), aAny, true ); } -void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) +void UnoProgressBarControl::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nColor; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_BACKGROUNDCOLOR ), aAny, true ); } -void UnoProgressBarControl::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException) +void UnoProgressBarControl::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException, std::exception) { uno::Any aAny; aAny <<= nValue; ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE ), aAny, true ); } -void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException ) +void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException, std::exception ) { uno::Any aMin; uno::Any aMax; @@ -4545,7 +4545,7 @@ void UnoProgressBarControl::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::c ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_PROGRESSVALUE_MAX ), aMax, true ); } -sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::RuntimeException) +sal_Int32 UnoProgressBarControl::getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) { return ImplGetPropertyValue_INT32( BASEPROPERTY_PROGRESSVALUE ); } @@ -4576,7 +4576,7 @@ UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XComponentC ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); } -OUString UnoControlFixedLineModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString UnoControlFixedLineModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return OUString::createFromAscii( szServiceName_UnoControlFixedLineModel ); } @@ -4604,7 +4604,7 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con } // beans::XMultiPropertySet -uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertySetInfo( ) throw(uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -4633,7 +4633,7 @@ OUString UnoFixedLineControl::GetComponentServiceName() return OUString("FixedLine"); } -sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException) +sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException, std::exception) { return sal_True; } |