summaryrefslogtreecommitdiff
path: root/editeng/source/editeng/impedit2.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-08-03 08:41:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-03 11:12:07 +0200
commite54777276d28e6bbceefa07e260926c81790938c (patch)
tree54aee65d9ab60e0dafbd574c1d0849b516af2367 /editeng/source/editeng/impedit2.cxx
parent32090b018d9ff81659a4c9ed41c64109ebebe4fc (diff)
loplugin:flatten in configmgr..i18nutil
Change-Id: Idaeed33df4f1dd1b2acbdaf8a895c5d56c3ca14c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99980 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng/source/editeng/impedit2.cxx')
-rw-r--r--editeng/source/editeng/impedit2.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index d562037cc237..a94fcf958722 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4185,18 +4185,18 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
// I find it not so good, but Writer3 feature:
// Check if distance by LineSpacing > Lower: this value is not
// stuck in the height of PrevPortion.
- if ( !pPrev->IsInvalid() )
+ if ( pPrev->IsInvalid() )
+ return;
+
+ nExtraSpace = GetYValue( lcl_CalcExtraSpace( rPrevLSItem ) );
+ if ( nExtraSpace > nPrevLower )
{
- nExtraSpace = GetYValue( lcl_CalcExtraSpace( rPrevLSItem ) );
- if ( nExtraSpace > nPrevLower )
+ sal_uInt16 nMoreLower = nExtraSpace - nPrevLower;
+ // Paragraph becomes 'bigger', 'grows' downwards:
+ if ( nMoreLower > pPortion->nFirstLineOffset )
{
- sal_uInt16 nMoreLower = nExtraSpace - nPrevLower;
- // Paragraph becomes 'bigger', 'grows' downwards:
- if ( nMoreLower > pPortion->nFirstLineOffset )
- {
- pPortion->nHeight += ( nMoreLower - pPortion->nFirstLineOffset );
- pPortion->nFirstLineOffset = nMoreLower;
- }
+ pPortion->nHeight += ( nMoreLower - pPortion->nFirstLineOffset );
+ pPortion->nFirstLineOffset = nMoreLower;
}
}
}