fix crash after removing a table row (again due to uncorrected cursor

[lyx.git] / src / output_docbook.C

diff --git a/src/output_docbook.C b/src/output_docbook.C
index 77faddc5b1af4c74c9e8a2768ef0f6d321598628..a5285e51b185fe7a670f2972e2f9b85ea606a4ba 100644 (file)
--- a/src/output_docbook.C
+++ b/src/output_docbook.C
@@ -64,8 +64,8 @@ void docbookParagraphs(Buffer const & buf,
 
        string item_tag;
 
-       ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
-       ParagraphList::iterator pend = const_cast<ParagraphList&>(paragraphs).end();
+       ParagraphList::const_iterator par = paragraphs.begin();
+       ParagraphList::const_iterator pend = paragraphs.end();
 
        Counters & counters = buf.params().getLyXTextClass().counters();
 
@@ -219,7 +219,7 @@ void docbookParagraphs(Buffer const & buf,
                }
 
                par->simpleDocBookOnePar(buf, os,
-                       outerFont(par - const_cast<ParagraphList&>(paragraphs).begin(), paragraphs),
+                       outerFont(par - paragraphs.begin(), paragraphs),
                        runparams, depth + 1 + command_depth);
 
                // write closing SGML tags
@@ -252,8 +252,8 @@ void docbookParagraphs(Buffer const & buf,
        // Close open tags
        for (int d = depth; d >= 0; --d) {
                if (!environment_stack[depth].empty()) {
-                               sgml::closeEnvTags(os, false, environment_inner[depth],
-                                       item_tag, command_depth + depth);
+                       sgml::closeEnvTags(os, false, environment_inner[d], item_tag, command_depth + d);
+                       sgml::closeTag(os, d + command_depth, false, environment_stack[d]);
                }
        }