diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-01-20 10:24:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-01-20 10:24:43 +0000 |
| commit | ff0351ade13c52572b6de663d5b6756acdbbfcd6 (patch) | |
| tree | 72afd1ba52c35988598058b6edbe2201da82fe2c /sd/source/ui/func/undolayer.cxx | |
| parent | 3f2f53f20ffa8187b958b872eb5331e3ac1e7eb0 (diff) | |
INTEGRATION: CWS impress1 (1.1.218); FILE MERGED
2003/09/17 09:06:11 af 1.1.218.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd.
Diffstat (limited to 'sd/source/ui/func/undolayer.cxx')
| -rw-r--r-- | sd/source/ui/func/undolayer.cxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx index 3e4d9d8afe8d..cc5db95c3157 100644 --- a/sd/source/ui/func/undolayer.cxx +++ b/sd/source/ui/func/undolayer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: undolayer.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: cl $ $Date: 2002-12-12 18:39:57 $ + * last change: $Author: obo $ $Date: 2004-01-20 11:24:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,9 +61,11 @@ #include "undolayer.hxx" -#include "docshell.hxx" +#include "DrawDocShell.hxx" #include "drawdoc.hxx" -#include "drviewsh.hxx" +#ifndef SD_DRAW_VIEW_SHELL_HXX +#include "DrawViewShell.hxx" +#endif #include "strings.hrc" #include "sdresid.hxx" @@ -90,10 +92,11 @@ SdLayerModifyUndoAction::SdLayerModifyUndoAction( void SdLayerModifyUndoAction::Undo() { - SdDrawDocShell* pDocSh = pDoc->GetDocSh(); + ::sd::DrawDocShell* pDocSh = pDoc->GetDocSh(); if( pDocSh ) { - SdDrawViewShell* pDrViewSh = PTR_CAST( SdDrawViewShell, pDocSh->GetViewShell() ); + ::sd::DrawViewShell* pDrViewSh = + PTR_CAST(::sd::DrawViewShell, pDocSh->GetViewShell() ); if( pDrViewSh ) { pDrViewSh->ModifyLayer( mpLayer, maOldLayerName, mbOldIsVisible, mbOldIsLocked, mbOldIsPrintable ); @@ -103,15 +106,14 @@ void SdLayerModifyUndoAction::Undo() void SdLayerModifyUndoAction::Redo() { - SdDrawDocShell* pDocSh = pDoc->GetDocSh(); + ::sd::DrawDocShell* pDocSh = pDoc->GetDocSh(); if( pDocSh ) { - SdDrawViewShell* pDrViewSh = PTR_CAST( SdDrawViewShell, pDocSh->GetViewShell() ); + ::sd::DrawViewShell* pDrViewSh = + PTR_CAST(::sd::DrawViewShell, pDocSh->GetViewShell() ); if( pDrViewSh ) { pDrViewSh->ModifyLayer( mpLayer, maNewLayerName, mbNewIsVisible, mbNewIsLocked, mbNewIsPrintable ); } } } - - |