From: Richard Heck <rgheck@lyx.org>
Date: Mon, 29 Jan 2018 04:51:40 +0000 (-0500)
Subject: Revert "Fix bug #11055."
X-Git-Tag: 2.3.0~97
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bb30118ff4dbded6d0d34ee44aa7280d0a837180;p=features.git

Revert "Fix bug #11055."

This reverts commit 0be5ae123c212f544ace41fa94a2149c0973595b.

Unintentionally committed. Sorry!!
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 3fc2ea0e0a..ffe522e0f9 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2484,11 +2484,6 @@ void Buffer::makeCitationLabels() const
 }
 
 
-void Buffer::invalidateCiteLabels() const
-{
-	masterBuffer()->d->cite_labels_valid_ = false;
-}
-
 bool Buffer::citeLabelsValid() const
 {
 	return masterBuffer()->d->cite_labels_valid_;
diff --git a/src/Buffer.h b/src/Buffer.h
index b1b8de2bb3..35e7632973 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -529,8 +529,6 @@ public:
 	///
 	void makeCitationLabels() const;
 	///
-	void invalidateCiteLabels() const;
-	///
 	bool citeLabelsValid() const;
 	///
 	void getLabelList(std::vector<docstring> &) const;
diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 68159b5676..e141f34c7e 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1357,45 +1357,25 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		break;
 	}
 
-	case LFUN_UNDO: {
+	case LFUN_UNDO:
 		dr.setMessage(_("Undo"));
 		cur.clearSelection();
-		// We need to find out if the bibliography information
-		// has changed. See bug #11055.
-		// So these should not be references...
-		LayoutModuleList const engines = buffer().params().citeEngine();
-		CiteEngineType const enginetype = buffer().params().citeEngineType();
 		if (!cur.textUndo())
 			dr.setMessage(_("No further undo information"));
-		else {
+		else
 			dr.screenUpdate(Update::Force | Update::FitCursor);
-			dr.forceBufferUpdate();
-			if (buffer().params().citeEngine() != engines ||
-			    buffer().params().citeEngineType() != enginetype)
-				buffer().invalidateCiteLabels();
-		}
+		dr.forceBufferUpdate();
 		break;
-	}
 
-	case LFUN_REDO: {
+	case LFUN_REDO:
 		dr.setMessage(_("Redo"));
 		cur.clearSelection();
-		// We need to find out if the bibliography information
-		// has changed. See bug #11055.
-		// So these should not be references...
-		LayoutModuleList const engines = buffer().params().citeEngine();
-		CiteEngineType const enginetype = buffer().params().citeEngineType();
 		if (!cur.textRedo())
 			dr.setMessage(_("No further redo information"));
-		else {
+		else
 			dr.screenUpdate(Update::Force | Update::FitCursor);
-			dr.forceBufferUpdate();
-			if (buffer().params().citeEngine() != engines ||
-			    buffer().params().citeEngineType() != enginetype)
-				buffer().invalidateCiteLabels();
-		}
+		dr.forceBufferUpdate();
 		break;
-	}
 
 	case LFUN_FONT_STATE:
 		dr.setMessage(cur.currentState(false));
diff --git a/src/LayoutModuleList.h b/src/LayoutModuleList.h
index aa9925109d..c56e572572 100644
--- a/src/LayoutModuleList.h
+++ b/src/LayoutModuleList.h
@@ -75,14 +75,6 @@ public:
 	/// to be made.
 	bool adaptToBaseClass(LayoutFile const * const lay,
 			std::list<std::string> const & removedModules);
-	///
-	bool operator==(LayoutModuleList const & other) const {
-		return lml_ == other.lml_;
-	}
-	///
-	bool operator!=(LayoutModuleList const & other) const {
-		return !operator==(other);
-	}
 private:
 	/// Removes modules excluded by, provided by, etc, the base class.
 	/// \param lay The document class against which to check.