diff options
Diffstat (limited to 'sc/source/ui/vba/vbamenubars.cxx')
-rw-r--r-- | sc/source/ui/vba/vbamenubars.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 93a63ec6350c..1c2759990c66 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -21,14 +21,14 @@ class MenuBarEnumeration : public ::cppu::WeakImplHelper< container::XEnumeratio uno::Reference< container::XEnumeration > m_xEnumeration; public: /// @throws uno::RuntimeException - MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) + MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasMoreElements() override { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) override + virtual uno::Any SAL_CALL nextElement() override { // FIXME: should be add menubar if( hasMoreElements() ) @@ -42,7 +42,7 @@ public: } }; -ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) throw ( uno::RuntimeException ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars ) +ScVbaMenuBars::ScVbaMenuBars( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBars >& xCommandBars ) : MenuBars_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBars( xCommandBars ) { } @@ -52,13 +52,13 @@ ScVbaMenuBars::~ScVbaMenuBars() // XEnumerationAccess uno::Type SAL_CALL -ScVbaMenuBars::getElementType() throw ( uno::RuntimeException ) +ScVbaMenuBars::getElementType() { return cppu::UnoType<excel::XMenuBar>::get(); } uno::Reference< container::XEnumeration > -ScVbaMenuBars::createEnumeration() throw ( uno::RuntimeException ) +ScVbaMenuBars::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBars, uno::UNO_QUERY_THROW ); return uno::Reference< container::XEnumeration >( new MenuBarEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) ); @@ -72,14 +72,14 @@ ScVbaMenuBars::createCollectionObject( const uno::Any& aSource ) } sal_Int32 SAL_CALL -ScVbaMenuBars::getCount() throw(css::uno::RuntimeException) +ScVbaMenuBars::getCount() { return m_xCommandBars->getCount(); } // ScVbaCollectionBaseImpl uno::Any SAL_CALL -ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException ) +ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) { sal_Int16 nIndex = 0; aIndex >>= nIndex; |