summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-12-21 12:00:55 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-12-21 20:17:55 +0100
commit7cb140082905549808dd438d9276d06f5f234722 (patch)
treed6790f7f818c4c7f284195f577a66c89b720edea /sw
parent224a400f7c46548a22060659e74e33db2a02f5a0 (diff)
both branches start with the same code
no logic change intended Change-Id: Ic15315bd44e7e718aacac188500f755e7fd0bec6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127222 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/txtnode/fntcache.cxx18
1 files changed, 7 insertions, 11 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 7fb66120e7e8..faf31191c7e8 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1716,23 +1716,19 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
}
// Apply SpaceSum
- if ( nCh == CH_BLANK )
+ if (cChPrev == CH_BLANK)
+ {
+ // no Pixel is lost:
+ nSpaceSum += nOtherHalf;
+ }
+
+ if (nCh == CH_BLANK)
{
- if ( cChPrev == CH_BLANK )
- nSpaceSum += nOtherHalf;
if (i + 1 == sal_Int32(nCnt))
nSpaceSum += nSpaceAdd;
else
nSpaceSum += nHalfSpace;
}
- else
- {
- if ( cChPrev == CH_BLANK )
- {
- // no Pixel is lost:
- nSpaceSum += nOtherHalf;
- }
- }
cChPrev = nCh;
aKernArray[i-1] = nScrPos - nScr + nKernSum + nSpaceSum;