anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 18:24:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the threaded preview and reenable it.

Browse Source 
Buffer::Impl::inset was set in the ctor Buffer::Impl::Impl to be a clone. However, in the Buffer::Buffer ctor the inset was set again, now to a new and empty InsetText.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32589 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-12-19 15:46:45 +00:00
parent 229a910e29
commit 45b0c6be47
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Buffer.cpp
View File

@ -305,8 +305,6 @@ Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_,
temppath = cloned_buffer_->d->temppath; temppath = cloned_buffer_->d->temppath;
file_fully_loaded = true; file_fully_loaded = true;
params = cloned_buffer_->d->params; params = cloned_buffer_->d->params;
inset = static_cast<InsetText *>(cloned_buffer_->d->inset->clone());
inset->setBuffer(parent);
} }
@ -314,8 +312,11 @@ Buffer::Buffer(string const & file, bool readonly, Buffer const * cloned_buffer)
: d(new Impl(*this, FileName(file), readonly, cloned_buffer)), gui_(0) : d(new Impl(*this, FileName(file), readonly, cloned_buffer)), gui_(0)
{ {
LYXERR(Debug::INFO, "Buffer::Buffer()"); LYXERR(Debug::INFO, "Buffer::Buffer()");
if (cloned_buffer) {
d->inset = new InsetText(this); d->inset = static_cast<InsetText *>(cloned_buffer->d->inset->clone());
d->inset->setBuffer(*this);
} else
d->inset = new InsetText(this);
d->inset->setAutoBreakRows(true); d->inset->setAutoBreakRows(true);
d->inset->getText(0)->setMacrocontextPosition(par_iterator_begin()); d->inset->getText(0)->setMacrocontextPosition(par_iterator_begin());
} }

2
src/frontends/qt4/GuiView.cpp
View File

@ -102,7 +102,7 @@
#include <QUrl> #include <QUrl>
#include <QScrollBar> #include <QScrollBar>
#define EXPORT_in_THREAD 0 #define EXPORT_in_THREAD 1
// QtConcurrent was introduced in Qt 4.4 // QtConcurrent was introduced in Qt 4.4
#if (QT_VERSION >= 0x040400) #if (QT_VERSION >= 0x040400)