diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:14:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 17:14:00 +0000 |
| commit | f43ee16d3700b27ba96f2ef50b16698afba67fbe (patch) | |
| tree | d54e7db430ac7979b2bb9be4236ef8d6fefb0b97 /sw/inc/fesh.hxx | |
| parent | 639c3dad16fc92ac7425b8cdd4add438b3f509d4 (diff) | |
INTEGRATION: CWS swobjpos02 (1.30.52); FILE MERGED
2004/01/21 08:55:28 od 1.30.52.2: RESYNC: (1.30-1.31); FILE MERGED
2003/10/02 09:46:11 od 1.30.52.1: #i17567#, #i18732# <SwFEShell::CalcBoundRect(..)> - adjust signature
for negative positions and option 'FollowTextFlow'
Diffstat (limited to 'sw/inc/fesh.hxx')
| -rw-r--r-- | sw/inc/fesh.hxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index a22566ab65df..5352b023d976 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fesh.hxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: obo $ $Date: 2004-01-13 11:05:21 $ + * last change: $Author: hr $ $Date: 2004-02-02 18:14:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -319,11 +319,18 @@ public: SwRect GetObjRect() const; //Zum Verschieben von Flys mit der Tastatur SwRect GetFlyRect() const; - void CalcBoundRect( SwRect &rRect, RndStdIds nAnchorId, - SwRelationOrient eRelOrient = FRAME, - BOOL bMirror = FALSE, - Point* pRef = NULL, - Size* pPercent = NULL ) const; + // OD 18.09.2003 #i17567#, #108749#, #110354# - adjustments to allow + // negative vertical positions for fly frames anchored + // to paragraph or to character. + // OD 02.10.2003 #i18732# - adjustments for new option 'FollowTextFlow' + void CalcBoundRect( SwRect& _orRect, + const RndStdIds _nAnchorId, + const SwRelationOrient _eHoriRelOrient = FRAME, + const SwRelationOrient _eVertRelOrient = FRAME, + const bool _bFollowTextFlow = false, + bool _bMirror = false, + Point* _opRef = NULL, + Size* _opPercent = NULL ) const; // Groesse von Drawobjekten setzen void SetObjRect( const SwRect& rRect ); |