sw/source/core/text/txtfld.cxx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
New commits: commit 0453702ea9cf48fc5764bb7d2d6685e0234e09cb Author: Vasily Melenchuk <[email protected]> AuthorDate: Tue Jun 23 08:45:54 2020 +0300 Commit: Vasily Melenchuk <[email protected]> CommitDate: Wed Jun 24 08:10:05 2020 +0200 tdf#83309: sw: do not create bullet with no char On some machines (depending on fonts installed) creation of SwBulletPortion with bullet = \0 leads to drawing a bullet as a empty rectangle. Change-Id: I2826944f2278e8c9a6c740b11b69d2e4e5108158 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96711 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> (cherry picked from commit 5ed96c798679a1613b058a11b30cce4ba0ffd920) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96886 Reviewed-by: Vasily Melenchuk <[email protected]> diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 463e7668f4e7..e81ec0e36232 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -650,11 +650,14 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con lcl_setRedlineAttr( rInf, *pTextNd, pNumFnt ); // --> OD 2008-01-23 #newlistelevelattrs# - pRet = new SwBulletPortion( rNumFormat.GetBulletChar(), - pTextNd->GetLabelFollowedBy(), - std::move(pNumFnt), - bLeft, bCenter, nMinDist, - bLabelAlignmentPosAndSpaceModeActive ); + if (rNumFormat.GetBulletChar()) + { + pRet = new SwBulletPortion(rNumFormat.GetBulletChar(), + pTextNd->GetLabelFollowedBy(), + std::move(pNumFnt), + bLeft, bCenter, nMinDist, + bLabelAlignmentPosAndSpaceModeActive); + } } else { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
