compilation fix

[lyx.git] / src / lyxrow_funcs.C

diff --git a/src/lyxrow_funcs.C b/src/lyxrow_funcs.C
index 035aba648ac73dd35b11f09b71ea975fa0abb680..ec805f892e415e120dc6af884323568c91fb86e2 100644 (file)
--- a/src/lyxrow_funcs.C
+++ b/src/lyxrow_funcs.C
@@ -19,90 +19,6 @@
 
 using lyx::pos_type;
 
-using std::max;
-using std::min;
-using std::endl;
-
-
-bool isParEnd(Paragraph const & par, Row const & row)
-{
-       return row.end() == par.size();
-}
-
-
-pos_type lastPos(Paragraph const & par, Row const & row)
-{
-       if (par.empty())
-               return 0;
-       pos_type pos = row.end() - 1;
-       if (pos == par.size())
-               --pos;
-       return pos;
-}
-
-
-int numberOfSeparators(Paragraph const & par, Row const & row)
-{
-       pos_type const last = lastPos(par, row);
-       int n = 0;
-       pos_type p = max(row.pos(), par.beginningOfBody());
-       for ( ; p < last; ++p)
-               if (par.isSeparator(p))
-                       ++n;
-       return n;
-}
-
-
-// This is called _once_ from LyXText and should at least be moved into
-// an anonymous namespace there. (Lgb)
-int numberOfHfills(Paragraph const & par, Row const & row)
-{
-       pos_type const last = lastPos(par, row);
-       pos_type first = row.pos();
-
-       // hfill *DO* count at the beginning of paragraphs!
-       if (first)
-               while (first < last && par.isHfill(first))
-                       ++first;
-
-       first = max(first, par.beginningOfBody());
-
-       int n = 0;
-
-       // last, because the end is ignored!
-       for (pos_type p = first; p < last; ++p) {
-               if (par.isHfill(p))
-                       ++n;
-       }
-
-       return n;
-}
-
-
-// This is called _once_ from LyXText and should at least be moved into
-// an anonymous namespace there. (Lgb)
-int numberOfLabelHfills(Paragraph const & par, Row const & row)
-{
-       pos_type last = lastPos(par, row);
-       pos_type first = row.pos();
-
-       // hfill *DO* count at the beginning of paragraphs!
-       if (first)
-               while (first < last && par.isHfill(first))
-                       ++first;
-
-       last = min(last, par.beginningOfBody());
-       int n = 0;
-
-       // last, because the end is ignored
-       for (pos_type p = first; p < last; ++p) {
-               if (par.isHfill(p))
-                       ++n;
-       }
-
-       return n;
-}
-
 
 bool hfillExpansion(Paragraph const & par, Row const & row, pos_type pos)
 {
@@ -111,19 +27,19 @@ bool hfillExpansion(Paragraph const & par, Row const & row, pos_type pos)
 
        // at the end of a row it does not count
        // unless another hfill exists on the line
-       if (pos >= lastPos(par, row)) {
+       if (pos >= row.endpos()) {
                for (pos_type i = row.pos(); i < pos && !par.isHfill(i); ++i)
                        return false;
        }
 
        // at the beginning of a row it does not count, if it is not
        // the first row of a paragaph
-       if (row.isParStart())
+       if (row.pos() == 0)
                return true;
 
        // in some labels it does not count
        if (par.layout()->margintype != MARGIN_MANUAL
-           && pos < par.beginningOfBody())
+           && pos < par.beginOfBody())
                return false;
 
        // if there is anything between the first char of the row and