diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-04 12:18:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-04 12:18:57 +0000 |
| commit | f4532b5dc0fb760b73104da7aa47909443469183 (patch) | |
| tree | ebac9c4e125e4a3cb3718aee696e5d04bec896a8 /sw/inc/fesh.hxx | |
| parent | 56483f6b5d82fe908d35c320ec6b2c5c6c1f66d1 (diff) | |
INTEGRATION: CWS aig02 (1.28.60); FILE MERGED
2003/06/27 16:53:54 od 1.28.60.3: #108784# - further adjustments for support of drawing objects in header/footer
2003/06/27 16:02:05 dvo 1.28.60.2: #108784# enable drag&drop of shapes (but not controls) into header/footer
2003/06/26 18:18:54 od 1.28.60.1: #108784# - further adjustments for support of drawing objects in header/footer
Diffstat (limited to 'sw/inc/fesh.hxx')
| -rw-r--r-- | sw/inc/fesh.hxx | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 401ac2e49052..66a99e18514c 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fesh.hxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: vg $ $Date: 2003-06-20 09:35:54 $ + * last change: $Author: vg $ $Date: 2003-07-04 13:18:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,6 +71,11 @@ #include <flyenum.hxx> #endif +// OD 25.06.2003 #108784# +#ifndef _SVDTYPES_HXX +#include <svx/svdtypes.hxx> +#endif + #include <vector> class SwFlyFrm; @@ -92,6 +97,7 @@ class SotDataObject; class SdrViewUserMarker; class SwFrmFmt; struct SwSortOptions; +class SdrMarkList; enum FrmType { @@ -211,7 +217,8 @@ class SwFEShell : public SwEditShell void Scroll( const Point &rPt ); - void ChangeOpaque( BYTE nLayerId ); + // OD 25.06.2003 #108784# - correct type of 1st parameter + void ChangeOpaque( SdrLayerID nLayerId ); void GetStartEndCell( SwLayoutFrm *&prStart, SwLayoutFrm *&prEnd ); @@ -232,6 +239,10 @@ class SwFEShell : public SwEditShell const Point& rInsPt, BOOL bIsMove, BOOL bSelectInsert ); + // get list of marked SdrObjects; + // helper method for GetSelFrmType, IsSelContainsControl + const SdrMarkList* _GetMarkList() const; + public: TYPEINFO(); SwFEShell( SwDoc& rDoc, Window *pWin, @@ -295,6 +306,11 @@ public: USHORT GetFrmType( const Point *pPt, BOOL bStopAtFly ) const; USHORT GetSelFrmType() const; //Selektion (Drawing) + /** #108784# check whether selected frame contains a control; + * companion method to GetSelFrmType, used for preventing + * drag&drop of controls into header */ + bool IsSelContainsControl() const; + ObjCntType GetObjCntType( const Point &rPt, SdrObject *&rpObj ) const; ObjCntType GetObjCntTypeOfSelection( SdrObject** ppObj = 0 ) const; @@ -495,7 +511,8 @@ public: void UnGroupSelection(); //Die Einzelobjekte sind Selektiert //Es koennen noch immer Gruppen dabei sein. - BOOL IsGroupAllowed() const; + // OD 27.06.2003 #108784# - change return type. + bool IsGroupAllowed() const; void MirrorSelection( BOOL bHorizontal ); //Bei FALSE Vertikal |