- moderncv.layout: add missing separator style

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index a421c5317041930837fdacbcb9ca2cb1b59331a8..23c277ac9640947238cb3b974693551cfd0b473c 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -333,6 +333,8 @@ bool Converters::convert(Buffer const * buffer,
        // This has the added benefit that all other files that may be
        // generated by the converter are deleted when LyX closes and do not
        // clutter the real working directory.
+       // FIXME: This does not work if path is an UNC path on windows
+       //        (bug 6127).
        string const path(onlyPath(from_file.absFileName()));
        // Prevent the compiler from optimizing away p
        FileName pp(path);
@@ -355,7 +357,7 @@ bool Converters::convert(Buffer const * buffer,
                               << conv.from << " to " << conv.to);
                }
                infile = outfile;
-               outfile = FileName(conv.result_dir.empty()
+               outfile = FileName(conv.result_file.empty()
                        ? changeExtension(from_file.absFileName(), conv.To->extension())
                        : addName(subst(conv.result_dir,
                                        token_base, from_base),
@@ -365,6 +367,9 @@ bool Converters::convert(Buffer const * buffer,
                // if input and output files are equal, we use a
                // temporary file as intermediary (JMarc)
                FileName real_outfile;
+               if (!conv.result_file.empty())
+                       real_outfile = FileName(changeExtension(from_file.absFileName(),
+                               conv.To->extension()));
                if (outfile == infile) {
                        real_outfile = infile;
                        // when importing, a buffer does not necessarily exist