diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-07 13:06:08 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-07 13:06:08 +0100 |
| commit | a27e4b8ca5d84790c04a7351c4ea5ef004a0bbea (patch) | |
| tree | e400e267e96a54f7c37896e7cdccca345b2616f0 /sw/source/core/frmedt/tblsel.cxx | |
| parent | 4f65368101fde95f5bf97f114290b494a80ef051 (diff) | |
| parent | 5b7dc4c9b5c1190edce19e568676270f315c31e6 (diff) | |
removetooltypes01: Rebase to DEV300m99
Diffstat (limited to 'sw/source/core/frmedt/tblsel.cxx')
| -rw-r--r-- | sw/source/core/frmedt/tblsel.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 3353e8d2f9ac..4006e30922e8 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -28,15 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <hintids.hxx> #include <editeng/boxitem.hxx> #include <editeng/protitem.hxx> + +#include <hintids.hxx> #include <fmtanchr.hxx> #include <fmtfsize.hxx> #include <frmatr.hxx> #include <tblsel.hxx> #include <crsrsh.hxx> #include <doc.hxx> +#include <IDocumentUndoRedo.hxx> #include <docary.hxx> #include <pam.hxx> #include <ndtxt.hxx> @@ -50,7 +52,7 @@ #include <rootfrm.hxx> #include <viscrs.hxx> #include <swtblfmt.hxx> -#include <undobj.hxx> +#include <UndoTable.hxx> #include <mvsave.hxx> // OD 26.08.2003 #i18103# #include <sectfrm.hxx> @@ -1449,11 +1451,16 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, SwNodeIndex aSttNdIdx( *rPt.pSelBox->GetSttNd(), 1 ); // ein Node muss in der Box erhalten bleiben (sonst wird beim // Move die gesamte Section geloescht) + bool const bUndo(pDoc->GetIDocumentUndoRedo().DoesUndo()); if( pUndo ) - pDoc->DoUndo( sal_False ); + { + pDoc->GetIDocumentUndoRedo().DoUndo(false); + } pDoc->AppendTxtNode( *aPam.GetPoint() ); if( pUndo ) - pDoc->DoUndo( sal_True ); + { + pDoc->GetIDocumentUndoRedo().DoUndo(bUndo); + } SwNodeRange aRg( aSttNdIdx, aPam.GetPoint()->nNode ); rInsPosNd++; if( pUndo ) |