diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-01-20 11:48:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-01-20 11:48:48 +0000 |
| commit | 76f6f2f761c393f15982059ed94d1ed0abcab1c9 (patch) | |
| tree | f043fc4096b25ace1db2a7de5bd0d2a86377bd90 /sd/source/ui/view/drviewsh.cxx | |
| parent | 571cf9a2c0412989475a1478b93873817775c112 (diff) | |
INTEGRATION: CWS impress1 (1.4.226); FILE MERGED
2004/01/09 16:32:57 af 1.4.226.2: #111996# Renamed header files DrawView.hxx, Fader.hxx, and ShowView.hxx back to lowercase version.
2003/09/17 08:10:10 af 1.4.226.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd.
Diffstat (limited to 'sd/source/ui/view/drviewsh.cxx')
| -rw-r--r-- | sd/source/ui/view/drviewsh.cxx | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index f5dcc30c96d4..7b270363ff00 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviewsh.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2002-04-12 12:44:07 $ + * last change: $Author: obo $ $Date: 2004-01-20 12:48:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +#include "DrawViewShell.hxx" + #ifndef _AEITEM_HXX //autogen #include <svtools/aeitem.hxx> #endif @@ -84,14 +86,23 @@ #include "app.hrc" #include "strings.hrc" #include "sdpage.hxx" -#include "frmview.hxx" +#ifndef SD_FRAME_VIEW +#include "FrameView.hxx" +#endif #include "sdresid.hxx" #include "drawdoc.hxx" -#include "docshell.hxx" -#include "sdwindow.hxx" -#include "drviewsh.hxx" -#include "grviewsh.hxx" +#include "DrawDocShell.hxx" +#ifndef SD_WINDOW_HXX +#include "Window.hxx" +#endif +#ifndef SD_GRAPHIC_VIEW_SHELL_HXX +#include "GraphicViewShell.hxx" +#endif +#ifndef SD_DRAW_VIEW_HXX #include "drawview.hxx" +#endif + +namespace sd { #define TABCONTROL_INITIAL_SIZE 500 @@ -101,9 +112,9 @@ |* \************************************************************************/ -BOOL SdDrawViewShell::GotoBookmark(const String& rBookmark) +BOOL DrawViewShell::GotoBookmark(const String& rBookmark) { - return (pDocSh->GotoBookmark(rBookmark)); + return (GetDocSh()->GotoBookmark(rBookmark)); } /************************************************************************* @@ -112,7 +123,7 @@ BOOL SdDrawViewShell::GotoBookmark(const String& rBookmark) |* \************************************************************************/ -void SdDrawViewShell::MakeVisible(const Rectangle& rRect, Window& rWin) +void DrawViewShell::MakeVisible(const Rectangle& rRect, Window& rWin) { // #98568# In older versions, if in X or Y the size of the object was smaller than the // visible area, the user-defined zoom was changed. This was decided to be a bug for 6.x, @@ -215,4 +226,4 @@ void SdDrawViewShell::MakeVisible(const Rectangle& rRect, Window& rWin) } } - +} |