Fix GRAPHICS_EDIT of InsetGraphics

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

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 6b5ba0477693300f8964ed636aee4fe0f09854ab..37ffc6fe9a097b29b03a0f376be8c38ebf38a3b8 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -47,6 +47,7 @@
 
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/ExceptionMessage.h"
 #include "support/FileNameList.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
@@ -215,6 +216,19 @@ InsetInclude::~InsetInclude()
 
 void InsetInclude::setBuffer(Buffer & buffer)
 {
+       if (buffer_) {
+               try {
+                       EmbeddedFile file_from = includedFilename(*buffer_, params());
+                       EmbeddedFile file_to = file_from.copyTo(&buffer);
+                       if (file_to.embedded())
+                               setParam("embed", from_utf8(file_to.inzipName()));
+               } catch (ExceptionMessage const & message) {
+                       Alert::error(message.title_, message.details_);
+                       // failed to embed
+                       setParam("embed", docstring());
+               }
+
+       }
        buffer_ = &buffer;
        if (label_)
                label_->setBuffer(buffer);
@@ -473,7 +487,7 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
                        string const module = *it;
                        vector<string>::const_iterator found =
                                find(masterModules.begin(), masterModules.end(), module);
-                       if (found != masterModules.end()) {
+                       if (found == masterModules.end()) {
                                docstring text = bformat(_("Included file `%1$s'\n"
                                        "uses module `%2$s'\n"
                                        "which is not used in parent file."),