You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
libreoffice/libreoffice-fdo32561.comphe...

32 lines
1.4 KiB

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;
}