From bdf69de11336a75bf61d166fa8ba7e46c68b8ab4 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Sun, 25 Oct 2009 13:56:44 +0000 Subject: [PATCH] Don't set the read-only flags of the documents. The GuiCompare is modal anyway, so the user shouldn't be able to change something. This reverts part of r31736. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31737 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Buffer.cpp | 2 +- src/Buffer.h | 2 +- src/frontends/qt4/GuiCompare.cpp | 11 +---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index f8d894f62c..0152f4acb2 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -2261,7 +2261,7 @@ string Buffer::filePath() const } -bool Buffer::isReadonly() const +bool Buffer::isReadonly() { return d->read_only; } diff --git a/src/Buffer.h b/src/Buffer.h index 1d372f4848..af69950eb1 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -318,7 +318,7 @@ public: bool isReadonly() const; /// Set buffer read-only flag - void setReadonly(bool flag = true) const; + void setReadonly(bool flag = true); /// returns \c true if the buffer contains a LaTeX document bool isLatex() const; diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp index 3fd504b903..db56ab24a8 100644 --- a/src/frontends/qt4/GuiCompare.cpp +++ b/src/frontends/qt4/GuiCompare.cpp @@ -198,11 +198,7 @@ void GuiCompare::error() void GuiCompare::finished(bool aborted) { enableControls(true); - if (old_buffer_) - old_buffer_->setReadonly(false); - if (new_buffer_) - new_buffer_->setReadonly(false); - + if (compare_) { delete compare_; compare_ = 0; @@ -293,11 +289,6 @@ int GuiCompare::run() dest_buffer_->changed(); dest_buffer_->markDirty(); - // the comparison is done in a separate thread, so don't let - // the user change the buffers - old_buffer_->setReadonly(true); - new_buffer_->setReadonly(true); - // get the options from the dialog CompareOptions options; options.settings_from_new = newSettingsRB->isChecked(); -- 2.39.2