do what the FIXME suggested

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index ada2517b3b358af70c1f67bb0ede656b1c058881..d51aa8a12924b1a9556fdd33c4d128281c94c357 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1522,7 +1522,7 @@ docstring const Paragraph::translateIfPossible(docstring const & s,
 docstring Paragraph::expandLabel(LayoutPtr const & layout,
                BufferParams const & bparams, bool process_appendix) const
 {
-       TextClass const & tclass = bparams.textClass();
+       DocumentClass const & tclass = bparams.documentClass();
 
        docstring fmt;
        if (process_appendix && d->params_.appendix())
@@ -1827,7 +1827,7 @@ bool Paragraph::latex(BufferParams const & bparams,
        bool asdefault = forceEmptyLayout();
 
        if (asdefault)
-               style = bparams.textClass().defaultLayout();
+               style = bparams.documentClass().emptyLayout();
         else
                style = d->layout_;
 
@@ -2348,7 +2348,7 @@ void Paragraph::setLayout(LayoutPtr const & layout)
 }
 
 
-void Paragraph::setEmptyOrDefaultLayout(TextClass const & tclass)
+void Paragraph::setEmptyOrDefaultLayout(DocumentClass const & tclass)
 {
        if (useEmptyLayout())
                setLayout(tclass.emptyLayout());
@@ -2699,7 +2699,7 @@ void Paragraph::deregisterWords()
 }
 
 
-void Paragraph::collectWords(Buffer const & buf, CursorSlice const & sl)
+void Paragraph::collectWords(CursorSlice const & sl)
 {
        // find new words
        bool inword = false;
@@ -2743,11 +2743,11 @@ void Paragraph::registerWords()
 }
 
 
-void Paragraph::updateWords(Buffer const & buf, CursorSlice const & sl)
+void Paragraph::updateWords(CursorSlice const & sl)
 {
        BOOST_ASSERT(&sl.paragraph() == this);
        deregisterWords();
-       collectWords(buf, sl);
+       collectWords(sl);
        registerWords();
 }