mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#707193 Uncaught exception

Browse Source 
Change-Id: Ie3e6bc593365311bfe80972b26d1189acbb6afcb
This commit is contained in:
Caolán McNamara
2014-07-03 10:16:04 +01:00
parent f9ac894247
commit 6fb1f934d7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/vbahelper/vbacollectionimpl.hxx
View File

@@ -279,13 +279,15 @@ protected:
public: public:
ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, bool bIgnoreCase = false ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ), mbIgnoreCase( bIgnoreCase ) { m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); } ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, bool bIgnoreCase = false ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ), mbIgnoreCase( bIgnoreCase ) { m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); }
//XCollection //XCollection
virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException)
{ {
return m_xIndexAccess->getCount(); return m_xIndexAccess->getCount();
} }
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException) virtual css::uno::Any SAL_CALL Item(const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/)
throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, css::uno::RuntimeException)
{ {
if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING ) if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING )
{ {
@@ -302,6 +304,7 @@ public:
Index1 >>= aStringSheet; Index1 >>= aStringSheet;
return getItemByStringIndex( aStringSheet ); return getItemByStringIndex( aStringSheet );
} }
// XDefaultMethod // XDefaultMethod
OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException) OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException)
{ {

4
oovbaapi/ooo/vba/XCollection.idl
View File

@@ -36,7 +36,9 @@ interface XCollection
[attribute, readonly] long Count; [attribute, readonly] long Count;
any Item( [in] any Index1, [in] any Index2 ) raises(com::sun::star::script::BasicErrorException); any Item( [in] any Index1, [in] any Index2 )
raises (com::sun::star::lang::IndexOutOfBoundsException,
com::sun::star::script::BasicErrorException);
}; };
}; }; }; };