X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=fab24b25854400a08ee182d422f50c5cf3dfd991;hb=10f096880fec5afc402fc0910ff44220de0398c9;hp=a7f2cbd330e1cef94814accdc594c751365fa438;hpb=b1b9e976a475915a2105cb744c7a428b5be1269c;p=lyx.git diff --git a/src/text.C b/src/text.C index a7f2cbd330..fab24b2585 100644 --- a/src/text.C +++ b/src/text.C @@ -46,6 +46,7 @@ using std::max; using std::min; using std::endl; using std::pair; +using lyx::pos_type; namespace { @@ -230,7 +231,7 @@ int LyXText::singleWidth(BufferView * bview, Paragraph * par, // Returns the paragraph position of the last character in the specified row -LyXText::pos_type LyXText::rowLast(Row const * row) const +pos_type LyXText::rowLast(Row const * row) const { if (row->next() == 0) return row->par()->size() - 1; @@ -241,7 +242,7 @@ LyXText::pos_type LyXText::rowLast(Row const * row) const } -LyXText::pos_type LyXText::rowLastPrintable(Row const * row) const +pos_type LyXText::rowLastPrintable(Row const * row) const { pos_type const last = rowLast(row); if (last >= row->pos() @@ -878,7 +879,7 @@ int LyXText::labelEnd(BufferView * bview, Row const * row) const // get the next breakpoint in a given paragraph -LyXText::pos_type +pos_type LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const { Paragraph * par = row->par(); @@ -888,7 +889,6 @@ LyXText::nextBreakPoint(BufferView * bview, Row const * row, int width) const pos_type const pos = row->pos(); - // position of the last possible breakpoint // -1 isn't a suitable value, but a flag pos_type last_separator = -1; @@ -3581,7 +3581,7 @@ int LyXText::defaultHeight() const /* returns the column near the specified x-coordinate of the row * x is set to the real beginning of this column */ -LyXText::pos_type +pos_type LyXText::getColumnNearX(BufferView * bview, Row * row, int & x, bool & boundary) const {