diff options
Diffstat (limited to 'svx/source/tbxctrls/tbunosearchcontrollers.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 969cd1852b7c..323712913699 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -377,14 +377,10 @@ void SearchToolbarControllersManager::freeController( const css::uno::Reference< SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame); if (pIt != aSearchToolbarControllersMap.end()) { - for (SearchToolbarControllersVec::iterator pItCtrl=pIt->second.begin(); pItCtrl!=pIt->second.end(); ++pItCtrl) - { - if (pItCtrl->Name == sCommandURL) - { - pIt->second.erase(pItCtrl); - break; - } - } + auto pItCtrl = std::find_if(pIt->second.begin(), pIt->second.end(), + [&sCommandURL](const css::beans::PropertyValue& rCtrl) { return rCtrl.Name == sCommandURL; }); + if (pItCtrl != pIt->second.end()) + pIt->second.erase(pItCtrl); if (pIt->second.empty()) aSearchToolbarControllersMap.erase(pIt); @@ -398,14 +394,10 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag SearchToolbarControllersMap::iterator pIt = aSearchToolbarControllersMap.find(xFrame); if (pIt != aSearchToolbarControllersMap.end()) { - for (SearchToolbarControllersVec::iterator pItCtrl =pIt->second.begin(); pItCtrl != pIt->second.end(); ++pItCtrl) - { - if (pItCtrl->Name == sCommandURL) - { - pItCtrl->Value >>= xStatusListener; - break; - } - } + auto pItCtrl = std::find_if(pIt->second.begin(), pIt->second.end(), + [&sCommandURL](const css::beans::PropertyValue& rCtrl) { return rCtrl.Name == sCommandURL; }); + if (pItCtrl != pIt->second.end()) + pItCtrl->Value >>= xStatusListener; } return xStatusListener; |