From df62af4323c8916b711355afa0c7f41820ebeebf Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 8 Jun 2010 13:38:12 +0000 Subject: [PATCH] fix warnings git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34630 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/HunspellChecker.cpp | 4 ++-- src/insets/InsetTabular.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp index 19dc81d5d6..f5b9d0c61a 100644 --- a/src/HunspellChecker.cpp +++ b/src/HunspellChecker.cpp @@ -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; } }; diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index f647c00cb7..b6fd5a9241 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -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) {