summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-02-14 23:36:16 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-02-20 17:00:28 +0000
commit720bbebb28d467e9785eafde9086a450e6a05fdf (patch)
tree6233bd8757dbdd02be1659b0968a64639544506e
parentFix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM (diff)
downloadbinfilter-720bbebb28d467e9785eafde9086a450e6a05fdf.tar.gz
binfilter-720bbebb28d467e9785eafde9086a450e6a05fdf.zip
binfilter::frm::OInterfaceContainer::disposing: fix boost assertion
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
-rw-r--r--binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
index 53811e119..7a65da5bc 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);
}
}