Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index fc606dca47a23768c7c4df7f71ae2aee2166c44d..0a3f739e74c61655af95007a2bffde8ea4bc2890 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1284,17 +1284,6 @@ void Paragraph::insertInset(pos_type pos, Inset * inset,
        pimpl_->insertInset(pos, inset, change);
        // Set the font/language of the inset...
        setFont(pos, font);
-       // ... as well as the font/language of the text inside the inset
-       // FIXME: This is far from perfect. It basically overrides work being done
-       // in the InsetText constructor. Also, it doesn't work for Tables 
-       // (precisely because each cell's font/language is set in the Table's 
-       // constructor, so by now it's too late). The long-term solution should
-       // be moving current_font into Cursor, and getting rid of all this...
-       // (see http://thread.gmane.org/gmane.editors.lyx.devel/88869/focus=88944)
-       if (inset->asTextInset()) {
-               inset->asTextInset()->text_.current_font = font;
-               inset->asTextInset()->text_.real_current_font = font;
-       }
 }
 
 
@@ -1618,7 +1607,7 @@ docstring const & Paragraph::getLabelstring() const
 // the next two functions are for the manual labels
 docstring const Paragraph::getLabelWidthString() const
 {
-       if (!params().labelWidthString().empty())
+       if (layout()->margintype == MARGIN_MANUAL)
                return params().labelWidthString();
        else
                return _("Senseless with this layout!");
@@ -2405,7 +2394,7 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 }
 
 
-bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
+bool Paragraph::isRTL(BufferParams const & bparams) const
 {
        return lyxrc.rtl_support
                && getParLanguage(bparams)->rightToLeft()