diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2015-11-07 18:45:31 +1000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-10 10:54:18 +0000 |
| commit | f4a4bbce92fe753678b218c265f7180c306ddf73 (patch) | |
| tree | 9b3fdf67b515a412baaebb7c3a96f7a99028e5ec /vcl/win | |
| parent | a415a66f1af0944cac631bfd6b75c3d569e6f1df (diff) | |
tdf#95650: Replace wrong assertion with condition
When UniscribeLayout::LayoutText(ImplLayoutArgs & rArgs) is run with
BiDiRtl flag, and some skipped VisualItems was reversed in lines 908-927,
it's possible that they will arrive in reverse order to the code adjusting
mnSubStringMin, so this assertion may fire.
This situation is not erroneous, so simply replacing the assert with "if".
Change-Id: Icb244502dd00b4c08a2c5192369ee66d743b0dcc
Reviewed-on: https://gerrit.libreoffice.org/19835
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 34bde4fc5ba6..0dfce848c3d2 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -967,8 +967,8 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) if (rArgs.mnMinCharPos >= rVisualItem.mnEndCharPos) { // fdo#47553 adjust "guessed" min (maybe up to -8 off) to // actual min so it can be used properly in GetNextGlyphs - assert(mnSubStringMin <= rVisualItem.mnEndCharPos); - mnSubStringMin = rVisualItem.mnEndCharPos; + if (mnSubStringMin < rVisualItem.mnEndCharPos) + mnSubStringMin = rVisualItem.mnEndCharPos; } continue; } |