[Libreoffice-commits] .: Branch 'libreoffice-3-3' - comphelper/source
Noel Power
noelp at kemper.freedesktop.org
Wed Jan 26 02:19:45 PST 2011
comphelper/source/property/opropertybag.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 9885200e656f9bbfdea90d5fc6701707a689dd40
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 26 10:18:34 2011 +0000
fix for fdo#32561
crash when iterating over the database types, see the bug ( fdo#32561 ) for more details
Signed-off-by: Noel Power <noel.power at novell.com>
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 950ef90..a93318f 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -485,8 +485,6 @@ namespace comphelper
try
{
- ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
-
// check for unknown properties
// we cannot simply rely on the XMultiPropertySet::setPropertyValues
// implementation of our base class, since it does not throw
@@ -503,6 +501,7 @@ namespace comphelper
++pName, ++pHandle, ++pProperty
)
{
+ ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
*pHandle = rPropInfo.getHandleByName( *pName );
if ( *pHandle != -1 )
continue;
@@ -513,9 +512,6 @@ namespace comphelper
// add the property
sal_Int16 nAttributes = PropertyAttribute::BOUND | PropertyAttribute::REMOVEABLE | PropertyAttribute::MAYBEDEFAULT;
addProperty( *pName, nAttributes, pProperty->Value );
- // rPropInfo is invalid, refetch
- rPropInfo = getInfoHelper();
- *pHandle = rPropInfo.getHandleByName( *pName );
continue;
}
More information about the Libreoffice-commits
mailing list