Kaydet (Commit) 86cda9ab authored tarafından Julien Nabet's avatar Julien Nabet

Revert partly 9d1f61a6

The use of erase/remove idiom is wrong here since "there can be multiple
registrations of the same listener"

See Stephan's comments in https://gerrit.libreoffice.org/#/c/44892/3/binaryurp/source/bridge.cxx

Change-Id: Iebf979ca25520392ba9de6439d5bf19b8e3446b2
Reviewed-on: https://gerrit.libreoffice.org/45104Tested-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst a675428e
......@@ -927,7 +927,11 @@ void Bridge::removeEventListener(
css::uno::Reference< css::lang::XEventListener > const & aListener)
{
osl::MutexGuard g(mutex_);
listeners_.erase(std::remove(listeners_.begin(), listeners_.end(), aListener), listeners_.end());
Listeners::iterator i(
std::find(listeners_.begin(), listeners_.end(), aListener));
if (i != listeners_.end()) {
listeners_.erase(i);
}
}
void Bridge::sendCommitChangeRequest() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment