From 8809d3989284cd169733dceaeb4710a265fb8ef4 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 7 Aug 2012 14:35:57 +0200
Subject: remove link first

RemoveUnusedEventListener checks if there is a link for the window and
does nothing in this case. And of course there is one, because it has
not been removed yet .-)

Change-Id: I198e951c1eb5318f1304a9519b33bedef6892660
---
 sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sd/source')

diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
index 4f9698a5bffc..b14593115c9c 100644
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
@@ -238,8 +238,9 @@ void FocusManager::RemoveLinks (::Window* pWindow)
         {
             if (iLink->second.mpTargetWindow == pWindow)
             {
-                RemoveUnusedEventListener(iLink->first);
+                ::Window* const pSourceWindow(iLink->first);
                 mpLinks->erase(iLink);
+                RemoveUnusedEventListener(pSourceWindow);
                 bLinkRemoved = true;
                 break;
             }
-- 
cgit