vcl/generic/glyphs/gcach_layout.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 16d157efc2aec07758448c95cc41731912675db2
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Apr 2 09:30:44 2015 +0100
fix hang with ooo71962-1.odt
script run ends after chunk we are rendering
(cherry picked from commit 00bf3a4259c1f960eff05b17649cc734c275950f)
Change-Id: Idbfe11c385db72a80d3d204f8638d67395580d1b
Reviewed-on: https://gerrit.libreoffice.org/15115
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index f7523a1..b29627d 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -399,7 +399,9 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout,
ImplLayoutArgs& rArgs)
aScriptSubRuns.push_back(aRun);
nCurrentPos = nEndRunPos;
- aScriptRun.next();
+ bool bHasMore = aScriptRun.next();
+ if (!bHasMore)
+ break;
}
// RTL subruns should be reversed to ensure that final glyph order is
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
