revert r37459 and add a note to the sources:

[lyx.git] / src / insets / InsetLabel.cpp

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 9c41e602ca6b443de8f960600a1a64d23e552947..6f2e9f59ce295f7f0c22050dcc22e4842e419647 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -125,7 +125,7 @@ void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
        buffer().setInsetLabel(label, this);
        screen_label_ = label;
 
-       if (utype) {
+       if (utype == OutputUpdate) {
                // save info on the active counter
                Counters const & cnts = 
                        buffer().masterBuffer()->params().documentClass().counters();
@@ -135,14 +135,14 @@ void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
                        counter_value_ = cnts.theCounter(active_counter_, lang->code());
                        pretty_counter_ = cnts.prettyCounter(active_counter_, lang->code());
                } else {
-                       counter_value_ = from_ascii("??");
-                       pretty_counter_ = from_ascii("??");
+                       counter_value_ = from_ascii("#");
+                       pretty_counter_ = from_ascii("#");
                }
        }
 }
 
 
-void InsetLabel::addToToc(DocIterator const & cpit)
+void InsetLabel::addToToc(DocIterator const & cpit) const
 {
        docstring const & label = getParam("name");
        Toc & toc = buffer().tocBackend().toc("label");
@@ -158,8 +158,7 @@ void InsetLabel::addToToc(DocIterator const & cpit)
                DocIterator const ref_pit(it->second);
                if (it->first->lyxCode() == MATH_REF_CODE)
                        toc.push_back(TocItem(ref_pit, 1,
-                               it->first->asInsetMath()->asHullInset()->asRefInset()
-                                       ->screenLabel()));
+                               it->first->asInsetMath()->asRefInset()->screenLabel()));
                else
                        toc.push_back(TocItem(ref_pit, 1,
                                static_cast<InsetRef *>(it->first)->screenLabel()));
@@ -197,8 +196,10 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
                        cur.noScreenUpdate();
                        break;
                }
-               if (p["name"] != params()["name"])
+               if (p["name"] != params()["name"]) {
+                       // undo is handled in updateCommand
                        updateCommand(p["name"]);
+               }
                cur.forceBufferUpdate();
                break;
        }