more small fixes

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

diff --git a/src/buffer.h b/src/buffer.h
index 7446bd3b5a472b1e5f4ecc87958e0cee5c44e9a5..ad16276e25a19dd8a4101bc768a4245164147a54 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -294,7 +294,7 @@ public:
        string getBibkeyList(char delim = '|');
        ///
        struct TocItem {
-               LyXParagraph *par;
+               LyXParagraph * par;
                int depth;
                string str;
        };

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 26acf58a6a50492ad5325e5fea557bf85795d18b..8715b6dfd63026b612b73d3d05aac813f6e05738 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -3151,9 +3151,15 @@ void TocUpdateCB(FL_OBJECT *, long)
        int type = fl_get_choice(fd_form_toc->toctype)-1;
        //if (toclist == tmp[type])
        //      return;
-       if (toclist.size() == tmp[type].size()
-           && equal(toclist.begin(), toclist.end(), tmp[type].begin()))
-               return;
+       if (toclist.size() == tmp[type].size()) {
+               // Check if all elements are the same.
+               int i = 0;
+               for (; i < toclist.size(); ++i) {
+                       if (toclist[i] !=  tmp[type][i])
+                               break;
+               }
+               if (i >= toclist.size()) return;
+       }
 
        toclist = tmp[type];