* src/frontends/GuiDocument.{cpp,h}:

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index ba4bc9b09e01a1596f0c33621af5d8da9d6c3237..d5e781a388ba948405cafcc7e1e826e6e0e17c0a 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -28,22 +28,16 @@
 #include "TextClass.h"
 
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/convert.h"
 #include "support/types.h"
 
 #include <boost/next_prior.hpp>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
-
-using std::endl;
-using std::ostream;
-using std::vector;
-using std::string;
-
 namespace {
 
 ParagraphList::const_iterator searchParagraph(
@@ -114,10 +108,10 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
                if (par != pbegin)
                        os << '\n';
                if (par->layout() == defaultstyle && par->emptyTag()) {
-                       par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs));
+                       par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs));
                } else {
                        sgml::openTag(buf, os, runparams, *par);
-                       par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs));
+                       par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs));
                        sgml::closeTag(os, *par);
                }
        }
@@ -182,7 +176,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                case LATEX_ITEM_ENVIRONMENT: {
                        if (par->params().depth() == pbegin->params().depth()) {
                                sgml::openTag(os, wrapper);
-                               par->simpleDocBookOnePar(buf, os, runparams, outerFont(std::distance(paragraphs.begin(), par), paragraphs), sep);
+                               par->simpleDocBookOnePar(buf, os, runparams, outerFont(distance(paragraphs.begin(), par), paragraphs), sep);
                                sgml::closeTag(os, wrapper);
                                ++par;
                        }
@@ -262,7 +256,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
 
        // Opend inner tag and  close inner tags
        sgml::openTag(os, bstyle->innertag());
-       par->simpleDocBookOnePar(buf, os, runparams,  outerFont(std::distance(paragraphs.begin(), par), paragraphs));
+       par->simpleDocBookOnePar(buf, os, runparams,  outerFont(distance(paragraphs.begin(), par), paragraphs));
        sgml::closeTag(os, bstyle->innertag());
        os << '\n';
 
@@ -344,7 +338,7 @@ void docbookParagraphs(ParagraphList const & paragraphs,
                        break;
                }
                // makeEnvironment may process more than one paragraphs and bypass pend
-               if (std::distance(lastpar, par) >= std::distance(lastpar, pend))
+               if (distance(lastpar, par) >= distance(lastpar, pend))
                        break;
        }
 }