fdo#76754 Speed up registration of new listeners to SfxBroadcaster

Also change behavior for the GetListenerCount() method which now
returns the count of listeners.

The previous behavior is available in method GetSizeOfVector().

Change-Id: I5b03fa55a309f4ff5aea5e8830c137786fc07e89
Reviewed-on: https://gerrit.libreoffice.org/10344
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

2 files changed, 19 insertions, 16 deletions

diff --git a/svl/qa/unit/notify/test_SfxBroadcaster.cxx b/svl/qa/unit/notify/test_SfxBroadcaster.cxx
index 8139ed1eba2d..60960295ccc7 100644
--- a/svl/qa/unit/notify/test_SfxBroadcaster.cxx
+++ b/svl/qa/unit/notify/test_SfxBroadcaster.cxx
@@ -26,7 +26,7 @@ class SfxBroadcasterTest : public CppUnit::TestFixture
     // Adds code needed to register the test suite
     CPPUNIT_TEST_SUITE(SfxBroadcasterTest);
     CPPUNIT_TEST(AddingListenersIncreasesCount);
-    //CPPUNIT_TEST(RemovingListenersDecreasesCount);
+    CPPUNIT_TEST(RemovingListenersDecreasesCount);
     CPPUNIT_TEST(HintsAreNotForwardedToRemovedListeners);
 
     CPPUNIT_TEST_SUITE_END();
diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx
index 2fe79033b3b7..3aa493d19a84 100644
--- a/svl/source/notify/SfxBroadcaster.cxx
+++ b/svl/source/notify/SfxBroadcaster.cxx
@@ -88,15 +88,15 @@ SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster &rBC )
 
 void SfxBroadcaster::AddListener( SfxListener& rListener )
 {
-    for (size_t i = 0; i < m_Listeners.size(); ++i)
-    {
-        if (!m_Listeners[i]) // removed by RemoveListener?
-        {
-            m_Listeners[i] = &rListener;
-            return;
-        }
+    if (m_RemovedPositions.empty()) {
+        m_Listeners.push_back(&rListener);
+    }
+    else {
+        size_t targetPosition = m_RemovedPositions.back();
+        m_RemovedPositions.pop_back();
+        assert(m_Listeners[targetPosition] == NULL);
+        m_Listeners[targetPosition] = &rListener;
     }
-    m_Listeners.push_back(&rListener);
 }
 
 
@@ -131,6 +131,8 @@ void SfxBroadcaster::RemoveListener( SfxListener& rListener )
     // DO NOT erase the listener, set the pointer to 0
     // because the current continuation may contain this->Broadcast
     *aIter = 0;
+    size_t positionOfRemovedElement = std::distance(m_Listeners.begin(), aIter);
+    m_RemovedPositions.push_back(positionOfRemovedElement);
 
     if ( !HasListeners() )
         ListenersGone();
@@ -138,13 +140,14 @@ void SfxBroadcaster::RemoveListener( SfxListener& rListener )
 
 bool SfxBroadcaster::HasListeners() const
 {
-    for (size_t i = 0; i < m_Listeners.size(); ++i)
-    {
-        if (m_Listeners[i]) {
-            return true;
-        }
-    }
-    return false;
+    return (GetListenerCount() != 0);
+}
+
+size_t SfxBroadcaster::GetListenerCount() const
+{
+    assert(m_Listeners.size() >= m_RemovedPositions.size());
+    return m_Listeners.size() - m_RemovedPositions.size();
 }
 
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */