Fix inline collapsable inset set focus crash

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 1c870470b88b669817133105fc55b7d03d573e21..200e0a5a0714d68799a82ee226e8e019234e18d6 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -45,12 +45,14 @@ using support::getExtension;
 using support::isFileReadable;
 using support::libFileSearch;
 using support::libScriptSearch;
+using support::makeAbsPath;
 using support::makeRelPath;
 using support::onlyFilename;
 using support::onlyPath;
 using support::Path;
 using support::prefixIs;
 using support::quoteName;
+using support::removeExtension;
 using support::split;
 using support::subst;
 using support::Systemcall;
@@ -449,7 +451,7 @@ bool Converters::convert(Buffer const * buffer,
                                        " < " + quoteName(infile2 + ".out") +
                                        " > " + quoteName(logfile);
                                one.startscript(Systemcall::Wait, command2);
-                               if (!scanLog(*buffer, command, logfile, errorList))
+                               if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
                                        return false;
                        }
 
@@ -506,33 +508,37 @@ bool Converters::move(string const & fmt,
 
        bool no_errors = true;
        string const path = onlyPath(from.absFilename());
-       string const base = onlyFilename(changeExtension(from.absFilename(), string()));
-       string const to_base = changeExtension(to.absFilename(), string());
+       string const base = onlyFilename(removeExtension(from.absFilename()));
+       string const to_base = removeExtension(to.absFilename());
        string const to_extension = getExtension(to.absFilename());
 
-       vector<string> files = dirList(onlyPath(from.absFilename()), getExtension(from.absFilename()));
-       for (vector<string>::const_iterator it = files.begin();
-            it != files.end(); ++it)
-               if (prefixIs(*it, base)) {
-                       string const from2 = path + *it;
-                       string to2 = to_base + it->substr(base.length());
-                       to2 = changeExtension(to2, to_extension);
+       vector<FileName> const files = dirList(FileName(path),
+                       getExtension(from.absFilename()));
+       for (vector<FileName>::const_iterator it = files.begin();
+            it != files.end(); ++it) {
+               string const from2 = it->absFilename();
+               string const file2 = onlyFilename(from2);
+               if (prefixIs(file2, base)) {
+                       string const to2 = changeExtension(
+                               to_base + file2.substr(base.length()),
+                               to_extension);
                        lyxerr[Debug::FILES] << "moving " << from2
                                             << " to " << to2 << endl;
 
                        Mover const & mover = movers(fmt);
                        bool const moved = copy
-                               ? mover.copy(FileName(from2), FileName(to2))
-                               : mover.rename(FileName(from2), FileName(to2));
+                               ? mover.copy(*it, FileName(to2))
+                               : mover.rename(*it, FileName(to2));
                        if (!moved && no_errors) {
                                Alert::error(_("Cannot convert file"),
                                        bformat(copy ?
                                                _("Could not copy a temporary file from %1$s to %2$s.") :
                                                _("Could not move a temporary file from %1$s to %2$s."),
-                                               from_ascii(from2), from_ascii(to2)));
+                                               from_utf8(from2), from_utf8(to2)));
                                no_errors = false;
                        }
                }
+       }
        return no_errors;
 }
 
@@ -550,7 +556,7 @@ bool Converters::formatIsUsed(string const & format)
 
 
 bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
-                        string const & filename, ErrorList & errorList)
+                        FileName const & filename, ErrorList & errorList)
 {
        OutputParams runparams;
        runparams.flavor = OutputParams::LATEX;
@@ -591,7 +597,7 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
 
        // do the LaTeX run(s)
        string const name = buffer.getLatexName();
-       LaTeX latex(command, runparams, name);
+       LaTeX latex(command, runparams, FileName(makeAbsPath(name)));
        TeXErrors terr;
        showMessage show(buffer);
        latex.message.connect(show);