From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 22 Feb 2023 17:09:03 +0000 (+0100)
Subject: At metrics time, store paragraph id too
X-Git-Tag: 2.4-beta3~214
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=00c39208;p=lyx.git

At metrics time, store paragraph id too

Instead of actually fixing the messiness of InsetInfo, let's just fix
the symptom and avoid the access to Paragraph::id() that was crashing
LyX every time updateBuffer/validate/metrics/draw did not happen in
the right order.

Fixes bug #12639.
---

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 46f2edc9aa..31b31a2d01 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -42,7 +42,7 @@ namespace lyx {
 
 
 ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
-	position_(-1), par_(&par)
+	position_(-1), id_(par.id()), par_(&par)
 {}
 
 
diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 1d690aab77..e0d9ce0541 100644
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -72,11 +72,15 @@ public:
 	///
 	int position() const { return position_; }
 	void setPosition(int position);
+	///
+	int id() const { return id_; }
 
 private:
 	///
 	int position_;
 	///
+	int id_;
+	///
 	mutable RowList rows_;
 	/// cached dimensions of paragraph
 	Dimension dim_;
diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 2dea92bbff..995b09ce07 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -1986,7 +1986,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const
 		swap(pi.leftx, pi.rightx);
 
 	BookmarksSection::BookmarkPosList bpl =
-		theSession().bookmarks().bookmarksInPar(bv_->buffer().fileName(), pm.par().id());
+		theSession().bookmarks().bookmarksInPar(bv_->buffer().fileName(), pm.id());
 
 	for (size_t i = 0; i != nrows; ++i) {