mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better fix for tdf#103830

Browse Source 
the first fix in commit 3a404ea870
did not take into account that this a multimap, not a map.

Thanks to Aron Budea for spotting that.

Change-Id: I86d2d2a9d6cb08fd3cee3965a5b787d5691f0352
Reviewed-on: https://gerrit.libreoffice.org/34604
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2017-02-24 11:24:46 +02:00
parent 288d694ff6
commit e146741ec9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forms/source/misc/InterfaceContainer.cxx
View File

@@ -661,12 +661,14 @@ void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt) {
if (evt.PropertyName == PROPERTY_NAME) if (evt.PropertyName == PROPERTY_NAME)
{ {
::osl::MutexGuard aGuard( m_rMutex ); ::osl::MutexGuard aGuard( m_rMutex );
OInterfaceMap::iterator i = m_aMap.find(::comphelper::getString(evt.OldValue)); auto range = m_aMap.equal_range(::comphelper::getString(evt.OldValue));
if (i != m_aMap.end() && i->second == evt.Source) for (auto it = range.first; it != range.second; ++it)
if (it->second == evt.Source)
{ {
css::uno::Reference<css::uno::XInterface> xCorrectType(i->second); css::uno::Reference<css::uno::XInterface> xCorrectType(it->second);
m_aMap.erase(i); m_aMap.erase(it);
m_aMap.insert(::std::pair<const OUString, css::uno::Reference<css::uno::XInterface> >(::comphelper::getString(evt.NewValue),xCorrectType)); m_aMap.insert(::std::pair<const OUString, css::uno::Reference<css::uno::XInterface> >(::comphelper::getString(evt.NewValue),xCorrectType));
break;
} }
} }
} }