From 770379fbca015eb9002cba78105e70fe9dd9bdc0 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Tue, 10 Jan 2006 13:29:30 +0000 Subject: INTEGRATION: CWS impresspresobjs (1.33.56); FILE MERGED 2005/12/27 13:09:47 cl 1.33.56.3: RESYNC: (1.34-1.35); FILE MERGED 2005/11/28 17:15:45 cl 1.33.56.2: RESYNC: (1.33-1.34); FILE MERGED 2005/11/24 12:25:32 cl 1.33.56.1: #123595# register undo manager and undo factory at drawing layer model --- sd/source/ui/docshell/docshell.cxx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'sd/source/ui/docshell/docshell.cxx') diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 9310e1c991ed..7ef9cae47e91 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docshell.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: rt $ $Date: 2005-12-14 16:54:19 $ + * last change: $Author: rt $ $Date: 2006-01-10 14:29:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -159,6 +159,8 @@ #endif #include "unomodel.hxx" #include "formatclipboard.hxx" +#include "undo/undomanager.hxx" +#include "undo/undofactory.hxx" using namespace sd; #define DrawDocShell @@ -210,7 +212,9 @@ void DrawDocShell::Construct() pDoc = new SdDrawDocument(eDocType, this); SetModel( new SdXImpressDocument( this ) ); SetPool( &pDoc->GetItemPool() ); - pUndoManager = new SfxUndoManager; + pUndoManager = new sd::UndoManager; + pDoc->SetSdrUndoManager( pUndoManager ); + pDoc->SetSdrUndoFactory( new sd::UndoFactory ); UpdateTablePointers(); SetStyleFamily(5); //CL: eigentlich SFX_STYLE_FAMILY_PSEUDO } @@ -284,7 +288,11 @@ DrawDocShell::~DrawDocShell() SetDocShellFunction(0); delete pFontList; + + if( pDoc ) + pDoc->SetSdrUndoManager( 0 ); delete pUndoManager; + if(pFormatClipboard) delete pFormatClipboard; -- cgit