Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 3b44f91193f7fd67ee1ebe63f205841e46918fce..0a3f739e74c61655af95007a2bffde8ea4bc2890 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -31,13 +31,11 @@
 #include "Length.h"
 #include "Font.h"
 #include "LyXRC.h"
-#include "Row.h"
 #include "Messages.h"
 #include "OutputParams.h"
 #include "output_latex.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "rowpainter.h"
 #include "sgml.h"
 #include "TexRow.h"
 #include "VSpace.h"
@@ -1084,7 +1082,7 @@ Paragraph::Paragraph(Paragraph const & par)
        InsetList::iterator it = insetlist.begin();
        InsetList::iterator end = insetlist.end();
        for (; it != end; ++it)
-               it->inset = it->inset->clone().release();
+               it->inset = it->inset->clone();
 }
 
 
@@ -1098,7 +1096,7 @@ Paragraph & Paragraph::operator=(Paragraph const & par)
                InsetList::iterator it = insetlist.begin();
                InsetList::iterator end = insetlist.end();
                for (; it != end; ++it)
-                       it->inset = it->inset->clone().release();
+                       it->inset = it->inset->clone();
 
                layout_ = par.layout();
                text_ = par.text_;
@@ -1286,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;
-       }
 }
 
 
@@ -1620,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!");
@@ -2407,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()
@@ -2625,42 +2612,6 @@ char_type Paragraph::transformChar(char_type c, pos_type pos) const
 }
 
 
-bool Paragraph::hfillExpansion(Row const & row, pos_type pos) const
-{
-       if (!isHfill(pos))
-               return false;
-
-       BOOST_ASSERT(pos >= row.pos() && pos < row.endpos());
-
-       // expand at the end of a row only if there is another hfill on the same row
-       if (pos == row.endpos() - 1) {
-               for (pos_type i = row.pos(); i < pos; i++) {
-                       if (isHfill(i))
-                               return true;
-               }
-               return false;
-       }
-
-       // expand at the beginning of a row only if it is the first row of a paragraph
-       if (pos == row.pos()) {
-               return pos == 0;
-       }
-
-       // do not expand in some labels
-       if (layout()->margintype != MARGIN_MANUAL && pos < beginOfBody())
-               return false;
-
-       // if there is anything between the first char of the row and
-       // the specified position that is neither a newline nor an hfill,
-       // the hfill will be expanded, otherwise it won't
-       for (pos_type i = row.pos(); i < pos; i++) {
-               if (!isNewline(i) && !isHfill(i))
-                       return true;
-       }
-       return false;
-}
-
-
 int Paragraph::checkBiblio(bool track_changes)
 {
        //FIXME From JS: