Replace a half-baked attempt to remove \lyxdot from the directory part of

[lyx.git] / src / insets / InsetGraphics.cpp

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index f0eb88663cbcfb88a3ebf9e27a852fdd593770a0..123af44ea5b9d7025ec3d3399c9a34f2e110668b 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -490,7 +490,7 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir)
                return make_pair(IDENTICAL_PATHS, file_in);
 
        string mangled = file.mangledFileName();
-       if (file.isZipped()) {
+       if (formats.isZippedFile(file)) {
                // We need to change _eps.gz to .eps.gz. The mangled name is
                // still unique because of the counter in mangledFileName().
                // We can't just call mangledFileName() with the zip
@@ -616,7 +616,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
        // If the file is compressed and we have specified that it
        // should not be uncompressed, then just return its name and
        // let LaTeX do the rest!
-       if (params().filename.isZipped()) {
+       if (formats.isZippedFile(params().filename)) {
                if (params().noUnzip) {
                        // We don't know whether latex can actually handle
                        // this file, but we can't check, because that would
@@ -790,12 +790,6 @@ void InsetGraphics::latex(otexstream & os,
        // Remove the extension so LaTeX will use whatever is appropriate
        // (when there are several versions in different formats)
        string file_path = prepareFile(runparams);
-       if (!runparams.export_folder.empty()) {
-               // Relative pathnames starting with ../ will be sanitized
-               // if exporting to a different folder
-               while (file_path.substr(0, 17) == "\\lyxdot \\lyxdot /")
-                       file_path = file_path.substr(17, file_path.length() - 17);
-       }
        latex_str += file_path;
        latex_str += '}' + after;
        // FIXME UNICODE
@@ -1005,9 +999,7 @@ void InsetGraphics::validate(LaTeXFeatures & features) const
        features.require("graphicx");
 
        if (features.runparams().nice) {
-               Buffer const * masterBuffer = features.buffer().masterBuffer();
-               string const rel_file = removeExtension(
-                       params().filename.relFileName(masterBuffer->filePath()));
+               string const rel_file = params().filename.onlyFileNameWithoutExt();
                if (contains(rel_file, "."))
                        features.require("lyxdot");
        }
@@ -1054,9 +1046,9 @@ void InsetGraphics::addToToc(DocIterator const & cpit) const
 }
 
 
-docstring InsetGraphics::contextMenuName() const
+string InsetGraphics::contextMenuName() const
 {
-       return from_ascii("context-graphics");
+       return "context-graphics";
 }