strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress22 (1.2.154); FILE MERGED

Browse source 
2004/12/06 15:52:28 af 1.2.154.1: #i38310# MoveToTop() invalidates the shell stack when it moves a sub shell.
This commit is contained in:
Kurt Zenker 2004-12-09 15:12:16 +00:00
parent d3151f5ed1
commit 156d52ff59
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sd/source/ui/toolpanel/TaskPaneShellManager.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: TaskPaneShellManager.cxx,v $ * $RCSfile: TaskPaneShellManager.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: rt $ $Date: 2004-07-13 14:36:56 $ * last change: $Author: kz $ $Date: 2004-12-09 16:12:16 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -106,15 +106,19 @@ void TaskPaneShellManager::RemoveSubShell (SfxShell* pShell)
void TaskPaneShellManager::MoveToTop (SfxShell* pShell) void TaskPaneShellManager::MoveToTop (SfxShell* pShell)
{ {
ViewShellManager::UpdateLocker aLocker (mrViewShellManager);
if (maShellStack.empty() || maShellStack.front()!=pShell) if (maShellStack.empty() || maShellStack.front()!=pShell)
{ {
// Move the given shell to the top of the local stack. // Move the given shell to the top of the local stack.
ViewShellManager::UpdateLocker aLocker (mrViewShellManager);
RemoveSubShell (pShell); RemoveSubShell (pShell);
AddSubShell (pShell); AddSubShell (pShell);
mrViewShellManager.InvalidateShellStack();
} }
// Move the view shell to the top of the view shell stack.
// Move the view shell to the top of the view shell stack. This has to
// be done even when the sub shell has not been moved.
mrViewShellManager.MoveToTop (&mrViewShell); mrViewShellManager.MoveToTop (&mrViewShell);
} }