Added possibility to retrieve internal buffers (by their tmp file-name) from the...

[lyx.git] / src / Counters.cpp

diff --git a/src/Counters.cpp b/src/Counters.cpp
index d7ef519ab8ced45cb288b14bf03f77f3c8d782cc..4960eed5be87c10617f53695f4ea27be359741ff 100644 (file)
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -145,6 +145,15 @@ docstring const & Counter::master() const
 }
 
 
+bool Counter::checkAndRemoveMaster(docstring const & cnt)
+{
+       if (master_ != cnt)
+               return false;
+       master_ = docstring();
+       return true;
+}
+
+
 docstring const & Counter::labelString(bool in_appendix) const
 {
        return in_appendix ? labelstringappendix_ : labelstring_;
@@ -294,6 +303,22 @@ void Counters::reset(docstring const & match)
 }
 
 
+bool Counters::remove(docstring const & cnt)
+{
+       bool retval = counterList_.erase(cnt);
+       if (!retval)
+               return false;
+       CounterList::iterator it = counterList_.begin();
+       CounterList::iterator end = counterList_.end();
+       for (; it != end; ++it) {
+               if (it->second.checkAndRemoveMaster(cnt))
+                       LYXERR(Debug::TCLASS, "Removed master counter `" +
+                                       to_utf8(cnt) + "' from counter: " + to_utf8(it->first));
+       }
+       return retval;
+}
+
+
 void Counters::copy(Counters & from, Counters & to, docstring const & match)
 {
        CounterList::iterator it = counterList_.begin();
@@ -451,7 +476,7 @@ docstring Counters::theCounter(docstring const & counter,
        if (smit != sm.end())
                return counterLabel(smit->second, lang);
 
-       deque<docstring> callers;
+       vector<docstring> callers;
        docstring const & fls = flattenLabelString(counter, appendix(),
                                                   lang, callers);
        sm[lang] = fls;
@@ -462,7 +487,7 @@ docstring Counters::theCounter(docstring const & counter,
 docstring Counters::flattenLabelString(docstring const & counter, 
                                       bool in_appendix,
                                       string const & lang,
-                                      deque<docstring> & callers) const
+                                      vector<docstring> & callers) const
 {
        docstring label;