simplify GuiToc / TocWidget interaction. Much can still be simplified...

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index c11dc939c2f1f1ca17cb80d52a87b1b9c90f4307..89880831b2b84a2f6408d3cccd5abd4b2cdbb500 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -30,8 +30,7 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 
-using std::string;
-
+using namespace std;
 
 namespace lyx {
 
@@ -41,9 +40,8 @@ namespace lyx {
 //
 ///////////////////////////////////////////////////////////////////////////
 
-TocItem::TocItem(ParConstIterator const & par_it, int d,
-               docstring const & s)
-               : par_it_(par_it), depth_(d), str_(s)
+TocItem::TocItem(ParConstIterator const & par_it, int d, docstring const & s)
+       : par_it_(par_it), depth_(d), str_(s)
 {
 }
 
@@ -84,7 +82,7 @@ FuncRequest TocItem::action() const
 //
 ///////////////////////////////////////////////////////////////////////////
 
-Toc const & TocBackend::toc(std::string const & type) const
+Toc const & TocBackend::toc(string const & type) const
 {
        // Is the type already supported?
        TocList::const_iterator it = tocs_.find(type);
@@ -190,7 +188,7 @@ void TocBackend::update()
 }
 
 
-TocIterator const TocBackend::item(std::string const & type,
+TocIterator TocBackend::item(string const & type,
                ParConstIterator const & par_it) const
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
@@ -206,12 +204,11 @@ TocIterator const TocBackend::item(std::string const & type,
        --it;
 
        ParConstIterator par_it_text = par_it;
-       if (par_it_text.inMathed())
-               // It would be better to do
-               //   par_it_text.backwardInset();
-               // but this method does not exist.
+       if (par_it_text.inMathed()) {
+               // We are only interested in text so remove the math CursorSlice.
                while (par_it_text.inMathed())
-                       par_it_text.backwardPos();
+                       par_it_text.pop_back();
+       }
 
        for (; it != last; --it) {
                // We verify that we don't compare contents of two