diff options
Diffstat (limited to 'toolkit/source/controls/roadmapcontrol.cxx')
-rw-r--r-- | toolkit/source/controls/roadmapcontrol.cxx | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index c6359a108272..59c99d314194 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -76,20 +76,18 @@ static void lcl_throwIndexOutOfBoundsException( ) } - OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException, std::exception) + OUString UnoControlRoadmapModel::getServiceName() { return OUString::createFromAscii( szServiceName_UnoControlRoadmapModel ); } OUString UnoControlRoadmapModel::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoControlRoadmapModel"); } css::uno::Sequence<OUString> UnoControlRoadmapModel::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlRoadmapModel_Base::getSupportedServiceNames()); s.realloc(s.getLength() + 2); @@ -127,7 +125,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( ) throw (Exception, css::uno::RuntimeException, std::exception) + Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstance( ) { ORoadmapEntry* pRoadmapItem = new ORoadmapEntry(); Reference< XInterface > xNewRoadmapItem = static_cast<cppu::OWeakObject*>(pRoadmapItem); @@ -135,7 +133,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ ) throw (Exception, RuntimeException, std::exception) + Reference< XInterface > SAL_CALL UnoControlRoadmapModel::createInstanceWithArguments( const Sequence< Any >& /*aArguments*/ ) { // Todo: implementation of the arguments handling ORoadmapEntry* pRoadmapItem = new ORoadmapEntry(); @@ -147,7 +145,7 @@ static void lcl_throwIndexOutOfBoundsException( ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, UnoControlRoadmapModel_IBase ) - css::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType ) { Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType ); if ( !aRet.hasValue() ) @@ -170,19 +168,19 @@ static void lcl_throwIndexOutOfBoundsException( ) // beans::XMultiPropertySet - Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo( ) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - sal_Int32 SAL_CALL UnoControlRoadmapModel::getCount() throw(RuntimeException, std::exception) + sal_Int32 SAL_CALL UnoControlRoadmapModel::getCount() { return maRoadmapItems.size(); } - Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) + Any SAL_CALL UnoControlRoadmapModel::getByIndex( sal_Int32 Index ) { if (( Index >= (sal_Int32)maRoadmapItems.size()) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -273,7 +271,6 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& Element) - throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -295,7 +292,6 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index) - throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if (( Index > (sal_Int32)maRoadmapItems.size()) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); @@ -326,7 +322,6 @@ static void lcl_throwIndexOutOfBoundsException( ) void SAL_CALL UnoControlRoadmapModel::replaceByIndex( const sal_Int32 Index, const Any& Element) - throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Reference< XInterface > xRoadmapItem; Element >>= xRoadmapItem; @@ -339,25 +334,25 @@ static void lcl_throwIndexOutOfBoundsException( ) } - Type SAL_CALL UnoControlRoadmapModel::getElementType() throw(RuntimeException, std::exception) + Type SAL_CALL UnoControlRoadmapModel::getElementType() { Type aType = cppu::UnoType<XPropertySet>::get(); return aType; } - sal_Bool SAL_CALL UnoControlRoadmapModel::hasElements() throw(RuntimeException, std::exception) + sal_Bool SAL_CALL UnoControlRoadmapModel::hasElements() { return !maRoadmapItems.empty(); } - void SAL_CALL UnoControlRoadmapModel::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL UnoControlRoadmapModel::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) { maContainerListeners.addInterface( xListener ); } - void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL UnoControlRoadmapModel::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) { maContainerListeners.removeInterface( xListener ); } @@ -376,7 +371,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoRoadmapControl, UnoControlRoadmap_Base, Uno IMPLEMENT_FORWARD_XINTERFACE2( UnoRoadmapControl, UnoControlRoadmap_Base, UnoControlRoadmap_IBase ) -sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& _rModel) throw ( RuntimeException, std::exception ) +sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& _rModel) { @@ -400,7 +395,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& } - void UnoRoadmapControl::dispose() throw(RuntimeException, std::exception) + void UnoRoadmapControl::dispose() { EventObject aEvt; aEvt.Source = static_cast<cppu::OWeakObject*>(this); @@ -409,7 +404,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& } -void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) +void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent ) { Reference< XInterface > xRoadmapItem; rEvent.Element >>= xRoadmapItem; @@ -428,7 +423,7 @@ void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(Run } -void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) +void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent ) { Reference< XContainerListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -441,7 +436,7 @@ void UnoRoadmapControl::elementRemoved( const ContainerEvent& rEvent )throw(Runt } -void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) +void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent ) { Reference< XContainerListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -449,7 +444,7 @@ void UnoRoadmapControl::elementReplaced( const ContainerEvent& rEvent )throw(Run } -void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) { sal_Int16 CurItemIndex = sal::static_int_cast< sal_Int16 >(rEvent.ItemId); Reference< XControlModel > xModel( getModel( ), UNO_QUERY ); @@ -460,7 +455,7 @@ void SAL_CALL UnoRoadmapControl::itemStateChanged( const ItemEvent& rEvent ) thr } -void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) +void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener >& l ) { maItemListeners.addInterface( l ); if( getPeer().is() && maItemListeners.getLength() == 1 ) @@ -471,7 +466,7 @@ void SAL_CALL UnoRoadmapControl::addItemListener( const Reference< XItemListener } -void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) +void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListener >& l ) { if( getPeer().is() && maItemListeners.getLength() == 1 ) { @@ -483,7 +478,7 @@ void SAL_CALL UnoRoadmapControl::removeItemListener( const Reference< XItemListe } -void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception) +void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt ) { Reference< XPropertyChangeListener > xPeer(getPeer(), UNO_QUERY); if ( xPeer.is() ) @@ -491,13 +486,11 @@ void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt } OUString UnoRoadmapControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("stardiv.Toolkit.UnoRoadmapControl"); } css::uno::Sequence<OUString> UnoRoadmapControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { auto s(UnoControlBase::getSupportedServiceNames()); s.realloc(s.getLength() + 2); |