Fix Lars.

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 1244da6edb547d90144ba72545fbc28a25a3bf5b..0efc7d6e73b57d9a7e14d940e28785b2f34a7872 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -17,7 +17,6 @@
 #include "buffer_funcs.h"
 #include "BufferParams.h"
 #include "Counters.h"
-#include "support/debug.h"
 #include "Layout.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
@@ -27,10 +26,9 @@
 #include "sgml.h"
 #include "TextClass.h"
 
-#include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/convert.h"
-#include "support/types.h"
+#include "support/debug.h"
+#include "support/lstrings.h"
 
 #include <boost/next_prior.hpp>
 
@@ -103,16 +101,17 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
                                            ParagraphList::const_iterator const & pbegin,
                                            ParagraphList::const_iterator const & pend)
 {
-       LayoutPtr const & defaultstyle =
-               buf.params().getTextClass().defaultLayout();
+       LayoutPtr const & defaultstyle = buf.params().documentClass().defaultLayout();
        for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
                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);
                }
        }
@@ -128,7 +127,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                                              ParagraphList::const_iterator const & pend) {
        ParagraphList::const_iterator par = pbegin;
 
-       LayoutPtr const & defaultstyle = buf.params().getTextClass().defaultLayout();
+       LayoutPtr const & defaultstyle = buf.params().documentClass().defaultLayout();
        LayoutPtr const & bstyle = par->layout();
        string item_tag;
 
@@ -157,7 +156,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                        if (!bstyle->labeltag().empty()) {
                                sgml::openTag(os, bstyle->innertag(), id);
                                sgml::openTag(os, bstyle->labeltag());
-                               sep = par->getFirstWord(buf, os, runparams) + 1;
+                               sep = par->firstWord(os, runparams) + 1;
                                sgml::closeTag(os, bstyle->labeltag());
                        }
                        wrapper = defaultstyle->latexname();
@@ -177,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;
                        }
@@ -257,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';
 
@@ -339,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;
        }
 }