[libreoffice] add libreoffice-fdo32561.comphelper.patch

[Caolan McNamara]

commit 922774712c4891fb2509491a517965bb620c79ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 25 16:07:47 2011 +0000

    add libreoffice-fdo32561.comphelper.patch

 libreoffice-fdo32561.comphelper.patch |   31 +++++++++++++++++++++++++++++++
 libreoffice.spec                      |    4 +++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/libreoffice-fdo32561.comphelper.patch b/libreoffice-fdo32561.comphelper.patch
new file mode 100644
index 0000000..6a0b321
--- /dev/null
+++ b/libreoffice-fdo32561.comphelper.patch
@@ -0,0 +1,31 @@
+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;
+                 }
+ 
diff --git a/libreoffice.spec b/libreoffice.spec
index 8393c55..147b4bc 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -105,6 +105,7 @@ Patch17: 0001-free-ctxt-after-taking-lastError-details.patch
 Patch18: 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
 Patch19: libreoffice-fdo31271.icu.patch
 Patch20: libreoffice-gcc4.6.0.patch
+Patch21: libreoffice-fdo32561.comphelper.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -726,8 +727,9 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch16 -p1 -b .don-t-pushback-and-process-a-corrupt-extension.patch
 %patch17 -p1 -b .free-ctxt-after-taking-lastError-details.patch
 %patch18 -p1 -b .Cursor-on-post-it-now-scrolls-.patch
-%patch19 -p1 -b .libreoffice-fdo31271.icu.patch
+%patch19 -p1 -b .fdo31271.icu.patch
 %patch20 -p1 -b .libreoffice-gcc4.6.0.patch
+%patch21 -p1 -b .fdo32561.comphelper.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip