From 2cc4d6ae254e3d1b777cfbb47a449b125e5bdc00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 11 Dec 2011 23:17:02 +0000 Subject: [PATCH] tex2lyx/text.cpp: add a missing ',' and use LyX's method to remove the file extension (thanks Georg) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40480 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/text.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp index 2b5d0acb0b..53c6cd722f 100644 --- a/src/tex2lyx/text.cpp +++ b/src/tex2lyx/text.cpp @@ -2352,9 +2352,10 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer, // The file extension is in every case ".tex". // So we need to remove this extension and check for // the original one. - name.erase(name.length() - 4, name.length()); + name = removeExtension(name); + //name.erase(name.length() - 4, name.length()); if (!makeAbsPath(name, path).exists()) { - 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);