X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphics.cpp;h=70cfe9767d719a3d35a8a24788fe9cca231b2310;hb=3189e7b5dd438876016091463b8e66b134295fb5;hp=247268fada8a18f50d9671242b13d739e27bdda9;hpb=692363bbcaad41110924e2f3f4149eb56c62b212;p=lyx.git

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 247268fada..70cfe9767d 100644
--- 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(), 
-		EmbeddedFile::AUTO, pit);
+		false, this);
 }
 
 
@@ -270,7 +270,7 @@ Inset::EDITABLE InsetGraphics::editable() const
 void InsetGraphics::write(Buffer const & buf, ostream & os) const
 {
 	os << "Graphics\n";
-	params().Write(os, buf.filePath());
+	params().Write(os, buf);
 }
 
 
@@ -283,6 +283,16 @@ void InsetGraphics::read(Buffer const & buf, Lexer & lex)
 	else
 		LYXERR(Debug::GRAPHICS) << "Not a Graphics inset!" << endl;
 
+	// 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()
+	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());
 }
 
@@ -1016,7 +1026,7 @@ InsetGraphicsMailer::params2string(InsetGraphicsParams const & params,
 {
 	ostringstream data;
 	data << name_ << ' ';
-	params.Write(data, buffer.filePath());
+	params.Write(data, buffer);
 	data << "\\end_inset\n";
 	return data.str();
 }