From 41a49c69b4cdaea2f90b3de56e3988ece042303c Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 12 Dec 2006 17:42:25 +0000 Subject: INTEGRATION: CWS sdwarningsbegone (1.5.38); FILE MERGED 2006/11/28 17:39:46 cl 1.5.38.2: #i69285# warning free code changes for sd project 2006/11/22 12:42:15 cl 1.5.38.1: #i69285# warning free code changes for unxlngi6.pro --- sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx index e52ba83be80e..3e691c80f3dd 100644 --- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TaskPaneFocusManager.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:14:24 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:42:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -191,9 +191,10 @@ void FocusManager::RemoveLinks (::Window* pWindow) pWindow->RemoveEventListener (LINK (this, FocusManager, WindowEventListener)); // Remove links to the given window. - bool bLinkRemoved (false); + bool bLinkRemoved; do { + bLinkRemoved = false; LinkMap::iterator iLink; for (iLink=mpLinks->begin(); iLink!=mpLinks->end(); ++iLink) { @@ -201,7 +202,7 @@ void FocusManager::RemoveLinks (::Window* pWindow) { mpLinks->erase(iLink); RemoveUnusedEventListener(iLink->first); - bLinkRemoved; + bLinkRemoved = true; break; } } -- cgit