fix bug 3723:

* src/Buffer.cpp (read): clear listings params.

* src/frontends/qt4/QDocument.cpp: whitespace

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18507 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index f686bd51b30f1205b27ba2ed8488acce4a25d8e7..d4f1f9d77d408ec75ac1eed3e57fa251cb7f853b 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -427,6 +427,7 @@ int Buffer::readHeader(Lexer & lex)
        params().headheight.erase();
        params().headsep.erase();
        params().footskip.erase();
+       params().listings_params.clear();
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
                params().temp_bullet(i) = ITEMIZE_DEFAULTS[i];

diff --git a/src/frontends/qt4/QDocument.cpp b/src/frontends/qt4/QDocument.cpp
index b55cc6d0c3fc3f77fe44c62059d754feb71366d7..389d395b568e54c4a46260acaff373e4e3c06d9f 100644 (file)
--- a/src/frontends/qt4/QDocument.cpp
+++ b/src/frontends/qt4/QDocument.cpp
@@ -956,7 +956,8 @@ void QDocumentDialog::apply(BufferParams & params)
                params.columns = 1;
 
        // text should have passed validation
-       params.listings_params = InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
+       params.listings_params =
+               InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
 
        if (textLayoutModule->indentRB->isChecked())
                params.paragraph_separation = BufferParams::PARSEP_INDENT;
@@ -1262,7 +1263,8 @@ void QDocumentDialog::updateParams(BufferParams const & params)
                params.columns == 2);
        
        // break listings_params to multiple lines
-       string lstparams = InsetListingsParams(params.listings_params).separatedParams();
+       string lstparams =
+               InsetListingsParams(params.listings_params).separatedParams();
        textLayoutModule->listingsED->setPlainText(toqstr(lstparams));
 
        if (!params.options.empty()) {