Attachment 42468 Details for Bug 32561 – quick fix

[patch] quick fix

rebinding.references.is.nonsense.patch (text/plain), 1.40 KB, created by Caolán McNamara on 2011-01-25 08:05:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolán McNamara

Created: 2011-01-25 08:05:00 UTC

Size: 1.40 KB

patch

obsolete

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

Actions: View

Attachments on bug 32561: 42364 | 42392 | 42393 | 42468