From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 9 Dec 2021 15:43:16 +0000 (+0100)
Subject: Fix endless loop when breaking text
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=dcef1a9c;p=features.git

Fix endless loop when breaking text

For some reason, Qt can break strings before the first character
(although we try to prevent that). The code was not prepared to that,
now it is.

Remove a forgotten debug statement.
---

diff --git a/src/Row.cpp b/src/Row.cpp
index 4b9836edff..db52b057dd 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -162,6 +162,12 @@ bool Row::Element::splitAt(int const width, int next_width, bool force,
 	bool first = true;
 	docstring::size_type i = 0;
 	for (FontMetrics::Break const & brk : breaks) {
+		/* For some reason breakString can decide to break before the
+		 * first character (normally we use a 0-width nbsp to prevent
+		 * that). Skip leading empty elements, they are never wanted.
+		 */
+		if (first && brk.len == 0 && breaks.size() > 1)
+			continue;
 		Element e(STRING, pos + i, font, change);
 		e.str = str.substr(i, brk.len);
 		e.endpos = e.pos + brk.len;
@@ -612,7 +618,6 @@ Row::Elements Row::shortenIfNeeded(int const w, int const next_width)
 	 * splitting this time.
 	 */
 	if (cit->splitAt(w - wid, next_width, true, tail)) {
-		LYXERR0(*cit);
 		end_ = cit->endpos;
 		dim_.wid = wid + cit->dim.wid;
 		// If there are other elements, they should be removed.