From 5356086cd6c8fcb8866c4af84247f97a8fadf740 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 25 Jun 2012 11:52:53 +0200
Subject: [PATCH] fdo#51324 remove link _before_ cleaning up listeners

Otherwise RemoveUnusedEventListeners can never do anything, as there
always exists at least one link for the window.

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

diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
index 6be7076..0634b7f 100644
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
@@ -239,8 +239,9 @@ void FocusManager::RemoveLinks (::Window* pWindow)
         {
             if (iLink->second.mpTargetWindow == pWindow)
             {
-                RemoveUnusedEventListener(iLink->first);
+                ::Window* const pTargetWindow(iLink->first);
                 mpLinks->erase(iLink);
+                RemoveUnusedEventListener(pWindow);
                 bLinkRemoved = true;
                 break;
             }
-- 
1.7.10.2