Blame libreoffice-fdo32561.comphelper.patch
|
 |
9227747 |
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
|
|
|
9227747 |
index 950ef90..a93318f 100644
|
|
|
9227747 |
--- a/comphelper/source/property/opropertybag.cxx
|
|
|
9227747 |
+++ b/comphelper/source/property/opropertybag.cxx
|
|
|
9227747 |
@@ -485,8 +485,6 @@ namespace comphelper
|
|
|
9227747 |
|
|
|
9227747 |
try
|
|
|
9227747 |
{
|
|
|
9227747 |
- ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
|
|
|
9227747 |
-
|
|
|
9227747 |
// check for unknown properties
|
|
|
9227747 |
// we cannot simply rely on the XMultiPropertySet::setPropertyValues
|
|
|
9227747 |
// implementation of our base class, since it does not throw
|
|
|
9227747 |
@@ -503,6 +501,7 @@ namespace comphelper
|
|
|
9227747 |
++pName, ++pHandle, ++pProperty
|
|
|
9227747 |
)
|
|
|
9227747 |
{
|
|
|
9227747 |
+ ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
|
|
|
9227747 |
*pHandle = rPropInfo.getHandleByName( *pName );
|
|
|
9227747 |
if ( *pHandle != -1 )
|
|
|
9227747 |
continue;
|
|
|
9227747 |
@@ -513,9 +512,6 @@ namespace comphelper
|
|
|
9227747 |
// add the property
|
|
|
9227747 |
sal_Int16 nAttributes = PropertyAttribute::BOUND | PropertyAttribute::REMOVEABLE | PropertyAttribute::MAYBEDEFAULT;
|
|
|
9227747 |
addProperty( *pName, nAttributes, pProperty->Value );
|
|
|
9227747 |
- // rPropInfo is invalid, refetch
|
|
|
9227747 |
- rPropInfo = getInfoHelper();
|
|
|
9227747 |
- *pHandle = rPropInfo.getHandleByName( *pName );
|
|
|
9227747 |
continue;
|
|
|
9227747 |
}
|
|
|
9227747 |
|