diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:49:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:49:43 +0000 |
| commit | b2dcd171782af0ac52d86253119c475aea778c8f (patch) | |
| tree | 03bd2d193dc62c433a939bd1581be9a5c2ab28c1 /sw/source/core/undo/undobj1.cxx | |
| parent | 35d4f8fd53c196cbcc4e1353b1febdfb59637f91 (diff) | |
INTEGRATION: CWS writercorehandoff (1.9.172); FILE MERGED
2006/01/19 08:50:12 fme 1.9.172.6: #i50348# General cleanup - removed unused header files, functions, members, declarations
2005/11/18 14:53:36 fme 1.9.172.5: #i50348# Make SwDoc accessible via interfaces
2005/09/28 14:01:13 tra 1.9.172.4: #i50348#
2005/09/13 14:51:42 tra 1.9.172.3: RESYNC: (1.9-1.10); FILE MERGED
2005/06/07 14:14:34 fme 1.9.172.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:28:17 tra 1.9.172.1: Unnecessary includes removed #i50348#
Diffstat (limited to 'sw/source/core/undo/undobj1.cxx')
| -rw-r--r-- | sw/source/core/undo/undobj1.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 56ca08feb23d..a3f20610b588 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -4,9 +4,9 @@ * * $RCSfile: undobj1.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-09 05:19:42 $ + * last change: $Author: hr $ $Date: 2006-08-14 16:49:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,6 @@ * ************************************************************************/ - #pragma hdrstop #ifndef _HINTIDS_HXX @@ -62,9 +61,6 @@ #ifndef _FLYFRM_HXX //autogen #include <flyfrm.hxx> #endif -#ifndef _FMTFLCNT_HXX //autogen -#include <fmtflcnt.hxx> -#endif #ifndef _UNDOBJ_HXX #include <undobj.hxx> #endif @@ -89,9 +85,6 @@ #ifndef _NDTXT_HXX #include <ndtxt.hxx> #endif -#ifndef _HINTS_HXX -#include <hints.hxx> -#endif // OD 26.06.2003 #108784# #ifndef _DCONTACT_HXX #include <dcontact.hxx> @@ -108,9 +101,6 @@ inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); } SwUndoFlyBase::SwUndoFlyBase( SwFrmFmt* pFormat, USHORT nUndoId ) : SwUndo( nUndoId ), pFrmFmt( pFormat ) { -#ifdef COMPACT - pFormat->GetDoc()->DelUndoGroups(); -#endif } SwUndoFlyBase::~SwUndoFlyBase() @@ -370,7 +360,7 @@ void SwUndoInsLayFmt::Repeat( SwUndoIter& rUndoIter ) else ASSERT( FALSE, "was fuer ein Anker ist es denn nun?" ); - SwFrmFmt* pFlyFmt = pDoc->CopyLayoutFmt( *pFrmFmt, aAnchor ); + SwFrmFmt* pFlyFmt = pDoc->CopyLayoutFmt( *pFrmFmt, aAnchor, true, true ); rUndoIter.pSelFmt = pFlyFmt; rUndoIter.pLastUndoObj = this; |