diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 13:39:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 13:39:15 +0000 |
| commit | 84f9c52880d0503d8465fd0ff5ba6433ffc7c4b9 (patch) | |
| tree | efde0a0a68c370e5d71c431e3acb0d652d4188f4 /sd/source/ui/view/unmodpg.cxx | |
| parent | 630637f5df4aa0d6b1bbcdeefdb0964f0795f488 (diff) | |
INTEGRATION: CWS impresspresobjs (1.7.56); FILE MERGED
2005/11/24 12:42:36 cl 1.7.56.1: #123595# reworked presobj list and undo
Diffstat (limited to 'sd/source/ui/view/unmodpg.cxx')
| -rw-r--r-- | sd/source/ui/view/unmodpg.cxx | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 3ddceabef0ef..d8dc6d6ea089 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unmodpg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 07:19:33 $ + * last change: $Author: rt $ $Date: 2006-01-10 14:39:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -126,7 +126,7 @@ void ModifyPageUndoAction::Undo() pView = aIter.NextView(); } - pPage->SetAutoLayout(eOldAutoLayout, TRUE); + pPage->SetAutoLayout( eOldAutoLayout ); if (!pPage->IsMasterPage()) { @@ -153,14 +153,6 @@ void ModifyPageUndoAction::Undo() // Redisplay SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); - - // #67720# clear undo manager - if(mpManager) - { - // BEWARE: Do this as LAST action here since this will delete - // all actions which are added, inclusive to this one (!) - mpManager->Clear(); - } } /************************************************************************* @@ -183,7 +175,8 @@ void ModifyPageUndoAction::Redo() pView = aIter.NextView(); } - pPage->SetAutoLayout(eNewAutoLayout, TRUE); + // pPage->SetAutoLayout(eNewAutoLayout, TRUE); + pPage->eAutoLayout = eNewAutoLayout; if (!pPage->IsMasterPage()) { @@ -210,14 +203,6 @@ void ModifyPageUndoAction::Redo() // Redisplay SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); - - // #67720# clear undo manager - if(mpManager) - { - // BEWARE: Do this as LAST action here since this will delete - // all actions which are added, inclusive to this one (!) - mpManager->Clear(); - } } /************************************************************************* |