X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetexternal.C;h=910d3d071a55a3d2230672a217d987144652de64;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=6726d9859e69bbedae220d330ddf67d5ac4d6d6c;hpb=8e6e970d7ba017dba14bdb821f4c4489665d947c;p=lyx.git

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 6726d9859e..910d3d071a 100644
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -70,11 +70,11 @@ namespace external {
 
 TempName::TempName()
 {
-	string const tempname = support::tempName(string(), "lyxext");
+	support::FileName const tempname(support::tempName(support::FileName(), "lyxext"));
 	// FIXME: This is unsafe
-	support::unlink(support::FileName(tempname));
+	support::unlink(tempname);
 	// must have an extension for the converter code to work correctly.
-	tempname_ = support::FileName(tempname + ".tmp");
+	tempname_ = support::FileName(tempname.absFilename() + ".tmp");
 }
 
 
@@ -290,7 +290,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
 			break;
 
 		case EX_FILENAME: {
-			lex.next();
+			lex.eatLine();
 			string const name = lex.getString();
 			filename.set(name, buffer.filePath());
 			break;
@@ -482,10 +482,12 @@ void InsetExternal::edit(LCursor & cur, bool)
 }
 
 
-void InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetExternal::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	renderer_->metrics(mi, dim);
+	bool const changed = dim_ != dim;
 	dim_ = dim;
+	return changed;
 }
 
 
@@ -778,7 +780,7 @@ void InsetExternal::validate(LaTeXFeatures & features) const
 	for (; it != end; ++it) {
 		string const preamble = etm.getPreambleDefByName(*it);
 		if (!preamble.empty())
-			features.addExternalPreamble(preamble);
+			features.addPreambleSnippet(preamble);
 	}
 }