[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sfx2/source

[Julien Nabet]

 sfx2/source/sidebar/Theme.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7c19d748285f033dbc3bbbb98070018ce45833a0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Apr 13 20:29:25 2015 +0200

    Cherry-pick 2 fixes:
    
    tdf#90566: memory leak: maChangeListeners is not properly disposed
    cbbb24d0afcdbdac21d03ec4ee1455a3834afff4
    
    fix loop
    d170afda29bf4557df568732b1feba47f2c9439f
    
    Change-Id: Ie575d503349b3218c7a0211e1f81d791e995297e
    Reviewed-on: https://gerrit.libreoffice.org/15290
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 4acbe85..262f363 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -429,15 +429,15 @@ void Theme::UpdateTheme (void)
 void SAL_CALL Theme::disposing (void)
 {
     ChangeListeners aListeners;
-    maChangeListeners.swap(aListeners);
+    aListeners.swap(maChangeListeners);
 
     const lang::EventObject aEvent (static_cast<XWeak*>(this));
 
     for (ChangeListeners::const_iterator
-             iContainer(maChangeListeners.begin()),
-             iContainerEnd(maChangeListeners.end());
-         iContainerEnd!=iContainerEnd;
-         ++iContainerEnd)
+             iContainer(aListeners.begin()),
+             iContainerEnd(aListeners.end());
+         iContainer != iContainerEnd;
+         ++iContainer)
     {
         for (ChangeListenerContainer::const_iterator
                  iListener(iContainer->second.begin()),