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

coverity#706287 uncaught exception

Browse Source 
Change-Id: Ie2ec61c75d036dbad68bd43d5a2eb9834dadd735
This commit is contained in:
Caolán McNamara
2014-06-13 10:55:30 +01:00
parent 5e46374df0
commit c8b78a1ca2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
comphelper/source/property/propertysethelper.cxx
View File

@@ -129,18 +129,19 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&,
} }
// XMultiPropertySet // XMultiPropertySet
void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues )
throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
{ {
const sal_Int32 nCount = aPropertyNames.getLength(); const sal_Int32 nCount = rPropertyNames.getLength();
if( nCount != aValues.getLength() ) if( nCount != rValues.getLength() )
throw IllegalArgumentException(); throw IllegalArgumentException();
if( nCount ) if( nCount )
{ {
boost::scoped_array<PropertyMapEntry const *> pEntries(new PropertyMapEntry const *[nCount+1]); boost::scoped_array<PropertyMapEntry const *> pEntries(new PropertyMapEntry const *[nCount+1]);
pEntries[nCount] = NULL; pEntries[nCount] = NULL;
const OUString* pNames = aPropertyNames.getConstArray(); const OUString* pNames = rPropertyNames.getConstArray();
bool bUnknown = false; bool bUnknown = false;
sal_Int32 n; sal_Int32 n;
@@ -151,10 +152,10 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >&
} }
if( !bUnknown ) if( !bUnknown )
_setPropertyValues( (const PropertyMapEntry**)pEntries.get(), aValues.getConstArray() ); _setPropertyValues( (const PropertyMapEntry**)pEntries.get(), rValues.getConstArray() );
if( bUnknown ) if( bUnknown )
throw UnknownPropertyException( *pNames, static_cast< XPropertySet* >( this ) ); throw RuntimeException( *pNames, static_cast< XPropertySet* >( this ) );
} }
} }