X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FContext.cpp;h=d7baa2822aca54140d944c4297624a3beb7364fa;hb=7b06307cc66b3b956890b9c736ee8304d4206fea;hp=e1cb6c1b20e8a71180b763c5e6a4ba86d8e58955;hpb=fc6ce7cd08562fd7bab4427880b46390bb7d2f07;p=lyx.git diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp index e1cb6c1b20..d7baa2822a 100644 --- a/src/tex2lyx/Context.cpp +++ b/src/tex2lyx/Context.cpp @@ -25,7 +25,7 @@ using std::string; namespace { -void begin_layout(ostream & os, LyXLayout_ptr layout, TeXFont const & font, +void begin_layout(ostream & os, Layout_ptr layout, TeXFont const & font, TeXFont const & normalfont) { os << "\n\\begin_layout " << layout->name() << "\n"; @@ -84,8 +84,8 @@ bool Context::empty = true; Context::Context(bool need_layout_, - LyXTextClass const & textclass_, - LyXLayout_ptr layout_, LyXLayout_ptr parent_layout_, + TextClass const & textclass_, + Layout_ptr layout_, Layout_ptr parent_layout_, TeXFont font_) : need_layout(need_layout_), need_end_layout(false), need_end_deeper(false),