X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrow.C;h=d043dcfbf760890ac69f383a6d94bdecafb642a9;hb=10f096880fec5afc402fc0910ff44220de0398c9;hp=ec8261cccf1e7b9b21b5c22405ed2f22f2952fa1;hpb=2889b5fd3e8987d0c265ff4726a7fb6c6cb6c034;p=lyx.git diff --git a/src/lyxrow.C b/src/lyxrow.C index ec8261cccf..d043dcfbf7 100644 --- a/src/lyxrow.C +++ b/src/lyxrow.C @@ -4,44 +4,38 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ +#include + +#ifdef __GNUG__ +#pragma implementation +#endif + #include "lyxrow.h" Row::Row() - : par_(0), pos_(0), fill_(0), height_(0), + : par_(0), pos_(0), fill_(0), height_(0), width_(0), ascent_of_text_(0), baseline_(0), next_(0), previous_(0) {} -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_; } @@ -65,9 +59,15 @@ void Row::height(unsigned short h) } -unsigned short Row::height() const +void Row::width(unsigned int w) +{ + width_ = w; +} + + +unsigned int Row::width() const { - return height_; + return width_; } @@ -101,12 +101,6 @@ void Row::next(Row * r) } -Row * Row::next() const -{ - return next_; -} - - void Row::previous(Row * r) { previous_ = r;