From: Edwin Leuven Date: Mon, 8 Mar 2010 04:08:11 +0000 (+0000) Subject: lil' cleanup X-Git-Tag: 2.0.0~3873 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f7ef9c3e6e20f844e507db2d827314fba845e1d6;p=features.git lil' cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33666 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 59fee941ca..9321f8250a 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -893,19 +893,19 @@ int Tabular::columnWidth(idx_type cell) const int Tabular::rowHeight(idx_type cell) const { - row_type const span = rowSpan(cell); - row_type const row = cellRow(cell); - int h = rowAscent(row) + rowDescent(row); - - for(row_type r = row; r < row + span ; ++r) { - if (r > row) { - h += rowAscent(r); - h += interRowSpace(r); - } - if (r < row + span - 1) - h += rowDescent(r); - } - return h; + row_type const span = rowSpan(cell); + row_type const row = cellRow(cell); + int h = rowAscent(row) + rowDescent(row); + + for(row_type r = row; r < row + span ; ++r) { + if (r > row) { + h += rowAscent(r); + h += interRowSpace(r); + } + if (r < row + span - 1) + h += rowDescent(r); + } + return h; } diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index fd15eece89..7605bff095 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -910,8 +910,6 @@ private: /// void resetPos(Cursor & cur) const; /// - void removeTabularRow(); - /// bool copySelection(Cursor & cur); /// bool pasteClipboard(Cursor & cur);