summaryrefslogtreecommitdiff
path: root/sw/source/core/txtnode/fntcache.cxx
diff options
context:
space:
mode:
authorKhaled Hosny <khaled@aliftype.com>2022-08-31 21:27:25 +0200
committerخالد حسني <khaled@aliftype.com>2022-08-31 23:41:38 +0200
commit912f238343b99d89766c9ddde3f211454a59ae0c (patch)
tree90851d4175d81819aa4420d5219385740c3c3371 /sw/source/core/txtnode/fntcache.cxx
parent7d873ed7043c4f7d671d443bcf92369b5fe37224 (diff)
tdf#150710: Don’t draw kashida when drawing bullet
Passing the KashidaArray to the DrawText() calls for bullet drawing has the undesired effect of drawing the Kashida’s in bullet color and without overlap so they look wider than the regularly drawn ones. This is a regression from: commit 3901e029bd39575f700e69a73818565d62226a23 Author: Khaled Hosny <khaled@aliftype.com> Date: Mon Aug 8 22:08:37 2022 +0200 tdf#104921: Cleanup Kashida insertion logic Change-Id: I0c521249a9ffdd6b0cc273f0742bdeec53975a42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139133 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@aliftype.com>
Diffstat (limited to 'sw/source/core/txtnode/fntcache.cxx')
-rw-r--r--sw/source/core/txtnode/fntcache.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 5e1a04fe7160..fa17f0617f13 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1351,7 +1351,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
rInf.GetOut().DrawTextArray( aTextOriginPos, rInf.GetText(),
aKernArray, aKashidaArray, sal_Int32(rInf.GetIdx()), 1 );
if( bBullet )
- rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, aKernArray, aKashidaArray,
+ rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, aKernArray, {},
rInf.GetIdx() ? 1 : 0, 1 );
}
else
@@ -1513,7 +1513,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
}
}
rInf.GetOut().DrawTextArray( aTextOriginPos, aBulletOverlay, aKernArray,
- aKashidaArray, nTmpIdx , nLen );
+ {}, nTmpIdx , nLen );
pTmpFont->SetColor( aPreviousColor );
pTmpFont->SetUnderline(aPreviousUnderline);