summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMalte Timmermann <mt@openoffice.org>2001-12-13 12:09:16 +0000
committerMalte Timmermann <mt@openoffice.org>2001-12-13 12:09:16 +0000
commit1c446895b473a2052a0800e441ec2d20749605bf (patch)
treeb204a830185b8d8d93f2b7a5b2c1a4dc2f39ab3c /svx
parent732fd83e08792fd463c71059b92f0e93b8a4d404 (diff)
#95819# CreateLines: Don't use linebreak for height calculation
Diffstat (limited to 'svx')
-rw-r--r--svx/source/editeng/impedit3.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index f8367b9a26d5..f2947d841dcd 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impedit3.cxx,v $
*
- * $Revision: 1.54 $
+ * $Revision: 1.55 $
*
- * last change: $Author: mt $ $Date: 2001-11-28 17:23:12 $
+ * last change: $Author: mt $ $Date: 2001-12-13 13:09:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1201,10 +1201,14 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
sal_uInt16 nTPos = pLine->GetStart();
for ( sal_uInt16 nP = pLine->GetStartPortion(); nP <= pLine->GetEndPortion(); nP++ )
{
- SeekCursor( pNode, nTPos+1, aTmpFont );
- aTmpFont.SetPhysFont( GetRefDevice() );
- RecalcFormatterFontMetrics( aFormatterMetrics, aTmpFont );
TextPortion* pTP = pParaPortion->GetTextPortions().GetObject( nP );
+ // #95819# problem with hard font height attribute, when everthing but the line break has this attribute
+ if ( pTP->GetKind() != PORTIONKIND_LINEBREAK )
+ {
+ SeekCursor( pNode, nTPos+1, aTmpFont );
+ aTmpFont.SetPhysFont( GetRefDevice() );
+ RecalcFormatterFontMetrics( aFormatterMetrics, aTmpFont );
+ }
nTPos += pTP->GetLen();
}
sal_uInt16 nLineHeight = aFormatterMetrics.GetHeight();