A couple of minor bug fixes and cleanups

[lyx.git] / src / lyxtextclasslist.C

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 6050c266cba0e2ed98b5a98b7bba41c8178feb0c..66b9e162845c33fbda7245b6cc118cbd0cc44c20 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -29,6 +29,10 @@
 
 #include <utility>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::exit;
+#endif
+
 using lyx::textclass_type;
 using std::pair;
 using std::make_pair;
@@ -129,22 +133,17 @@ bool LyXTextClassList::Read ()
                        lyxerr[Debug::TCLASS] << "Fname: " << fname << endl;
                        if (lex.next()) {
                                string const clname = lex.getString();
-                               lyxerr[Debug::TCLASS]
-                                       << "Clname: " << clname << endl;
+                               lyxerr[Debug::TCLASS] << "Clname: " << clname << endl;
                                if (lex.next()) {
-                                             string const desc = lex.getString();
-                                             lyxerr[Debug::TCLASS]
-                                                     << "Desc: " << desc << endl;
-                                             // This code is run when we have
-                                             // fname, clname and desc
-                                             LyXTextClass tmpl(fname,
-                                                               clname,
-                                                               desc);
-                                             if (lyxerr.
-                                                 debugging(Debug::TCLASS)) {
-                                                     tmpl.load();
-                                             }
-                                             Add (tmpl);
+                                       string const desc = lex.getString();
+                                       lyxerr[Debug::TCLASS] << "Desc: " << desc << endl;
+                                       // This code is run when we have
+                                       // fname, clname and desc
+                                       LyXTextClass tmpl(fname, clname, desc);
+                                       if (lyxerr.debugging(Debug::TCLASS)) {
+                                               tmpl.load();
+                                       }
+                                       Add(tmpl);
                                }
                        }
                }