Fix fa0f142e (plain quotes fix).

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 2c1ae2d87827a17e9464d3a7b99c6d7b9ebbf42f..104ad0a42c49eea8281ea69da72c5c80ae7d5b33 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -235,8 +235,8 @@ void Converters::update(Formats const & formats)
        ConverterList::iterator it = converterlist_.begin();
        ConverterList::iterator end = converterlist_.end();
        for (; it != end; ++it) {
-               it->setFrom(theFormats().getFormat(it->from()));
-               it->setTo(theFormats().getFormat(it->to()));
+               it->setFrom(formats.getFormat(it->from()));
+               it->setTo(formats.getFormat(it->to()));
        }
 }
 
@@ -247,8 +247,8 @@ void Converters::updateLast(Formats const & formats)
 {
        if (converterlist_.begin() != converterlist_.end()) {
                ConverterList::iterator it = converterlist_.end() - 1;
-               it->setFrom(theFormats().getFormat(it->from()));
-               it->setTo(theFormats().getFormat(it->to()));
+               it->setFrom(formats.getFormat(it->from()));
+               it->setTo(formats.getFormat(it->to()));
        }
 }
 
@@ -463,16 +463,20 @@ bool Converters::convert(Buffer const * buffer,
                        return false;
 
                if (conv.latex()) {
+                       // We are not importing, we have a buffer
+                       LATTEST(buffer);
                        run_latex = true;
                        string command = conv.command();
                        command = subst(command, token_from, "");
-                       command = subst(command, token_latex_encoding, buffer ?
-                               buffer->params().encoding().latexName() : string());
+                       command = subst(command, token_latex_encoding,
+                                       buffer->params().encoding().latexName());
                        LYXERR(Debug::FILES, "Running " << command);
                        if (!runLaTeX(*buffer, command, runparams, errorList))
                                return false;
                } else {
                        if (conv.need_aux() && !run_latex) {
+                               // We are not importing, we have a buffer
+                               LATTEST(buffer);
                                string command;
                                switch (runparams.flavor) {
                                case OutputParams::DVILUATEX: