]> git.lyx.org Git - features.git/commitdiff
Do not rely on make_pair converting string to FileName
authorVincent van Ravesteijn <vfr@lyx.org>
Mon, 8 Oct 2012 19:26:17 +0000 (21:26 +0200)
committerVincent van Ravesteijn <vfr@lyx.org>
Mon, 8 Oct 2012 19:29:32 +0000 (21:29 +0200)
This fixes compilation with MSVC2012.

src/insets/InsetGraphics.cpp

index 1b7e43d974cbae3d26f7164ad7c6e220a1ac1a16..9962af603960154d06351574d86660bda351c15c 100644 (file)
@@ -487,7 +487,7 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir)
        string const file_in = file.absFileName();
        string const only_path = onlyPath(file_in);
        if (rtrim(onlyPath(file_in) , "/") == rtrim(dir, "/"))
-               return make_pair(IDENTICAL_PATHS, file_in);
+               return make_pair(IDENTICAL_PATHS, FileName(file_in));
 
        string mangled = file.mangledFileName();
        if (formats.isZippedFile(file)) {