- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / output_docbook.C

diff --git a/src/output_docbook.C b/src/output_docbook.C
index ead3b3cc31d11edb5c9c5bc35d2202cc61a8717f..152ab9d380adf6513343b78824582a1ba0a5986b 100644 (file)
--- a/src/output_docbook.C
+++ b/src/output_docbook.C
@@ -27,7 +27,7 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/types.h"
 
 #ifdef HAVE_LOCALE
@@ -88,7 +88,7 @@ ParagraphList::const_iterator searchEnvironment(ParagraphList::const_iterator co
                if(p->params().depth() < par->params().depth())
                        return p;
 
-               if( style->latexname() != bstyle->latexname() and p->params().depth() == par->params().depth() )
+               if( style->latexname() != bstyle->latexname() && p->params().depth() == par->params().depth() )
                        return p;
        }
        return pend;
@@ -132,7 +132,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
        // Opening outter tag
        sgml::openTag(buf, os, runparams, *pbegin);
        os << '\n';
-       if (bstyle->latextype == LATEX_ENVIRONMENT and bstyle->pass_thru)
+       if (bstyle->latextype == LATEX_ENVIRONMENT && bstyle->pass_thru)
                os << "<![CDATA[";
 
        while (par != pend) {
@@ -204,7 +204,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                }
        }
 
-       if (bstyle->latextype == LATEX_ENVIRONMENT and bstyle->pass_thru)
+       if (bstyle->latextype == LATEX_ENVIRONMENT && bstyle->pass_thru)
                os << "]]>";
 
        // Closing outter tag
@@ -235,7 +235,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
                sgml::closeTag(os, bstyle->labeltag());
        }
 
-       // Opend inner tag and  close inner tags
+       // Opend inner tag and  close inner tags
        sgml::openTag(os, bstyle->innertag());
        par->simpleDocBookOnePar(buf, os, runparams,  outerFont(par - paragraphs.begin(), paragraphs));
        sgml::closeTag(os, bstyle->innertag());