X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=ac64cf2f2630a82ca9a41d7af31bc7f894ca3447;hb=6d4e6aad24edb7bcfbc49f03d2432fc9fa06954d;hp=e2185fbd897a18711e63f3a4c0335fa66ad007d9;hpb=9a09fe38bd28c3a788fc3ca4da9904bcd7eb339a;p=features.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index e2185fbd89..ac64cf2f26 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -370,6 +370,10 @@ public:
 		+ (with_blanks ? blank_count_ : 0);
 	}
 
+	// does the buffer contains tracked changes? (if so, we automatically
+	// display the review toolbar)
+	mutable bool tracked_changes_present_;
+
 private:
 	/// So we can force access via the accessors.
 	mutable Buffer const * parent_buffer;
@@ -442,6 +446,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
 	preview_file_ = cloned_buffer_->d->preview_file_;
 	preview_format_ = cloned_buffer_->d->preview_format_;
 	preview_error_ = cloned_buffer_->d->preview_error_;
+	tracked_changes_present_ = cloned_buffer_->d->tracked_changes_present_;
 }
 
 
@@ -2768,6 +2773,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 		if (params().save_transient_properties)
 			undo().recordUndoBufferParams(CursorData());
 		params().track_changes = !params().track_changes;
+		if (!params().track_changes)
+			dr.forceChangesUpdate();
 		break;
 
 	case LFUN_CHANGES_OUTPUT:
@@ -4584,6 +4591,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 	// update all caches
 	clearReferenceCache();
 	updateMacros();
+	setChangesPresent(false);
 
 	Buffer & cbuf = const_cast<Buffer &>(*this);
 
@@ -4847,6 +4855,9 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 		// set the counter for this paragraph
 		d->setLabel(parit, utype);
 
+		// update change-tracking flag 
+		parit->addChangesToBuffer(*this);
+
 		// now the insets
 		InsetList::const_iterator iit = parit->insetList().begin();
 		InsetList::const_iterator end = parit->insetList().end();
@@ -5111,4 +5122,29 @@ string Buffer::includedFilePath(string const & name, string const & ext) const
 	                           from_utf8(filePath())));
 }
 
+
+void Buffer::setChangesPresent(bool b) const
+{
+	d->tracked_changes_present_ = b;
+}
+
+
+bool Buffer::areChangesPresent() const
+{
+	return d->tracked_changes_present_;
+}
+
+
+void Buffer::updateChangesPresent() const
+{
+	LYXERR(Debug::CHANGES, "Buffer::updateChangesPresent");
+	setChangesPresent(false);
+	ParConstIterator it = par_iterator_begin();
+	ParConstIterator const end = par_iterator_end();
+	for (; !areChangesPresent() && it != end; ++it)
+		it->addChangesToBuffer(*this);
+}
+
+
+
 } // namespace lyx