Fix bug #6284: missing space between # and text in math mode when using \mbox

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 4102a345c2ab77f6e1aa734816d021a188b37866..30eeb4df31c171bbec946279af339821f6af5a47 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -41,6 +41,10 @@
 #include <fstream>
 #include <sstream>
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 using namespace std;
 using namespace lyx::support;
 
@@ -1198,7 +1202,7 @@ DocumentClass & DocumentClassBundle::makeDocumentClass(
        LayoutModuleList::const_iterator en = modlist.end();
        for (; it != en; it++) {
                string const modName = *it;
-               LyXModule * lm = moduleList[modName];
+               LyXModule * lm = theModuleList[modName];
                if (!lm) {
                        docstring const msg =
                                                bformat(_("The module %1$s has been requested by\n"