anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
This reverts part of r31736.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31737 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-10-25 13:56:44 +00:00
parent 7227566e86
commit bdf69de113
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Buffer.cpp
View File

@ -2261,7 +2261,7 @@ string Buffer::filePath() const
} }
bool Buffer::isReadonly() const bool Buffer::isReadonly()
{ {
return d->read_only; return d->read_only;
} }

2
src/Buffer.h
View File

@ -318,7 +318,7 @@ public:
bool isReadonly() const; bool isReadonly() const;
/// Set buffer read-only flag /// 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 /// returns \c true if the buffer contains a LaTeX document
bool isLatex() const; bool isLatex() const;

11
src/frontends/qt4/GuiCompare.cpp
View File

@ -198,11 +198,7 @@ void GuiCompare::error()
void GuiCompare::finished(bool aborted) void GuiCompare::finished(bool aborted)
{ {
enableControls(true); enableControls(true);
if (old_buffer_)
old_buffer_->setReadonly(false);
if (new_buffer_)
new_buffer_->setReadonly(false);
if (compare_) { if (compare_) {
delete compare_; delete compare_;
compare_ = 0; compare_ = 0;
@ -293,11 +289,6 @@ int GuiCompare::run()
dest_buffer_->changed(); dest_buffer_->changed();
dest_buffer_->markDirty(); 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 // get the options from the dialog
CompareOptions options; CompareOptions options;
options.settings_from_new = newSettingsRB->isChecked(); options.settings_from_new = newSettingsRB->isChecked();