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

* reverting previous workarounds. With Martin's commit 21319 there are not needed.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21320 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2007-11-01 09:57:38 +00:00
parent 225d92ba43
commit 6e043a9c22
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Layout.cpp
View File

@ -311,16 +311,16 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
break;
case LT_FONT:
font = lyxRead(lexrc, sane_font);
font = lyxRead(lexrc);
labelfont = font;
break;
case LT_TEXTFONT:
font = lyxRead(lexrc, sane_font);
font = lyxRead(lexrc);
break;
case LT_LABELFONT:
labelfont = lyxRead(lexrc, sane_font);
labelfont = lyxRead(lexrc);
break;
case LT_NEXTNOINDENT: // Indent next paragraph?

2
src/TextClass.cpp
View File

@ -366,7 +366,7 @@ bool TextClass::read(FileName const & filename, ReadType rt)
break;
case TC_DEFAULTFONT:
defaultfont_ = lyxRead(lexrc, sane_font);
defaultfont_ = lyxRead(lexrc);
if (!defaultfont_.resolved()) {
lexrc.printError("Warning: defaultfont should "
"be fully instantiated!");