fix wrong tex2lyx hack

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22008 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Layout.cpp b/src/Layout.cpp
index c5bc4e5d1031b627a456833ea0be088a3aaa466e..598222237a9fbbe41d81aa84390b7240549ffeae 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -29,9 +29,6 @@ namespace lyx {
 using support::subst;
 using support::trim;
 
-#ifndef FONT_H
-extern FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
-#endif
 
 /// Special value of toclevel for layouts that to not belong in a TOC
 const int Layout::NOT_IN_TOC = -1000;

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 00cbf0941439fc5bbc89cea97c055c12ab2c8f36..f3fa29263d090fa416bf26da093f3f1628805c58 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -50,8 +50,6 @@ using support::rtrim;
 using support::subst;
 using support::addName;
 
-extern FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
-
 
 namespace {
 

diff --git a/src/tex2lyx/Font.h b/src/tex2lyx/Font.h
index 408754aafa60036d190cacf0116d0ea617311036..b77ead7383a6e2a43cd37ee177c7ec779ba5b030 100644 (file)
--- a/src/tex2lyx/Font.h
+++ b/src/tex2lyx/Font.h
@@ -47,7 +47,7 @@ public:
 };
 
 /// Read a font specification from Lexer. Used for layout files.
-FontInfo lyxRead(Lexer &, FontInfo const & fi);
+FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
 
 } // namespace lyx