diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:36:55 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:36:55 +0000 |
| commit | 7b962c6a79e325f23a5b38294e7ca7ed3966b451 (patch) | |
| tree | 5dfe5229ac0ab732d37e1a63e94bdaf6f96b84a5 /sw/inc/undobj.hxx | |
| parent | 47d2d8a733dbd4a843f92ecbc42c71e26f5817e9 (diff) | |
INTEGRATION: CWS sw8u10bf04 (1.38.32); FILE MERGED
2007/12/20 12:29:35 ama 1.38.32.2: RESYNC: (1.38-1.39); FILE MERGED
2007/12/19 15:11:52 ama 1.38.32.1: Fix #i84780#: Undo of merge cells damages bookmarks
Diffstat (limited to 'sw/inc/undobj.hxx')
| -rw-r--r-- | sw/inc/undobj.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 60647b2a48b0..1e2603a09579 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -4,9 +4,9 @@ * * $RCSfile: undobj.hxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: kz $ $Date: 2007-12-12 13:21:35 $ + * last change: $Author: vg $ $Date: 2008-01-29 08:36:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -960,7 +960,6 @@ public: virtual void Undo( SwUndoIter& ); virtual void Redo( SwUndoIter& ); - void MoveBoxCntnt( SwPaM& rPam, SwPosition& rPos, const _SaveFlyArr& ); void MoveBoxCntnt( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos ); void SetSelBoxes( const SwSelBoxes& rBoxes ); |