summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2018-09-30 08:40:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-01 08:15:26 +0200
commit8e56287a931b7fbc2fd645e0d5592212965b8d04 (patch)
treee60213e871f8655abdbfeb6b0f51a3a310e0b41e
parent2318e36d888ef0daa2e8d424fa7d3c2e423b5816 (diff)
SvtBroadcaster no need to unique
SvtListener already enforces this Change-Id: I0389668af12013addfdbeec7a5e92a9d374193dc Reviewed-on: https://gerrit.libreoffice.org/61150 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--include/svl/broadcast.hxx1
-rw-r--r--svl/source/notify/broadcast.cxx4
2 files changed, 1 insertions, 4 deletions
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index 934f591c3ba7..b4c8be5f9ac0 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
@@ -74,6 +74,7 @@ public:
void PrepareForDestruction();
private:
+ /// contains only one of each listener, which is enforced by SvtListener
mutable ListenersType maListeners;
/// When the broadcaster is about to die, collect listeners that asked for removal.
diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index d91a94610d8f..145aa81b22b5 100644
--- a/svl/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.cxx
@@ -28,16 +28,12 @@ void SvtBroadcaster::Normalize() const
if (!mbNormalized)
{
std::sort(maListeners.begin(), maListeners.end());
- ListenersType::iterator itUniqueEnd = std::unique(maListeners.begin(), maListeners.end());
- maListeners.erase(itUniqueEnd, maListeners.end());
mbNormalized = true;
}
if (!mbDestNormalized)
{
std::sort(maDestructedListeners.begin(), maDestructedListeners.end());
- ListenersType::iterator itUniqueEnd = std::unique(maDestructedListeners.begin(), maDestructedListeners.end());
- maDestructedListeners.erase(itUniqueEnd, maDestructedListeners.end());
mbDestNormalized = true;
}
}