diff options
Diffstat (limited to 'sc/source/ui/vba/vbanames.cxx')
| -rw-r--r-- | sc/source/ui/vba/vbanames.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 7042651bbb88..f9f1e32b0472 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -44,9 +44,9 @@ class NamesEnumeration : public EnumerationHelperImpl uno::Reference< sheet::XNamedRanges > m_xNames; public: /// @throws uno::RuntimeException - NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xNames( xNames ) {} + NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xNames( xNames ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL nextElement( ) override { uno::Reference< sheet::XNamedRange > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( m_xParent, m_xContext, xNamed ,m_xNames , m_xModel ) ) ); @@ -92,7 +92,6 @@ ScVbaNames::Add( const css::uno::Any& Name , const css::uno::Any& /*CategoryLocal*/, const css::uno::Any& RefersToR1C1, const css::uno::Any& RefersToR1C1Local ) - throw (css::uno::RuntimeException, std::exception) { OUString sName; uno::Reference< excel::XRange > xRange; @@ -227,13 +226,13 @@ ScVbaNames::Add( const css::uno::Any& Name , // XEnumerationAccess css::uno::Type -ScVbaNames::getElementType() throw( css::uno::RuntimeException ) +ScVbaNames::getElementType() { return cppu::UnoType<ov::excel::XName>::get(); } uno::Reference< container::XEnumeration > -ScVbaNames::createEnumeration() throw (uno::RuntimeException) +ScVbaNames::createEnumeration() { uno::Reference< container::XEnumerationAccess > xEnumAccess( mxNames, uno::UNO_QUERY_THROW ); return new NamesEnumeration( getParent(), mxContext, xEnumAccess->createEnumeration(), mxModel , mxNames ); |