The point of the previous commit: We just need the params here, not

the whole buffer.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38743 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-05-13 19:40:04 +00:00
parent 5db4b7eb16
commit 78a623e3d6

View File

@ -2141,29 +2141,26 @@ void GuiDocument::updateDefaultFormat()
if (!bufferview()) if (!bufferview())
return; return;
// make a copy in order to consider unapplied changes // make a copy in order to consider unapplied changes
Buffer * tmpbuf = buffer().clone(); BufferParams tmp = buffer().params();
tmpbuf->params().useNonTeXFonts = tmp.useNonTeXFonts = fontModule->osFontsCB->isChecked();
fontModule->osFontsCB->isChecked();
int idx = latexModule->classCO->currentIndex(); int idx = latexModule->classCO->currentIndex();
if (idx >= 0) { if (idx >= 0) {
string const classname = classes_model_.getIDString(idx); string const classname = classes_model_.getIDString(idx);
tmpbuf->params().setBaseClass(classname); tmp.setBaseClass(classname);
tmpbuf->params().makeDocumentClass(); tmp.makeDocumentClass();
} }
outputModule->defaultFormatCO->blockSignals(true); outputModule->defaultFormatCO->blockSignals(true);
outputModule->defaultFormatCO->clear(); outputModule->defaultFormatCO->clear();
outputModule->defaultFormatCO->addItem(qt_("Default"), outputModule->defaultFormatCO->addItem(qt_("Default"),
QVariant(QString("default"))); QVariant(QString("default")));
typedef vector<Format const *> Formats; typedef vector<Format const *> Formats;
Formats formats = tmpbuf->params().exportableFormats(true); Formats formats = tmp.exportableFormats(true);
Formats::const_iterator cit = formats.begin(); Formats::const_iterator cit = formats.begin();
Formats::const_iterator end = formats.end(); Formats::const_iterator end = formats.end();
for (; cit != end; ++cit) for (; cit != end; ++cit)
outputModule->defaultFormatCO->addItem(qt_((*cit)->prettyname()), outputModule->defaultFormatCO->addItem(qt_((*cit)->prettyname()),
QVariant(toqstr((*cit)->name()))); QVariant(toqstr((*cit)->name())));
outputModule->defaultFormatCO->blockSignals(false); outputModule->defaultFormatCO->blockSignals(false);
// delete the copy
delete tmpbuf;
} }