[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - forms/source

[Noel Grandin]

 forms/source/misc/InterfaceContainer.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 858aa013061fb179e68c90a9dce6341a352b17c1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Feb 24 09:28:19 2017 +0200

    tdf#103830 Form field names not update in python macro
    
    regression from commit 5f15cc01b31ccaed0c6482a36556dece084ce302
    "new loplugin: use more efficient find() methods"
    
    Regression found by Aron Budea.
    
    Change-Id: I0e84376dfd754738de97882979058f86c2476bd6
    Reviewed-on: https://gerrit.libreoffice.org/34600
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 3a404ea870f1eed86f9765447ce0a364d39ae8f8)
    Reviewed-on: https://gerrit.libreoffice.org/34602
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 9dde69c..21a49db 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -680,9 +680,9 @@ throw (css::uno::RuntimeException, std::exception) {
     {
         ::osl::MutexGuard aGuard( m_rMutex );
         OInterfaceMap::iterator i = m_aMap.find(::comphelper::getString(evt.OldValue));
-        if (i != m_aMap.end() && (*i).second != evt.Source)
+        if (i != m_aMap.end() && i->second == evt.Source)
         {
-            css::uno::Reference<css::uno::XInterface>  xCorrectType((*i).second);
+            css::uno::Reference<css::uno::XInterface>  xCorrectType(i->second);
             m_aMap.erase(i);
             m_aMap.insert(::std::pair<const OUString, css::uno::Reference<css::uno::XInterface> >(::comphelper::getString(evt.NewValue),xCorrectType));
         }