diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-01-20 11:50:36 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-01-20 11:50:36 +0000 |
| commit | 8b4576898f9fec47ccca5cc54bddcb20b1cd8685 (patch) | |
| tree | ca13162febb2d2616c14a01e3a571be3abc5e9c6 /sd/source/ui/view/grviewsh.cxx | |
| parent | f6f13187bea4893d55dcfe7cf516166c8ece9742 (diff) | |
INTEGRATION: CWS impress1 (1.2.238); FILE MERGED
2004/01/09 14:52:35 af 1.2.238.4: #111996# Using the FrameView directly in the constructors of the view shells.
2003/12/04 09:22:33 af 1.2.238.3: #111996# Re-inserted the pOldShell argument to the constructor.
2003/09/24 16:08:54 af 1.2.238.2: #111996# Support of new member meShellType.
2003/09/17 08:17:06 af 1.2.238.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd.
Diffstat (limited to 'sd/source/ui/view/grviewsh.cxx')
| -rw-r--r-- | sd/source/ui/view/grviewsh.cxx | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 2bc40ea94907..70cb1ae392c7 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: grviewsh.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ka $ $Date: 2001-10-22 13:36:57 $ + * last change: $Author: obo $ $Date: 2004-01-20 12:50:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,13 +59,10 @@ * ************************************************************************/ -#pragma hdrstop +#include "GraphicViewShell.hxx" -#ifndef _SD_GRVIEWSH_HXX -#include "grviewsh.hxx" -#endif - +namespace sd { /************************************************************************* |* @@ -73,10 +70,14 @@ |* \************************************************************************/ -SdGraphicViewShell::SdGraphicViewShell( SfxViewFrame* pFrame, SfxViewShell *pOldShell ) : - SdDrawViewShell( pFrame, pOldShell ) +GraphicViewShell::GraphicViewShell ( + SfxViewFrame* pFrame, + ViewShellBase& rViewShellBase, + FrameView* pFrameView) + : DrawViewShell (pFrame, rViewShellBase, PK_STANDARD, pFrameView) { //Construct( pDocSh ); + meShellType = ST_DRAW; } /************************************************************************* @@ -85,11 +86,12 @@ SdGraphicViewShell::SdGraphicViewShell( SfxViewFrame* pFrame, SfxViewShell *pOld |* \************************************************************************/ -SdGraphicViewShell::SdGraphicViewShell(SfxViewFrame* pFrame, - const SdDrawViewShell& rShell) : - SdDrawViewShell( pFrame, rShell ) +GraphicViewShell::GraphicViewShell(SfxViewFrame* pFrame, + const DrawViewShell& rShell) : + DrawViewShell( pFrame, rShell ) { //Construct( pDocSh ); + meShellType = ST_DRAW; } /************************************************************************* @@ -98,7 +100,7 @@ SdGraphicViewShell::SdGraphicViewShell(SfxViewFrame* pFrame, |* \************************************************************************/ -SdGraphicViewShell::~SdGraphicViewShell() +GraphicViewShell::~GraphicViewShell() { } @@ -108,7 +110,7 @@ SdGraphicViewShell::~SdGraphicViewShell() |* \************************************************************************/ -void SdGraphicViewShell::Construct() +void GraphicViewShell::Construct() { // Shells fuer Object Bars erzeugen //SfxShell* pObjBarShell = new SdDrawStdObjectBar(this, pDrView); @@ -124,4 +126,4 @@ void SdGraphicViewShell::Construct() } - +} // end of namespace sd |