anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 06:19:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40482 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-12-11 23:24:44 +00:00
parent 375082d46f
commit d2eefdb889
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tex2lyx/text.cpp
View File

@ -2340,10 +2340,12 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
string const path = getMasterFilePath(); string const path = getMasterFilePath();
// We want to preserve relative / absolute filenames, // We want to preserve relative / absolute filenames,
// therefore path is only used for testing // 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()) { if (!makeAbsPath(name, path).exists()) {
// The file extension is probably missing. char const * const Gnumeric_formats[] = {"gnumeric",
// Now try to find it out.
char const * const Gnumeric_formats[] = {"gnumeric"
"ods", "xls", 0}; "ods", "xls", 0};
string const Gnumeric_name = string const Gnumeric_name =
find_file(name, path, Gnumeric_formats); find_file(name, path, Gnumeric_formats);