Don't allow newline characters in preference (#5840).

[lyx.git] / src / frontends / qt4 / GuiView.cpp

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index ffb845d10cd7d5e0aa8f62ab92c34dee39d0aec6..fee9f9cb8e6bfec712d18f0d7ef2f633fe54f092 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1457,7 +1457,7 @@ void GuiView::errors(string const & error_type, bool from_master)
            from_master = true;
        }
 #else
-       ErrorList & el = from_master ?
+       ErrorList const & el = from_master ?
                bv->buffer().masterBuffer()->errorList(error_type) :
                bv->buffer().errorList(error_type);
 #endif
@@ -1895,8 +1895,8 @@ Buffer * GuiView::loadDocument(FileName const & filename, bool tolastfiles)
                return 0;
        }
 
-       newBuffer->errors("Parse");
        setBuffer(newBuffer);
+       newBuffer->errors("Parse");
 
        if (tolastfiles)
                theSession().lastFiles().add(filename);
@@ -3140,7 +3140,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 #if QT_VERSION < 0x040400
                        if (!doc_buffer->doExport(argument, false)) {
                                dr.setError(true);
-                               dr.setMessage(bformat(_("Error exporting to format: %1$s."),
+                               dr.setMessage(bformat(_("Error exporting to format: %1$s"),
                                        cmd.argument()));
                        }
 #else