diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:07:20 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:07:20 +0000 |
| commit | c17daf40357964a4d340a0c4720d93c37f9cbd05 (patch) | |
| tree | 1827da7023043d2f0d49b8b5d41f5bc990cca01a /sw/inc/fesh.hxx | |
| parent | 62a498b05e70a225d0440edcb3a6699e38aaf5f0 (diff) | |
INTEGRATION: CWS aw024 (1.51.50); FILE MERGED
2006/09/08 18:50:33 aw 1.51.50.4: RESYNC: (1.53-1.54); FILE MERGED
2006/05/12 21:09:28 aw 1.51.50.3: RESYNC: (1.52-1.53); FILE MERGED
2005/09/17 17:01:00 aw 1.51.50.2: RESYNC: (1.51-1.52); FILE MERGED
2005/05/19 12:15:13 aw 1.51.50.1: #i39529#
Diffstat (limited to 'sw/inc/fesh.hxx')
| -rw-r--r-- | sw/inc/fesh.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 69fcf95c867a..210d3c268edf 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -4,9 +4,9 @@ * * $RCSfile: fesh.hxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: hr $ $Date: 2006-08-14 15:22:05 $ + * last change: $Author: ihi $ $Date: 2006-11-14 15:07:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -77,7 +77,6 @@ class SdrObject; class Color; class Outliner; class SotDataObject; -class SdrViewUserMarker; class SwFrmFmt; struct SwSortOptions; class SdrMarkList; @@ -198,11 +197,11 @@ struct SwGetCurColNumPara #define SW_TABCOLSEL_VERT 12 // <-- +class SdrDropMarkerOverlay; class SW_DLLPUBLIC SwFEShell : public SwEditShell { - SdrViewUserMarker *pChainFrom, - *pChainTo; + SdrDropMarkerOverlay *pChainFrom, *pChainTo; BOOL bCheckForOLEInCaption; SW_DLLPRIVATE SwFlyFrm *FindFlyFrm() const; |