Fix bug 1749. CAUTION: lyx2lyx not fully working yet (see FIXMEs).

[lyx.git] / src / output_docbook.cpp

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 10d15e1a13aa16dfae36204a0a3be673414bb3c5..83f2e4029504db517b872baa5b1e4b9f4e7a61e0 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -61,11 +61,11 @@ ParagraphList::const_iterator searchCommand(
                ParagraphList::const_iterator const & par,
                ParagraphList::const_iterator const & pend)
 {
-       LyXLayout_ptr const & bstyle = par->layout();
+       Layout_ptr const & bstyle = par->layout();
        ParagraphList::const_iterator p = boost::next(par);
 
        for ( ; p != pend; ++p) {
-               LyXLayout_ptr const & style = p->layout();
+               Layout_ptr const & style = p->layout();
                if (style->latextype == LATEX_COMMAND
                                && style->commanddepth <= bstyle->commanddepth)
                        return p;
@@ -78,10 +78,10 @@ ParagraphList::const_iterator searchEnvironment(
                ParagraphList::const_iterator const & par,
                ParagraphList::const_iterator const & pend)
 {
-       LyXLayout_ptr const & bstyle = par->layout();
+       Layout_ptr const & bstyle = par->layout();
        ParagraphList::const_iterator p = boost::next(par);
        for (; p != pend; ++p) {
-               LyXLayout_ptr const & style = p->layout();
+               Layout_ptr const & style = p->layout();
                if (style->latextype == LATEX_COMMAND)
                        return p;
 
@@ -109,8 +109,8 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
                                            ParagraphList::const_iterator const & pbegin,
                                            ParagraphList::const_iterator const & pend)
 {
-       LyXLayout_ptr const & defaultstyle =
-               buf.params().getLyXTextClass().defaultLayout();
+       Layout_ptr const & defaultstyle =
+               buf.params().getTextClass().defaultLayout();
        for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
                if (par != pbegin)
                        os << '\n';
@@ -134,8 +134,8 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                                              ParagraphList::const_iterator const & pend) {
        ParagraphList::const_iterator par = pbegin;
 
-       LyXLayout_ptr const & defaultstyle = buf.params().getLyXTextClass().defaultLayout();
-       LyXLayout_ptr const & bstyle = par->layout();
+       Layout_ptr const & defaultstyle = buf.params().getTextClass().defaultLayout();
+       Layout_ptr const & bstyle = par->layout();
        string item_tag;
 
        // Opening outter tag
@@ -145,7 +145,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                os << "<![CDATA[";
 
        while (par != pend) {
-               LyXLayout_ptr const & style = par->layout();
+               Layout_ptr const & style = par->layout();
                ParagraphList::const_iterator send;
                string id = par->getID(buf, runparams);
                string wrapper = "";
@@ -247,7 +247,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
                                          ParagraphList::const_iterator const & pend)
 {
        ParagraphList::const_iterator par = pbegin;
-       LyXLayout_ptr const & bstyle = par->layout();
+       Layout_ptr const & bstyle = par->layout();
 
        //Open outter tag
        sgml::openTag(buf, os, runparams, *pbegin);
@@ -269,7 +269,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
 
        ++par;
        while (par != pend) {
-               LyXLayout_ptr const & style = par->layout();
+               Layout_ptr const & style = par->layout();
                ParagraphList::const_iterator send;
 
                switch (style->latextype) {
@@ -319,9 +319,9 @@ void docbookParagraphs(ParagraphList const & paragraphs,
                const_cast<OutputParams&>(runparams).par_begin = 0;
                const_cast<OutputParams&>(runparams).par_end = 0;
        }
-       
+
        while (par != pend) {
-               LyXLayout_ptr const & style = par->layout();
+               Layout_ptr const & style = par->layout();
                ParagraphList::const_iterator lastpar = par;
                ParagraphList::const_iterator send;