X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=f453fc45b16b422aa5706a8ea64833a874a93c9a;hb=27f1f8a94857b147fcd5097351ec2fb070c2966e;hp=48b2f605e75233d9ca74d57bfaaa593b721c4365;hpb=b596330093d3fa5d80e3ffc185771df77a02393b;p=lyx.git

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 48b2f605e7..f453fc45b1 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -136,7 +136,6 @@ ParagraphList::const_iterator makeEnvironment(
 
 	Layout const & defaultstyle = buf.params().documentClass().defaultLayout();
 	Layout const & bstyle = par->layout();
-	string item_tag;
 
 	// Opening outter tag
 	sgml::openTag(buf, os, runparams, *pbegin);
@@ -238,7 +237,7 @@ ParagraphList::const_iterator makeEnvironment(
 	if (bstyle.latextype == LATEX_ENVIRONMENT && bstyle.pass_thru)
 		os << "]]>";
 
-	// Closing outter tag
+	// Closing outer tag
 	sgml::closeTag(os, *pbegin);
 
 	return pend;
@@ -328,8 +327,8 @@ void docbookParagraphs(Text const & text,
 
 	// if only part of the paragraphs will be outputed
 	if (runparams.par_begin !=  runparams.par_end) {
-		par = next(paragraphs.begin(), runparams.par_begin);
-		pend = next(paragraphs.begin(), runparams.par_end);
+		par = lyx::next(paragraphs.begin(), runparams.par_begin);
+		pend = lyx::next(paragraphs.begin(), runparams.par_end);
 		// runparams will be passed to nested paragraphs, so
 		// we have to reset the range parameters.
 		const_cast<OutputParams&>(runparams).par_begin = 0;