Revert 23154.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 293a62e8c8c6df76f7672a4af3e1b75695b98b9f..c34c8e8ac57cace3226abf58930d26bc7db8405b 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1512,7 +1512,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();
+       TextClass const & tclass = bparams.getTextClass();
 
        docstring fmt;
        if (process_appendix && d->params_.appendix())
@@ -1817,10 +1817,11 @@ bool Paragraph::latex(Buffer const & buf,
        // to be valid!
        bool asdefault = forceEmptyLayout();
 
-       if (asdefault)
-               style = bparams.textClass().defaultLayout();
-       else
+       if (asdefault) {
+               style = bparams.getTextClass().defaultLayout();
+       } else {
                style = d->layout_;
+       }
 
        // Current base font for all inherited font changes, without any
        // change caused by an individual character, except for the language: