diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-08 12:54:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-08 12:54:14 +0000 |
| commit | 29e4f25023a392cb5553e1a3d066fdba6764bde0 (patch) | |
| tree | 3cd14ee7e9e3701d1d6977b52243f913e6c96a70 /sw/inc/fesh.hxx | |
| parent | ab7319cefdb78188cbb797803d66fcee2334bde7 (diff) | |
INTEGRATION: CWS swobjpos03 (1.30.176); FILE MERGED
2004/02/16 10:33:21 od 1.30.176.3: RESYNC: (1.30-1.32); FILE MERGED
resolve merge conflict
2003/11/21 08:48:42 od 1.30.176.2: #i22341# class <SwFEShell>, method <CalcBoundRect(..)> - adjustments
for new vertical alignment at top of text line.
2003/10/27 13:03:13 od 1.30.176.1: merging changes from swobjpos02
Diffstat (limited to 'sw/inc/fesh.hxx')
| -rw-r--r-- | sw/inc/fesh.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index a03634b96b06..84c150fee3fb 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fesh.hxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: kz $ $Date: 2004-02-26 11:37:35 $ + * last change: $Author: hr $ $Date: 2004-03-08 13:54:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -326,10 +326,12 @@ public: // negative vertical positions for fly frames anchored // to paragraph or to character. // OD 02.10.2003 #i18732# - adjustments for new option 'FollowTextFlow' + // OD 12.11.2003 #i22341# - adjustments for new vertical alignment at top of line void CalcBoundRect( SwRect& _orRect, const RndStdIds _nAnchorId, const SwRelationOrient _eHoriRelOrient = FRAME, const SwRelationOrient _eVertRelOrient = FRAME, + const SwPosition* _pToCharCntntPos = NULL, const bool _bFollowTextFlow = false, bool _bMirror = false, Point* _opRef = NULL, |