mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
Fix the threaded preview and reenable it.
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:
parent
229a910e29
commit
45b0c6be47
@ -305,8 +305,6 @@ Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_,
|
||||
temppath = cloned_buffer_->d->temppath;
|
||||
file_fully_loaded = true;
|
||||
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)
|
||||
{
|
||||
LYXERR(Debug::INFO, "Buffer::Buffer()");
|
||||
|
||||
d->inset = new InsetText(this);
|
||||
if (cloned_buffer) {
|
||||
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->getText(0)->setMacrocontextPosition(par_iterator_begin());
|
||||
}
|
||||
|
@ -102,7 +102,7 @@
|
||||
#include <QUrl>
|
||||
#include <QScrollBar>
|
||||
|
||||
#define EXPORT_in_THREAD 0
|
||||
#define EXPORT_in_THREAD 1
|
||||
|
||||
// QtConcurrent was introduced in Qt 4.4
|
||||
#if (QT_VERSION >= 0x040400)
|
||||
|
Loading…
Reference in New Issue
Block a user