Index: sc/source/core/data/drwlayer.cxx
===================================================================
--- sc/source/core/data/drwlayer.cxx	(revision 1496175)
+++ sc/source/core/data/drwlayer.cxx	(working copy)
@@ -866,6 +866,7 @@
 
 	DELETEZ(pUndoGroup);
 	bRecording = sal_True;
+    SetAllowToRecordTextEditActionsInUndo(sal_False);
 }
 
 SdrUndoGroup* ScDrawLayer::GetCalcUndo()
@@ -875,6 +876,7 @@
 	SdrUndoGroup* pRet = pUndoGroup;
 	pUndoGroup = NULL;
 	bRecording = sal_False;
+    SetAllowToRecordTextEditActionsInUndo(sal_True);
 	return pRet;
 }
 
Index: svx/inc/svx/svdmodel.hxx
===================================================================
--- svx/inc/svx/svdmodel.hxx	(revision 1496175)
+++ svx/inc/svx/svdmodel.hxx	(working copy)
@@ -217,7 +217,7 @@
 	sal_uInt16          nStreamNumberFormat;
 	sal_uInt16          nDefaultTabulator;
 	sal_uInt32          nMaxUndoCount;
-	FASTBOOL        bSaveNative;
+	FASTBOOL            mbAllowToRecordTextEditActionsInUndo;
 	sal_Bool            bStarDrawPreviewMode;
 
 
@@ -488,12 +488,9 @@
 	FASTBOOL        IsSaveCompressed() const                   { return bSaveCompressed; }
 	void            SetSaveCompressed(FASTBOOL bJa=sal_True)       { bSaveCompressed=bJa; }
 
-	// Schaltet man dieses Flag auf sal_True, so werden
-	// Grafikobjekte mit gesetztem Native-Link
-	// native gespeichert.
-	// Default=FALSE. Flag ist nicht persistent.
-	FASTBOOL        IsSaveNative() const                       { return bSaveNative; }
-	void            SetSaveNative(FASTBOOL bJa=sal_True)           { bSaveNative=bJa; }
+    // 
+    FASTBOOL GetAllowToRecordTextEditActionsInUndo() const { return mbAllowToRecordTextEditActionsInUndo; }
+    void SetAllowToRecordTextEditActionsInUndo(FASTBOOL bNew) { mbAllowToRecordTextEditActionsInUndo = bNew; }
 
 	// Schaltet man dieses Flag auf sal_True, so werden die Grafiken
 	// von Grafikobjekten:
Index: svx/source/svdraw/svdedxv.cxx
===================================================================
--- svx/source/svdraw/svdedxv.cxx	(revision 1496175)
+++ svx/source/svdraw/svdedxv.cxx	(working copy)
@@ -768,7 +768,7 @@
 			if( mxSelectionController.is() )
 				mxSelectionController->onSelectionHasChanged();
 
-            if(IsUndoEnabled())
+            if(IsUndoEnabled() && GetModel() && GetModel()->GetAllowToRecordTextEditActionsInUndo())
             {
                 SdrUndoManager* pSdrUndoManager = getSdrUndoManagerForEnhancedTextEdit();
             
@@ -854,7 +854,7 @@
     SdrUndoManager* pUndoEditUndoManager = 0;
     bool bNeedToUndoSavedRedoTextEdit(false);
 
-    if(IsUndoEnabled() && GetModel() && pTEObj && pTEOutliner)
+    if(IsUndoEnabled() && GetModel() && pTEObj && pTEOutliner && GetModel()->GetAllowToRecordTextEditActionsInUndo())
     {
         // change back the UndoManager to the remembered original one
         ::svl::IUndoManager* pOriginal = pTEOutliner->SetUndoManager(mpOldTextEditUndoManager);
Index: svx/source/svdraw/svdmodel.cxx
===================================================================
--- svx/source/svdraw/svdmodel.cxx	(revision 1496175)
+++ svx/source/svdraw/svdmodel.cxx	(working copy)
@@ -150,7 +150,7 @@
 	bPageNotValid=sal_False;
 	bSavePortable=sal_False;
 	bSaveCompressed=sal_False;
-	bSaveNative=sal_False;
+	mbAllowToRecordTextEditActionsInUndo=sal_True;
 	bSwapGraphics=sal_False;
 	nSwapGraphicsMode=SDR_SWAPGRAPHICSMODE_DEFAULT;
 	bSaveOLEPreview=sal_False;