diff options
| author | Andreas Martens <ama@openoffice.org> | 2000-10-16 12:11:59 +0000 |
|---|---|---|
| committer | Andreas Martens <ama@openoffice.org> | 2000-10-16 12:11:59 +0000 |
| commit | 23a959ddd921adf134e175c0d926a8faf65830e6 (patch) | |
| tree | 72b7481a149f930159529ac9dc31c2bb75c7d81e /sw/source/core/text/frmform.cxx | |
| parent | ed635bbc9e6c1722142bb071a0b915c1162fd1fd (diff) | |
New: Double line portions in a line
Diffstat (limited to 'sw/source/core/text/frmform.cxx')
| -rw-r--r-- | sw/source/core/text/frmform.cxx | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 14d9fcb1e7b1..04f8056b5aab 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:08:24 $ + * last change: $Author: ama $ $Date: 2000-10-16 13:11:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,6 +149,9 @@ #ifndef _SECTFRM_HXX #include <sectfrm.hxx> // SwSectionFrm #endif +#ifndef _PORMULTI_HXX +#include <pormulti.hxx> // SwMultiPortion +#endif #ifndef PRODUCT #ifndef _FRMFMT_HXX @@ -1321,7 +1324,17 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf, if( pFld ) { pRest->TakeNextOffset( pFld ); - rInf.SetRest( pRest ); + xub_StrLen nEndOf; + // If we get a field portion rest in a multi-line part of the + // text, we have to create the surrounding multi-portion, too. + if( GetOfst() && 0 < (nEndOf = rInf.EndOfMulti( GetOfst()-1) ) ) + { + SwMultiPortion* pTmp = new SwMultiPortion( nEndOf ); + pTmp->SetFldRest( pRest ); + rInf.SetRest( pTmp ); + } + else + rInf.SetRest( pRest ); } else delete pRest; |