[Libreoffice-commits] .: Branch 'libreoffice-3-5' - binfilter/bf_forms

[Michael Meeks]

 binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 720bbebb28d467e9785eafde9086a450e6a05fdf
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 14 23:36:16 2012 +0100

    binfilter::frm::OInterfaceContainer::disposing: fix boost assertion
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
index 53811e1..7a65da5 100644
--- a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
+++ b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
@@ -486,13 +486,17 @@ void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw(
                 "OInterfaceContainer::disposing: map element not normalized!" );
 
             if ( i->second.get() == _rSource.Source.get() )
+            {
                 // found it
+                m_aMap.erase(i);
                 break;
+            }
 
             ++i;
+
+            DBG_ASSERT( i != m_aMap.end(), "OInterfaceContainer::disposing: inconsistency: the element was in m_aItems, but not in m_aMap!" );
         }
 
-        m_aMap.erase(i);
         m_aItems.erase(j);
     }
 }