fix warnings

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34630 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp
index 19dc81d5d6de7721471cbdcbde51c12364b7dc11..f5b9d0c61a88158662e9af684042eca3b9b59ceb 100644 (file)
--- 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 f647c00cb76e00c7283a030f7eb4d206f0e6a561..b6fd5a9241b1e246b00245ec1d54531d18a4349a 100644 (file)
--- 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) {