diff options
Diffstat (limited to 'sc/source/ui/vba/vbaaxes.cxx')
| -rw-r--r-- | sc/source/ui/vba/vbaaxes.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 061f698781a3..517a5d707389 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -46,12 +46,12 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: explicit EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasMoreElements( ) override { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); @@ -62,7 +62,7 @@ public: } uno::Reference< excel::XAxis > -ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException, script::BasicErrorException ) +ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) @@ -116,8 +116,8 @@ public: } } - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) override { return mCoordinates.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCount() override { return mCoordinates.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override { try { @@ -133,11 +133,11 @@ public: } } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<excel::XAxis>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { return ( mCoordinates.size() > 0 ); } @@ -156,19 +156,19 @@ ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const un } uno::Type SAL_CALL -ScVbaAxes::getElementType() throw (css::uno::RuntimeException) +ScVbaAxes::getElementType() { return cppu::UnoType<excel::XAxes>::get(); } uno::Reference< container::XEnumeration > SAL_CALL -ScVbaAxes::createEnumeration() throw (css::uno::RuntimeException) +ScVbaAxes::createEnumeration() { return new EnumWrapper( m_xIndexAccess ); } uno::Any SAL_CALL -ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) throw (css::script::BasicErrorException, css::uno::RuntimeException) +ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) { // #TODO map the possible index combinations to a container::XIndexAccess wrapper impl // using a vector of valid std::pair maybe? |