Fix natbib bug spotted by JMarc.

[lyx.git] / src / lyxrow.C

diff --git a/src/lyxrow.C b/src/lyxrow.C
index 539253a3a6a40a7db2abd5a7ed9690f2bfbabe1c..804cbc7e99517f640363a1a401522f5710e25df1 100644 (file)
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -1,10 +1,10 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -23,31 +23,19 @@ Row::Row()
 {}
 
 
-void Row::par(LyXParagraph * p)
+void Row::par(Paragraph * p)
 {
        par_ = p;
 }
 
 
-LyXParagraph * Row::par()
-{
-       return par_;
-}
-
-
-LyXParagraph * Row::par() const
-{
-       return par_;
-}
-
-
-void Row::pos(LyXParagraph::size_type p)
+void Row::pos(lyx::pos_type p)
 {
        pos_ = p;
 }
 
 
-LyXParagraph::size_type Row::pos() const
+lyx::pos_type Row::pos() const
 {
        return pos_;
 }
@@ -71,12 +59,6 @@ void Row::height(unsigned short h)
 }
 
 
-unsigned short Row::height() const
-{
-       return height_;
-}
-
-
 void Row::width(unsigned int w)
 {
        width_ = w;
@@ -101,6 +83,18 @@ unsigned short Row::ascent_of_text() const
 }
 
 
+void Row::top_of_text(unsigned int top)
+{
+       top_of_text_ = top;
+}
+
+ 
+unsigned int Row::top_of_text() const
+{
+       return top_of_text_;
+}
+
+ 
 void Row::baseline(unsigned int b)
 {
        baseline_ = b;
@@ -119,12 +113,6 @@ void Row::next(Row * r)
 }
 
 
-Row * Row::next() const
-{
-       return next_;
-}
-
-
 void Row::previous(Row * r)
 {
        previous_ = r;