fix warnings

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34630 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2010-06-08 13:38:12 +00:00
parent 9fb737d047
commit df62af4323
2 changed files with 4 additions and 3 deletions

View File

@ -70,8 +70,8 @@ struct HunspellChecker::Private
/// the location below system/user directory
/// there the aff+dic files lookup will happen
const string dictDirectory(void) { return "dict"; }
const int maxLookupSelector(void) { return 3; }
const string dictDirectory(void) const { return "dict"; }
int maxLookupSelector(void) const { return 3; }
};

View File

@ -961,12 +961,13 @@ bool Tabular::updateColumnWidths()
int new_width = 0;
for(row_type r = 0; r < nrows(); ++r) {
idx_type const i = cellIndex(r, c);
if (columnSpan(i) == 1)
if (columnSpan(i) == 1) {
if (getAlignment(i) == LYX_ALIGN_DECIMAL)
new_width = max(new_width, cellInfo(i).width
+ max_dwidth[c] - cellInfo(i).decimal_width);
else
new_width = max(new_width, cellInfo(i).width);
}
}
if (column_info[c].width != new_width) {