[Libreoffice-commits] core.git: 2 commits - comphelper/source
Caolán McNamara
caolanm at redhat.com
Fri Jun 13 03:16:58 PDT 2014
comphelper/source/property/propertysethelper.cxx | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
New commits:
commit c8b78a1ca2940a0db1a8298ccecc779695cda7e5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 13 10:55:30 2014 +0100
coverity#706287 uncaught exception
Change-Id: Ie2ec61c75d036dbad68bd43d5a2eb9834dadd735
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index bb75254..66b7843 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.cxx
@@ -129,18 +129,19 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&,
}
// 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();
if( nCount )
{
boost::scoped_array<PropertyMapEntry const *> pEntries(new PropertyMapEntry const *[nCount+1]);
pEntries[nCount] = NULL;
- const OUString* pNames = aPropertyNames.getConstArray();
+ const OUString* pNames = rPropertyNames.getConstArray();
bool bUnknown = false;
sal_Int32 n;
@@ -151,10 +152,10 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >&
}
if( !bUnknown )
- _setPropertyValues( (const PropertyMapEntry**)pEntries.get(), aValues.getConstArray() );
+ _setPropertyValues( (const PropertyMapEntry**)pEntries.get(), rValues.getConstArray() );
if( bUnknown )
- throw UnknownPropertyException( *pNames, static_cast< XPropertySet* >( this ) );
+ throw RuntimeException( *pNames, static_cast< XPropertySet* >( this ) );
}
}
commit 5e46374df0a0947d60aa5d0f99856dd7f3ea1cb9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 13 10:52:39 2014 +0100
coverity#706286 uncaught exception
Change-Id: Ic951a16c3d44b36ce82f05381c98e13e74b8bc35
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index 1ffc724..bb75254 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.cxx
@@ -158,16 +158,17 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >&
}
}
-Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException, std::exception)
+Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues(const Sequence< OUString >& rPropertyNames)
+ throw (RuntimeException, std::exception)
{
- const sal_Int32 nCount = aPropertyNames.getLength();
+ const sal_Int32 nCount = rPropertyNames.getLength();
Sequence< Any > aValues;
if( nCount )
{
boost::scoped_array<PropertyMapEntry const *> pEntries(new PropertyMapEntry const *[nCount+1]);
pEntries[nCount] = NULL;
- const OUString* pNames = aPropertyNames.getConstArray();
+ const OUString* pNames = rPropertyNames.getConstArray();
bool bUnknown = false;
sal_Int32 n;
@@ -184,7 +185,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< O
}
if( bUnknown )
- throw UnknownPropertyException( *pNames, static_cast< XPropertySet* >( this ) );
+ throw RuntimeException( *pNames, static_cast< XPropertySet* >( this ) );
}
return aValues;
More information about the Libreoffice-commits
mailing list