diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:43:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:43:43 +0000 |
| commit | 78d7cab40debc78f213500d7c0fec61883650c10 (patch) | |
| tree | 169bc69fc4f0ab0d274cd64ab3c9bdea575022d7 /sd | |
| parent | ef27fc4231bbab127c9fe8ba0e3f4da10a159577 (diff) | |
INTEGRATION: CWS viewswitch (1.43.72); FILE MERGED
2006/01/19 17:56:01 af 1.43.72.3: RESYNC: (1.43-1.44); FILE MERGED
2005/11/29 15:59:05 af 1.43.72.2: #i57552# Controller handling changed.
2005/11/17 15:20:12 af 1.43.72.1: #i57551# FormShell now accessible through FormShellManager.
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews5.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 23dad63d3577..9131a8206fa1 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews5.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: rt $ $Date: 2005-12-14 17:27:30 $ + * last change: $Author: obo $ $Date: 2006-03-21 17:43:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -62,6 +62,7 @@ #ifndef _SVX_FMSHELL_HXX //autogen #include <svx/fmshell.hxx> #endif +#include <svx/eeitem.hxx> #ifndef INCLUDED_SVTOOLS_COLORCFG_HXX #include <svtools/colorcfg.hxx> #endif @@ -114,13 +115,14 @@ #ifndef SD_UNO_DRAW_VIEW_HXX #include "SdUnoDrawView.hxx" #endif -#ifndef SD_OBJECT_BAR_MANAGER_HXX -#include "ObjectBarManager.hxx" -#endif #ifndef SD_VIEW_SHELL_BASE_HXX #include "ViewShellBase.hxx" #endif +#ifndef SD_FORM_SHELL_MANAGER_HXX +#include "FormShellManager.hxx" +#endif #include "LayerDialogContent.hxx" +#include "DrawController.hxx" namespace sd { @@ -690,8 +692,7 @@ Size DrawViewShell::GetOptimalSizePixel() const void DrawViewShell::HidePage(SdrPageView* pPV) { - FmFormShell* pFormShell = static_cast<FmFormShell*>( - GetObjectBarManager().GetObjectBar(RID_FORMLAYER_TOOLBOX)); + FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager().GetFormShell(); if (pFormShell != NULL) pFormShell->PrepareClose (FALSE); } @@ -785,9 +786,8 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) { ViewShell::VisAreaChanged( rRect ); - DrawController* pController = GetController(); - if (pController != NULL) - pController->FireVisAreaChanged (rRect); + DrawController& rController = GetViewShellBase().GetDrawController(); + rController.FireVisAreaChanged (rRect); } |