anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't return a bool if void is sufficient...

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7455 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-07-30 16:14:02 +00:00
parent eead5ba43d
commit 202900df42
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/insets/insettabular.C
View File

@ -1256,13 +1256,11 @@ void InsetTabular::calculate_dimensions_of_cells(MetricsInfo & mi) const
tabular.getCellInset(cell).metrics(m, dim); tabular.getCellInset(cell).metrics(m, dim);
maxAsc = max(maxAsc, dim.asc); maxAsc = max(maxAsc, dim.asc);
maxDesc = max(maxDesc, dim.des); maxDesc = max(maxDesc, dim.des);
changed = tabular.setWidthOfCell(cell, dim.wid) || changed; tabular.setWidthOfCell(cell, dim.wid);
} }
changed = tabular.setAscentOfRow(i, maxAsc + ADD_TO_HEIGHT) || changed; tabular.setAscentOfRow(i, maxAsc + ADD_TO_HEIGHT);
changed = tabular.setDescentOfRow(i, maxDesc + ADD_TO_HEIGHT) || changed; tabular.setDescentOfRow(i, maxDesc + ADD_TO_HEIGHT);
} }
//if (changed)
// tabular.reinit();
} }
@ -1352,9 +1350,9 @@ int InsetTabular::getCellXPos(int cell) const
for (; !tabular.isFirstCellInRow(c); --c) for (; !tabular.isFirstCellInRow(c); --c)
; ;
int lx = tabular.getWidthOfColumn(cell); int lx = tabular.getWidthOfColumn(cell);
for (; c < cell; ++c) { for (; c < cell; ++c)
lx += tabular.getWidthOfColumn(c); lx += tabular.getWidthOfColumn(c);
}
return (lx - tabular.getWidthOfColumn(cell) + top_x); return (lx - tabular.getWidthOfColumn(cell) + top_x);
} }
@ -1393,8 +1391,8 @@ void InsetTabular::resetPos(BufferView * bv) const
new_x += offset; new_x += offset;
cursorx_ = new_x; cursorx_ = new_x;
// cursor.x(getCellXPos(actcell) + offset); // cursor.x(getCellXPos(actcell) + offset);
if ((actcol < tabular.columns() - 1) && scroll(false) && if (actcol < tabular.columns() - 1 && scroll(false) &&
(tabular.getWidthOfTabular() < bv->workWidth()-20)) tabular.getWidthOfTabular() < bv->workWidth()-20)
{ {
scroll(bv, 0.0F); scroll(bv, 0.0F);
updateLocal(bv, FULL); updateLocal(bv, FULL);
@ -1402,7 +1400,7 @@ void InsetTabular::resetPos(BufferView * bv) const
tabular.getWidthOfColumn(actcell) > bv->workWidth() - 20) tabular.getWidthOfColumn(actcell) > bv->workWidth() - 20)
{ {
int xx = cursorx_ - offset + bv->text->getRealCursorX(); int xx = cursorx_ - offset + bv->text->getRealCursorX();
if (xx > (bv->workWidth()-20)) { if (xx > bv->workWidth()-20) {
scroll(bv, -(xx - bv->workWidth() + 60)); scroll(bv, -(xx - bv->workWidth() + 60));
updateLocal(bv, FULL); updateLocal(bv, FULL);
} else if (xx < 20) { } else if (xx < 20) {
@ -1413,16 +1411,16 @@ void InsetTabular::resetPos(BufferView * bv) const
scroll(bv, xx); scroll(bv, xx);
updateLocal(bv, FULL); updateLocal(bv, FULL);
} }
} else if ((cursorx_ - offset) > 20 && } else if (cursorx_ - offset > 20 &&
(cursorx_ - offset + tabular.getWidthOfColumn(actcell)) cursorx_ - offset + tabular.getWidthOfColumn(actcell)
> (bv->workWidth() - 20)) { > bv->workWidth() - 20) {
scroll(bv, -tabular.getWidthOfColumn(actcell) - 20); scroll(bv, -tabular.getWidthOfColumn(actcell) - 20);
updateLocal(bv, FULL); updateLocal(bv, FULL);
} else if ((cursorx_ - offset) < 20) { } else if (cursorx_ - offset < 20) {
scroll(bv, 20 - cursorx_ + offset); scroll(bv, 20 - cursorx_ + offset);
updateLocal(bv, FULL); updateLocal(bv, FULL);
} else if (scroll() && top_x > 20 && } else if (scroll() && top_x > 20 &&
(top_x + tabular.getWidthOfTabular()) > (bv->workWidth() - 20)) { (top_x + tabular.getWidthOfTabular()) > bv->workWidth() - 20) {
scroll(bv, old_x - cursorx_); scroll(bv, old_x - cursorx_);
updateLocal(bv, FULL); updateLocal(bv, FULL);
} }
@ -2635,8 +2633,7 @@ bool InsetTabular::insertAsciiString(BufferView * bv, string const & buf,
string::size_type len = buf.length(); string::size_type len = buf.length();
string::size_type p = 0; string::size_type p = 0;
while (p < len && while (p < len && (p = buf.find_first_of("\t\n", p)) != string::npos)
((p = buf.find_first_of("\t\n", p)) != string::npos))
{ {
switch (buf[p]) { switch (buf[p]) {
case '\t': case '\t':