current/SOURCES/libreoffice-fdo32561.comphelper.patch

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

1	diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
2	index 950ef90..a93318f 100644
3	--- a/comphelper/source/property/opropertybag.cxx
4	+++ b/comphelper/source/property/opropertybag.cxx
5	@@ -485,8 +485,6 @@ namespace comphelper
6
7	try
8	{
9	- ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
10	-
11	// check for unknown properties
12	// we cannot simply rely on the XMultiPropertySet::setPropertyValues
13	// implementation of our base class, since it does not throw
14	@@ -503,6 +501,7 @@ namespace comphelper
15	++pName, ++pHandle, ++pProperty
16	)
17	{
18	+ ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
19	pHandle = rPropInfo.getHandleByName( pName );
20	if ( *pHandle != -1 )
21	continue;
22	@@ -513,9 +512,6 @@ namespace comphelper
23	// add the property
24	sal_Int16 nAttributes = PropertyAttribute::BOUND \| PropertyAttribute::REMOVEABLE \| PropertyAttribute::MAYBEDEFAULT;
25	addProperty( *pName, nAttributes, pProperty->Value );
26	- // rPropInfo is invalid, refetch
27	- rPropInfo = getInfoHelper();
28	- pHandle = rPropInfo.getHandleByName( pName );
29	continue;
30	}
31
32