Initialize biblioChanged_ when we update the document settings dialog.

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

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index f3e3c470791fd7d7339dc199f911891b2fa3e7f4..8e95db2e229a8b5c9d5dc25eced2f5cb0d67b480 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -755,10 +755,20 @@ void InsetGraphics::latex(otexstream & os,
 
        bool const file_exists = !params().filename.empty()
                        && params().filename.isReadableFile();
-       string const message = file_exists ?
-               string() : string("bb = 0 0 200 100, draft, type=eps");
-       // if !message.empty() then there was no existing file
-       // "filename" found. In this case LaTeX
+       string message;
+       if (!file_exists) {
+               if (params().bb.empty())
+                   message = "bb = 0 0 200 100";
+               if (!params().draft) {
+                       if (!message.empty())
+                               message += ", ";
+                       message += "draft";
+               }
+               if (!message.empty())
+                       message += ", ";
+               message += "type=eps";
+       }
+       // If no existing file "filename" was found LaTeX
        // draws only a rectangle with the above bb and the
        // not found filename in it.
        LYXERR(Debug::GRAPHICS, "\tMessage = \"" << message << '\"');
@@ -790,12 +800,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 +1009,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");
        }