anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A little more cleanup.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34205 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-04-18 20:42:04 +00:00
parent d0b52ce0aa
commit 6d7cffbd71
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/TextClass.cpp
View File

@ -406,8 +406,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
lexrc.printError("Could not find input file: " + inc);
error = true;
} else if (!read(tmp, MERGE)) {
lexrc.printError("Error reading input"
"file: " + tmp.absFilename());
lexrc.printError("Error reading input file: " + tmp.absFilename());
error = true;
}
}
@ -683,16 +682,18 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
break;
} // end of switch
//Note that this is triggered the first time through the loop unless
//we hit a format tag.
// Note that this is triggered the first time through the loop unless
// we hit a format tag.
if (format != FORMAT)
break;
return FORMAT_MISMATCH;
}
if (format != FORMAT)
return FORMAT_MISMATCH;
// at present, we abort if we encounter an error,
// so there is no point continuing.
if (error)
return ERROR;
if (rt != BASECLASS)
if (rt != BASECLASS)
return (error ? ERROR : OK);
if (defaultlayout_.empty()) {