diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-08 13:02:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-08 13:02:57 +0000 |
| commit | fc8ccfc3a29f36791dfef54c6c8a11bc9b29d3f2 (patch) | |
| tree | dc4b1bd373a905c249e34d8c570cd85b50541abf /sw/source/core/text | |
| parent | 1dd7d53340956ae25ba13949ff97e4a78f9f559d (diff) | |
INTEGRATION: CWS swobjpos03 (1.41.152); FILE MERGED
2004/02/16 10:00:35 od 1.41.152.3: RESYNC: (1.41-1.44); FILE MERGED
resolve merge conflicts.
2003/11/21 09:43:13 od 1.41.152.2: #113949# <SwTxtFrm::Format(..)> - adjustment for isolated positioning algorithms
#i22341# <SwTxtFrm::Format(..)> - use new method
<SwFlyAtCntFrm::CheckCharRectAndTopOfLine()>
2003/10/27 13:04:02 od 1.41.152.1: merging changes from swobjpos02
Diffstat (limited to 'sw/source/core/text')
| -rw-r--r-- | sw/source/core/text/frmform.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 37ba1e7f060d..bce9714cf5ef 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmform.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: kz $ $Date: 2004-02-26 15:31:50 $ + * last change: $Author: hr $ $Date: 2004-03-08 14:02:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1961,7 +1961,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) return; } - // OD 18.11.2003 #110978# - always check Writer fly frames, that are + // OD 18.11.2003 #113049# - always check Writer fly frames, that are // anchored to character. //sal_Bool bChkAtCnt = sal_False; const xub_StrLen nStrLen = GetTxtNode()->GetTxt().Len(); @@ -2112,7 +2112,11 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) { ++nAutoCnt; ASSERT( pFly->IsFlyAtCntFrm(), "Not at content, but autopos.?" ); - ((SwFlyAtCntFrm*)pFly)->CheckCharRect(); + // OD 11.11.2003 #i22341# + if ( pFly->IsFlyAtCntFrm() ) + { + static_cast<SwFlyAtCntFrm*>(pFly)->CheckCharRectAndTopOfLine(); + } // OD 07.10.2003 #110978# - no format of the fly frame /* |