Embedding: prepare to read/write manifest in .lyx file

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

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 3ff0a613073960f5c702aee5868728998ee0a362..70cfe9767d719a3d35a8a24788fe9cca231b2310 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -231,11 +231,11 @@ bool InsetGraphics::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetGraphics::registerEmbeddedFiles(Buffer const &,
-       EmbeddedFiles & files, ParConstIterator const & pit) const
+void InsetGraphics::registerEmbeddedFiles(Buffer const &, 
+       EmbeddedFiles & files) const
 {
        files.registerFile(params().filename.absFilename(), 
-               false, pit);
+               false, this);
 }
 
 
@@ -285,11 +285,14 @@ void InsetGraphics::read(Buffer const & buf, Lexer & lex)
 
        // InsetGraphics is read, with filename in params_. We do not know if this file actually
        // exists or is embedded so we need to get the 'availableFile' from buf.embeddedFiles()
-       EmbeddedFiles::EmbeddedFileList::const_iterator it = buf.embeddedFiles().find(params_.filename.toFilesystemEncoding());
-       if (it != buf.embeddedFiles().end())
-               // using available file, embedded or external, depending on file availability and
-               // embedding status.
-               params_.filename = DocFileName(it->availableFile(&buf));
+       if (buf.embeddedFiles().enabled()) {
+               EmbeddedFiles::EmbeddedFileList::const_iterator it = 
+                       buf.embeddedFiles().find(params_.filename.toFilesystemEncoding());
+               if (it != buf.embeddedFiles().end())
+                       // using available file, embedded or external, depending on file availability and
+                       // embedding status.
+                       params_.filename = DocFileName(it->availableFile(&buf));
+       }
        graphic_->update(params().as_grfxParams());
 }