diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-10-27 16:41:30 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-10-28 07:01:59 +0100 |
| commit | dc44470620857fae533246f4cb1038b3e9d2b2bd (patch) | |
| tree | 8040e6232e860cc33098d9e848411c471dd22fc3 /vcl | |
| parent | fdfd3638a3a2ca099cc47f8eb0d449f4c64fd200 (diff) | |
tdf#137804 Qt5 don't paint empty strings
For a test I added a SAL_WARN, but that created many more debug
messages then expected, just when opening the print dialog. So
this just handles the crash like the CairoTextRender variant of
DrawTextLayout does, by returning early.
Change-Id: Ie5b58ebbba02dace0e777b60fcbc3b9f46ea9d66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104893
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit feb5985b463974476985dee83376067941d77da0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104845
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qt5/Qt5Graphics_Text.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx index 4ba009106d26..ded886efd648 100644 --- a/vcl/qt5/Qt5Graphics_Text.cxx +++ b/vcl/qt5/Qt5Graphics_Text.cxx @@ -197,6 +197,10 @@ void Qt5Graphics::DrawTextLayout(const GenericSalLayout& rLayout) positions.push_back(QPointF(aPos.X(), aPos.Y())); } + // seems to be common to try to layout an empty string... + if (positions.empty()) + return; + if (nOrientation) pQt5Layout->SetOrientation(nOrientation); |