* Painter.h:

[lyx.git] / src / TocBackend.C

diff --git a/src/TocBackend.C b/src/TocBackend.C
index d7eb1250b8d8f7a9621a02e849784f1dc632eefb..25f8cf4c67378bf56f93d76f049dfa4392aa514f 100644 (file)
--- a/src/TocBackend.C
+++ b/src/TocBackend.C
@@ -33,7 +33,7 @@
 
 #include <iostream>
 
-using lyx::docstring;
+namespace lyx {
 
 using std::vector;
 using std::max;
@@ -42,7 +42,6 @@ using std::string;
 using std::cout;
 using std::endl;
 
-namespace lyx {
 
 ///////////////////////////////////////////////////////////////////////////
 // TocBackend::Item implementation
@@ -187,8 +186,7 @@ void TocBackend::update()
                                Paragraph const & par = *static_cast<InsetOptArg*>(it->inset)->paragraphs().begin();
                                if (!pit->getLabelstring().empty())
                                        // FIXME UNICODE
-                                       tocstring = lyx::from_utf8(
-                                               pit->getLabelstring() + ' ');
+                                       tocstring = pit->getLabelstring() + ' ';
                                tocstring += par.asString(*buffer_, false);
                                break;
                        }
@@ -248,7 +246,7 @@ TocBackend::TocIterator const TocBackend::item(std::string const & type, ParCons
 }
 
 
-void TocBackend::asciiTocList(string const & type, lyx::odocstream & os) const
+void TocBackend::asciiTocList(string const & type, odocstream & os) const
 {
        TocList::const_iterator cit = tocs_.find(type);
        if (cit != tocs_.end()) {