Partial fix bug 2092: branches not propagated to child documents

[lyx.git] / src / sgml.C

diff --git a/src/sgml.C b/src/sgml.C
index c10e8d81f77a393429096aaaa58ae4603b46cdc3..6e3f732ef78235cd135feb7598db658bd019d73c 100644 (file)
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -22,7 +22,7 @@
 
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/tuple/tuple.hpp>
 
@@ -220,7 +220,7 @@ void openTag(Buffer const & buf, ostream & os, OutputParams const & runparams, P
                if (param.find('#') != string::npos) {
                        string::size_type pos = param.find("id=<");
                        string::size_type end = param.find(">");
-                       if( pos != string::npos and end != string::npos)
+                       if( pos != string::npos && end != string::npos)
                                param.erase(pos, end-pos + 1);
                }
                attribute = id + ' ' + param;