* lyxrow.[Ch]: add end_ member

[lyx.git] / src / lyxrow.C

diff --git a/src/lyxrow.C b/src/lyxrow.C
index d387cd65bcaf80b97b2124fed40363120ffae4fe..40adfda74840f3bb25ce44dd84b84cacde57e842 100644 (file)
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -13,9 +13,6 @@
 #include <config.h>
 
 #include "lyxrow.h"
-#include "paragraph.h"
-#include "layout.h"
-#include "lyxlayout.h"
 #include "debug.h"
 
 using lyx::pos_type;
@@ -24,13 +21,13 @@ using std::max;
 using std::min;
 
 Row::Row()
-       : pos_(0), fill_(0), height_(0), width_(0), y_(0),
+       : pos_(0), end_(0), fill_(0), height_(0), width_(0), y_(0),
          ascent_of_text_(0), baseline_(0)
 {}
 
 
-Row::Row(ParagraphList::iterator pit, pos_type po)
-       : pit_(pit), pos_(po), fill_(0), height_(0), width_(0), y_(0),
+Row::Row(pos_type pos)
+       : pos_(pos), end_(0), fill_(0), height_(0), width_(0), y_(0),
          ascent_of_text_(0), baseline_(0)
 {}
 
@@ -47,39 +44,33 @@ unsigned int Row::y() const
 }
 
 
-ParagraphList::iterator Row::par()
-{
-       return pit_;
-}
-
-
-ParagraphList::iterator Row::par() const
+unsigned short Row::height() const
 {
-       return pit_;
+       return height_;
 }
 
 
-unsigned short Row::height() const
+void Row::pos(pos_type p)
 {
-       return height_;
+       pos_ = p;
 }
 
 
-void Row::par(ParagraphList::iterator pit)
+pos_type Row::pos() const
 {
-       pit_ = pit;
+       return pos_;
 }
 
 
-void Row::pos(pos_type p)
+void Row::end(pos_type p)
 {
-       pos_ = p;
+       end_ = p;
 }
 
 
-pos_type Row::pos() const
+pos_type Row::end() const
 {
-       return pos_;
+       return end_;
 }
 
 
@@ -162,6 +153,6 @@ void Row::dump(const char * s) const
                << " fill: " << fill_
                << " ascent_of_text: " << ascent_of_text_
                << " top_of_text: " << top_of_text_
-               << " y: " << y_ << "\n";
+               << " y: " << y_ << std::endl;
 }