summaryrefslogtreecommitdiff
path: root/sc/source/ui/vba/vbamenuitems.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/vba/vbamenuitems.cxx')
-rw-r--r--sc/source/ui/vba/vbamenuitems.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx
index d5fd6484ecf3..76fb396352c9 100644
--- a/sc/source/ui/vba/vbamenuitems.cxx
+++ b/sc/source/ui/vba/vbamenuitems.cxx
@@ -24,14 +24,14 @@ class MenuEnumeration : public MenuEnumeration_BASE
uno::Reference< container::XEnumeration > m_xEnumeration;
public:
/// @throws uno::RuntimeException
- MenuEnumeration( 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 )
+ MenuEnumeration( 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 menu
if( hasMoreElements() )
@@ -55,19 +55,19 @@ public:
}
};
-ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) throw ( uno::RuntimeException ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
+ScVbaMenuItems::ScVbaMenuItems( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XCommandBarControls >& xCommandBarControls ) : MenuItems_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() ), m_xCommandBarControls( xCommandBarControls )
{
}
// XEnumerationAccess
uno::Type SAL_CALL
-ScVbaMenuItems::getElementType() throw ( uno::RuntimeException )
+ScVbaMenuItems::getElementType()
{
return cppu::UnoType<excel::XMenuItem>::get();
}
uno::Reference< container::XEnumeration >
-ScVbaMenuItems::createEnumeration() throw ( uno::RuntimeException )
+ScVbaMenuItems::createEnumeration()
{
uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xCommandBarControls, uno::UNO_QUERY_THROW );
return uno::Reference< container::XEnumeration >( new MenuEnumeration( this, mxContext, xEnumAccess->createEnumeration() ) );
@@ -81,7 +81,7 @@ ScVbaMenuItems::createCollectionObject( const uno::Any& aSource )
}
sal_Int32 SAL_CALL
-ScVbaMenuItems::getCount() throw(css::uno::RuntimeException)
+ScVbaMenuItems::getCount()
{
// FIXME: should check if it is a popup menu
return m_xCommandBarControls->getCount();
@@ -89,7 +89,7 @@ ScVbaMenuItems::getCount() throw(css::uno::RuntimeException)
// ScVbaCollectionBaseImpl
uno::Any SAL_CALL
-ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
+ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ )
{
uno::Reference< XCommandBarControl > xCommandBarControl( m_xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
if( xCommandBarControl->getType() == office::MsoControlType::msoControlPopup )
@@ -99,7 +99,7 @@ ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) thro
throw uno::RuntimeException();
}
-uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception)
+uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ )
{
sal_Int32 nType = office::MsoControlType::msoControlButton;
uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore );