Kaydet (Commit) 60732d71 authored tarafından Rüdiger Timm's avatar Rüdiger Timm

INTEGRATION: CWS swqcore08 (1.35.136); FILE MERGED

2005/02/28 10:20:53 hbrinkm 1.35.136.1: #i42807# clear undo stack before changing of TOX properties, update TOX after changing properties
üst 62c40978
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: doc.cxx,v $ * $RCSfile: doc.cxx,v $
* *
* $Revision: 1.36 $ * $Revision: 1.37 $
* *
* last change: $Author: vg $ $Date: 2005-03-08 13:43:06 $ * last change: $Author: rt $ $Date: 2005-03-29 14:36:40 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
* *
* *
************************************************************************/ ************************************************************************/
#pragma hdrstop #pragma hdrstop
#ifndef _HINTIDS_HXX #ifndef _HINTIDS_HXX
...@@ -1325,12 +1324,20 @@ void SwDoc::ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew) ...@@ -1325,12 +1324,20 @@ void SwDoc::ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew)
{ {
if (DoesUndo()) if (DoesUndo())
{ {
DelAllUndoObj();
SwUndo * pUndo = new SwUndoTOXChange(&rTOX, rNew); SwUndo * pUndo = new SwUndoTOXChange(&rTOX, rNew);
AppendUndo(pUndo); AppendUndo(pUndo);
} }
rTOX = rNew; rTOX = rNew;
if (rTOX.ISA(SwTOXBaseSection))
{
static_cast<SwTOXBaseSection &>(rTOX).Update();
static_cast<SwTOXBaseSection &>(rTOX).UpdatePageNum();
}
} }
// #111827# // #111827#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment