Findadv: Do not use out of range index into a string

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 49aa95b5346ed48fcdce55387a629300b6b617e6..0c541c894b8fa730f6c95a7abef24930dbfe4568 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -400,7 +400,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                         FileName const & from_file, FileName const & to_file,
                         FileName const & orig_from,
                         string const & from_format, string const & to_format,
-                        ErrorList & errorList, int conversionflags)
+                        ErrorList & errorList, int conversionflags, bool includeall)
 {
        if (from_format == to_format)
                return move(from_format, from_file, to_file, false) ?
@@ -488,6 +488,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                runparams.only_childbibs = !bp.useBiblatex()
                                && !bp.useBibtopic()
                                && bp.multibib == "child";
+               runparams.includeall = includeall;
        }
 
        // Some converters (e.g. lilypond) can only output files to the
@@ -594,8 +595,8 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
                        // FIXME KILLED
                        // Check changed return value here.
                        RetVal const retval = runLaTeX(*buffer, command, runparams, errorList);
-                               if (retval != SUCCESS)
-                                       return retval;
+                       if (retval != SUCCESS)
+                               return retval;
                } else {
                        if (conv.need_aux() && !run_latex) {
                                // We are not importing, we have a buffer
@@ -865,7 +866,7 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
                });
        int const result = latex.run(terr);
 
-       if (result == Systemcall::KILLED) {
+       if (result == Systemcall::KILLED || result == Systemcall::TIMEOUT) {
                Alert::error(_("Export canceled"),
                        _("The export process was terminated by the user."));
                return KILLED;
@@ -874,11 +875,12 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
        if (result & LaTeX::ERRORS)
                buffer.bufferErrors(terr, errorList);
 
-       if ((result & LaTeX::UNDEF_CIT) || (result & LaTeX::UNDEF_REF)) {
+       if ((result & LaTeX::UNDEF_CIT) || (result & LaTeX::UNDEF_UNKNOWN_REF)) {
                buffer.bufferRefs(terr, errorList);
                if (errorList.empty())
                        errorList.push_back(ErrorItem(_("Undefined reference"),
-                               _("Undefined reference or citation was found during the build, please check the Log."),
+                               _("Undefined references or citations were found during the build.\n"
+                                 "Please check the warnings in the LaTeX log (Document > LaTeX Log)."),
                                &buffer));
        }
 
@@ -911,7 +913,7 @@ Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & co
                        LaTeX::NO_LOGFILE |
                        LaTeX::ERRORS |
                        LaTeX::UNDEF_CIT |
-                       LaTeX::UNDEF_REF |
+                       LaTeX::UNDEF_UNKNOWN_REF |
                        LaTeX::NO_OUTPUT;
 
        return (result & ERROR_MASK) == 0 ? SUCCESS : FAILURE;