Fix bug http://bugzilla.lyx.org/show_bug.cgi?id=4599

[lyx.git] / src / Text.cpp

diff --git a/src/Text.cpp b/src/Text.cpp
index 7db3b5db2daf2227ab1b1125ab0f92302c24ab64..2a7942a607de69a2c49716f6bf773881cd97e498 100644 (file)
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -96,7 +96,7 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
                font = Font(inherit_font, bp.language);
                change = Change(Change::UNCHANGED);
 
-               TextClass const & tclass = bp.textClass();
+               DocumentClass const & tclass = bp.documentClass();
 
                if (layoutname.empty())
                        layoutname = tclass.defaultLayoutName();
@@ -125,12 +125,12 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
                                        tclass.defaultLayoutName();
                }
 
-               par.setLayout(bp.textClass()[layoutname]);
+               par.setLayout(bp.documentClass()[layoutname]);
 
                // Test whether the layout is obsolete.
                LayoutPtr const & layout = par.layout();
                if (!layout->obsoleted_by().empty())
-                       par.setLayout(bp.textClass()[layout->obsoleted_by()]);
+                       par.setLayout(bp.documentClass()[layout->obsoleted_by()]);
 
                par.params().read(lex);
 
@@ -355,7 +355,7 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic)
        Paragraph & cpar = cur.paragraph();
        pit_type cpit = cur.pit();
 
-       TextClass const & tclass = cur.buffer().params().textClass();
+       DocumentClass const & tclass = cur.buffer().params().documentClass();
        LayoutPtr const & layout = cpar.layout();
 
        // this is only allowed, if the current paragraph is not empty
@@ -915,10 +915,7 @@ bool Text::handleBibitems(Cursor & cur)
        } 
 
        // otherwise reset to default
-       if (par.useEmptyLayout())
-               cur.paragraph().setLayout(bufparams.textClass().emptyLayout());
-       else
-               cur.paragraph().setLayout(bufparams.textClass().defaultLayout());
+       cur.paragraph().setEmptyOrDefaultLayout(bufparams.documentClass());
        return true;
 }
 
@@ -979,7 +976,7 @@ bool Text::backspacePos0(Cursor & cur)
        bool needsUpdate = false;
 
        BufferParams const & bufparams = cur.buffer().params();
-       TextClass const & tclass = bufparams.textClass();
+       DocumentClass const & tclass = bufparams.documentClass();
        ParagraphList & plist = cur.text()->paragraphs();
        Paragraph const & par = cur.paragraph();
        Cursor prevcur = cur;
@@ -1104,7 +1101,7 @@ bool Text::dissolveInset(Cursor & cur) {
                for (; it != it_end; it++)
                        it->changeLanguage(b.params(), latex_language, b.language());
 
-               pasteParagraphList(cur, plist, b.params().textClassPtr(),
+               pasteParagraphList(cur, plist, b.params().documentClassPtr(),
                                   b.errorList("Paste"));
                // restore position
                cur.pit() = min(cur.lastpit(), spit);