From: Uwe Stöhr <uwestoehr@web.de>
Date: Sun, 11 Dec 2011 23:24:44 +0000 (+0000)
Subject: tex2lyx/text.cpp: backport fixes from trunk (no status entry necessary)
X-Git-Tag: 2.0.3~124
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d2eefdb889c17b1f0288283703a8fe51cd121a36;p=features.git

tex2lyx/text.cpp: backport fixes from trunk (no status entry necessary)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40482 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index d9821437d3..2c8adca33c 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2340,10 +2340,12 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 						string const path = getMasterFilePath();
 						// We want to preserve relative / absolute filenames,
 						// therefore path is only used for testing
+						// The file extension is in every case ".tex".
+						// So we need to remove this extension and check for
+						// the original one.
+						name = removeExtension(name);
 						if (!makeAbsPath(name, path).exists()) {
-							// The file extension is probably missing.
-							// Now try to find it out.
-							char const * const Gnumeric_formats[] = {"gnumeric"
+							char const * const Gnumeric_formats[] = {"gnumeric",
 								"ods", "xls", 0};
 							string const Gnumeric_name =
 								find_file(name, path, Gnumeric_formats);