Try another way to signal a false positive to coverity

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index e596b3d3c6aee2036495e526f66b99aeb9983e22..9d9d602ec572eaa8df2b58321a0bb8a90cd19e81 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -285,18 +285,18 @@ bool Converters::checkAuth(Converter const & conv, string const & doc_fname)
                return true;
        const docstring security_warning = bformat(
              _("<p>The requested operation requires the use of a converter from "
-               "%2$s to %3$s:"
-               "<blockquote><tt>%1$s</tt></blockquote>"
+               "%2$s to %3$s:</p>"
+               "<blockquote><p><tt>%1$s</tt></p></blockquote>"
                "<p>This external program can execute arbitrary commands on your "
                "system, including dangerous ones, if instructed to do so by a "
                "maliciously crafted .lyx document.</p>"),
              from_utf8(conv.command()), from_utf8(conv.from()),
              from_utf8(conv.to()));
        if (lyxrc.use_converter_needauth_forbidden) {
-               frontend::Alert::warning(
+               frontend::Alert::error(
                    _("An external converter is disabled for security reasons"),
                    security_warning + _(
-                   "<p>Your current settings forbid its execution.</p>"
+                   "<p><b>Your current preference settings forbid its execution.</b></p>"
                    "<p>(To change this setting, go to <i>Preferences &#x25b9; File "
                    "Handling &#x25b9; Converters</i> and uncheck <i>Security &#x25b9; "
                    "Forbid needauth converters</i>.)"), false);
@@ -398,11 +398,13 @@ bool Converters::convert(Buffer const * buffer,
                        buffer->params().bufferFormat() == "latex"
                        && buffer->params().encoding().package() == Encoding::japanese;
                runparams.use_indices = buffer->params().use_indices;
-               runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
-                       string() : buffer->params().bibtex_command;
+               runparams.bibtex_command = buffer->params().bibtexCommand();
                runparams.index_command = (buffer->params().index_command == "default") ?
                        string() : buffer->params().index_command;
                runparams.document_language = buffer->params().language->babel();
+               runparams.only_childbibs = !buffer->params().useBiblatex()
+                               && !buffer->params().useBibtopic()
+                               && buffer->params().multibib == "child";
        }
 
        // Some converters (e.g. lilypond) can only output files to the
@@ -457,7 +459,7 @@ bool Converters::convert(Buffer const * buffer,
                                                   "tmpfile.out"));
                }
 
-               if (!checkAuth(conv, buffer->absFileName()))
+               if (!checkAuth(conv, buffer ? buffer->absFileName() : string()))
                        return false;
 
                if (conv.latex()) {