summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-08-07 14:35:57 +0200
committerDavid Tardon <dtardon@redhat.com>2012-08-07 15:04:04 +0200
commit8809d3989284cd169733dceaeb4710a265fb8ef4 (patch)
tree5c60a65e8eeda4e13edd8204c91b0677756ed0d1 /sd
parentae0f9da65b7a41f72699217292cf39fe8460e2e2 (diff)
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
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/toolpanel/TaskPaneFocusManager.cxx3
1 files changed, 2 insertions, 1 deletions
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;
}