X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FExternalSupport.C;h=d84baf75069b5a48e9ec22d0d8544259387f86d4;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=f724b85168cca335856e3de24d17f41a035e6e1e;hpb=979fdf74564c6cbbb832090b8f9c8f84532b8f54;p=lyx.git

diff --git a/src/insets/ExternalSupport.C b/src/insets/ExternalSupport.C
index f724b85168..d84baf7506 100644
--- a/src/insets/ExternalSupport.C
+++ b/src/insets/ExternalSupport.C
@@ -67,9 +67,11 @@ string const subst_path(string const & input,
 {
 	if (input.find(placeholder) == string::npos)
 		return input;
+	// Don't use external_path here when use_latex_path is false, as the
+	// path will be compared with another one in internal style later
+	// in Converters::move.
 	string const path2 = use_latex_path ?
-		support::latex_path(path, ext, dots) :
-		support::os::external_path(path);
+		support::latex_path(path, ext, dots) : path;
 	return support::subst(input, placeholder, path2);
 }
 
@@ -228,7 +230,7 @@ void updateExternal(InsetExternalParams const & params,
 	if (to_format.empty())
 		return; // NOT_NEEDED
 
-	if (!converters.isReachable(from_format, to_format)) {
+	if (!theConverters().isReachable(from_format, to_format)) {
 		lyxerr[Debug::EXTERNAL]
 			<< "external::updateExternal. "
 			<< "Unable to convert from "
@@ -250,7 +252,7 @@ void updateExternal(InsetExternalParams const & params,
 		unsigned long const temp_checksum = support::sum(temp_file);
 
 		if (from_checksum != temp_checksum) {
-			Mover const & mover = movers(from_format);
+			Mover const & mover = getMover(from_format);
 			if (!mover.copy(params.filename, temp_file)) {
 				lyxerr[Debug::EXTERNAL]
 					<< "external::updateExternal. "
@@ -306,7 +308,7 @@ void updateExternal(InsetExternalParams const & params,
 	// FIXME (Abdel 12/08/06): Is there a need to show these errors?
 	ErrorList el;
 	/* bool const success = */
-		converters.convert(&buffer, temp_file, abs_to_file,
+		theConverters().convert(&buffer, temp_file, abs_to_file,
 		                   params.filename, from_format, to_format, el,
 		                   Converters::try_default | Converters::try_cache);
 	// return success