vcl/source/outdev/textline.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit baf95a7e8e7312891aed73adb26de74e5bc9ad62
Author: Heiko Tietze <heiko.tie...@documentfoundation.org>
AuthorDate: Wed Jun 19 12:14:05 2024 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Jun 20 09:11:46 2024 +0200
Resolves tdf#153223 - Suppress variable line height when skia is off
Change-Id: I9194c25bf2fc104574bd27e6b8683b63111e6ad8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169192
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 3155cb1a1681..fa9f481c201c 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -28,6 +28,7 @@
#include <vcl/metaact.hxx>
#include <vcl/settings.hxx>
#include <vcl/virdev.hxx>
+#include <vcl/skia/SkiaHelper.hxx>
#include <drawmode.hxx>
#include <salgdi.hxx>
@@ -1036,7 +1037,12 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos,
const Point& rEndPos, to
// #109280# make sure the waveline does not exceed the descent to avoid
paint problems
LogicalFontInstance* pFontInstance = mpFontInstance.get();
- if (nWaveHeight > pFontInstance->mxFontMetric->GetWavelineUnderlineSize())
+ if (nWaveHeight > pFontInstance->mxFontMetric->GetWavelineUnderlineSize()
+ // tdf#153223 polyline with lineheight >0 not drawn when skia is off
+#ifdef MACOSX
+ || !SkiaHelper::isVCLSkiaEnabled()
+#endif
+ )
{
nWaveHeight = pFontInstance->mxFontMetric->GetWavelineUnderlineSize();
// tdf#124848 hairline
