Transfer Paragraph::hfillExpansion() to ParagraphMetrics. This also reduce the depend...

[features.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 3b44f91193f7fd67ee1ebe63f205841e46918fce..7a987dc5591cebedf74e9f66f20046a754efe0ba 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -37,7 +37,6 @@
 #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 +1083,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 +1097,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_;
@@ -2625,42 +2624,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: