[ooo-build-commit] Branch 'ooo/master' - sw/source

[Jan Holesovsky]

 sw/source/core/doc/docdraw.cxx  |    2 ++
 sw/source/core/undo/docundo.cxx |    5 +++++
 2 files changed, 7 insertions(+)

New commits:
commit b52c78c095635710c9c645d28f719790408037bd
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Jun 4 16:21:29 2009 +0000

    CWS-TOOLING: integrate CWS clnoundo
    2009-05-18 09:40:22 +0200 wg  r271998 : i102011
    2009-04-28 12:20:24 +0200 cl  r271318 : CWS-TOOLING: rebase CWS clnoundo to trunk at 270723 (milestone: DEV300:m46)
    2009-04-02 11:37:14 +0200 cl  r270388 : #i100371# check valid positions all the time to avoid crashes during model lock
    2009-03-30 13:02:27 +0200 cl  r270219 : #i100371# do not create undo actions in drawing layer during load
    2009-03-30 12:59:41 +0200 cl  r270218 : #i100371# do not create undo actions in drawing layer during load
    2009-03-30 12:55:06 +0200 cl  r270217 : #i100371# do not create undo actions in drawing layer during load
    2009-03-30 12:53:27 +0200 cl  r270216 : #i100371# do not create undo actions in drawing layer during load
    2009-03-30 12:49:28 +0200 cl  r270215 : #i100371# added EnableUndo() and IsUndoEnabled()

diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 267d928..3befc37 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -637,6 +637,8 @@ void SwDoc::InitDrawModel()
     //Seite.
     pDrawModel = new SwDrawDocument( this );
 
+    pDrawModel->EnableUndo( DoesUndo() );
+
     String sLayerNm;
     sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Hell" ));
     nHell	= pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID();
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index aa45e8e..0d7e260 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
+#include <svx/svdmodel.hxx>
 
 #include <vcl/wrkwin.hxx>
 #include <doc.hxx>
@@ -112,6 +113,10 @@ bool SwDoc::IsUndoNoResetModified() const
 void SwDoc::DoUndo(bool bUn)
 {
     mbUndo = bUn;
+
+    SdrModel* pSdrModel = GetDrawModel();
+    if( pSdrModel )
+        pSdrModel->EnableUndo(bUn);
 }
 
 bool SwDoc::DoesUndo() const