Fix loop when opening TOC widget in an empty document, basically by Richard Heck.

[lyx.git] / src / buffer_funcs.C

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index d1b0e76b56fe8f37e86083d04e1939e0f91197cb..35e977fc2e47bd100a02b5ff059c3d659d6a40f2 100644 (file)
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -214,7 +214,6 @@ Buffer * newFile(string const & filename, string const & templatename,
 
        b->setReadonly(false);
        b->fully_loaded(true);
-       b->updateDocLang(b->params().language);
 
        return b;
 }
@@ -550,15 +549,23 @@ void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textcla
        } else if (layout->labeltype == LABEL_SENSITIVE) {
                // Search for the first float or wrap inset in the iterator
                size_t i = it.depth();
-               InsetBase * in;
+               InsetBase * in = 0;
                while (i > 0) {
                        --i;
-                       in = &it[i].inset();
-                       if (in->lyxCode() == InsetBase::FLOAT_CODE
-                           || in->lyxCode() == InsetBase::WRAP_CODE)
+                       InsetBase::Code const code = it[i].inset().lyxCode();
+                       if (code == InsetBase::FLOAT_CODE ||
+                           code == InsetBase::WRAP_CODE) {
+                               in = &it[i].inset();
                                break;
+                       }
                }
-               docstring const & type = in->getInsetName();
+               // FIXME Can getInsetName() return an empty name for wide or
+               // float insets? If not we can put the definition of type
+               // inside the if (in) clause and use that instead of
+               // if (!type.empty()).
+               docstring type;
+               if (in)
+                       type = in->getInsetName();
 
                if (!type.empty()) {
                        Floating const & fl = textclass.floats().getType(to_ascii(type));
@@ -687,8 +694,19 @@ void updateLabels(Buffer const & buf, bool childonly)
                }
        }
 
-       const_cast<Buffer &>(buf).tocBackend().update();
+       Buffer & cbuf = const_cast<Buffer &>(buf);
+       cbuf.tocBackend().update();
+       cbuf.structureChanged();
 }
 
 
+void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
+{
+       if (par_it->layout()->labeltype == LABEL_COUNTER
+               && par_it->layout()->toclevel != LyXLayout::NOT_IN_TOC) {
+               buffer.tocBackend().updateItem(par_it);
+               buffer.structureChanged();
+       }
+}
+
 } // namespace lyx