diff options
Diffstat (limited to 'sc/source/ui/vba/vbamenubars.cxx')
-rw-r--r-- | sc/source/ui/vba/vbamenubars.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 1c2759990c66..fb5eb65ea7a5 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -31,14 +31,12 @@ public: virtual uno::Any SAL_CALL nextElement() override { // FIXME: should be add menubar - if( hasMoreElements() ) - { - uno::Reference< XCommandBar > xCommandBar( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); - uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( m_xParent, m_xContext, xCommandBar ) ); - return uno::makeAny( xMenuBar ); - } - else + if( !hasMoreElements() ) throw container::NoSuchElementException(); + + uno::Reference< XCommandBar > xCommandBar( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); + uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( m_xParent, m_xContext, xCommandBar ) ); + return uno::makeAny( xMenuBar ); } }; |