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

INTEGRATION: CWS viewswitch (1.34.62); FILE MERGED

Browse source 
2006/02/16 10:14:38 af 1.34.62.3: RESYNC: (1.36-1.37); FILE MERGED
2006/01/19 17:21:00 af 1.34.62.2: RESYNC: (1.34-1.36); FILE MERGED
2005/11/17 13:27:43 af 1.34.62.1: #i57551# Replaced ObjectBarManager by ToolBarManager.
This commit is contained in:
Oliver Bolte 2006-03-21 16:18:41 +00:00
parent b22b68e86b
commit 760d93ab4e
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sd/source/ui/func/fusel.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: fusel.cxx,v $ * $RCSfile: fusel.cxx,v $
* *
* $Revision: 1.37 $ * $Revision: 1.38 $
* *
* last change: $Author: rt $ $Date: 2006-02-07 10:13:31 $ * last change: $Author: obo $ $Date: 2006-03-21 17:18:41 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -116,6 +116,9 @@
#ifndef SD_VIEW_SHELL_HXX #ifndef SD_VIEW_SHELL_HXX
#include "ViewShell.hxx" #include "ViewShell.hxx"
#endif #endif
#ifndef SD_VIEW_SHELL_BASE_HXX
#include "ViewShellBase.hxx"
#endif
#ifndef SD_FRAMW_VIEW_HXX #ifndef SD_FRAMW_VIEW_HXX
#include "FrameView.hxx" #include "FrameView.hxx"
#endif #endif
@ -130,8 +133,8 @@
#ifndef SD_DRAW_VIEW_SHELL_HXX #ifndef SD_DRAW_VIEW_SHELL_HXX
#include "DrawViewShell.hxx" #include "DrawViewShell.hxx"
#endif #endif
#ifndef SD_OBJECT_BAR_MANAGER_HXX #ifndef SD_TOOL_BAR_MANAGER_HXX
#include "ObjectBarManager.hxx" #include "ToolBarManager.hxx"
#endif #endif
#include "pgjump.hxx" #include "pgjump.hxx"
#include <svx/globl3d.hxx> #include <svx/globl3d.hxx>
@ -1195,7 +1198,7 @@ void FuSelection::SelectionHasChanged()
} }
// Activate the right tool bar for the current context of the view. // Activate the right tool bar for the current context of the view.
pViewShell->GetObjectBarManager().SelectionHasChanged (pView); pViewShell->GetViewShellBase().GetToolBarManager().SelectionHasChanged(*pViewShell, *pView);
} }