remove noload/don't typeset

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index bbef7616f38203f30e1a4eb0b99b335786e04926..6a8b7de19f5d15b200f7d02e4b6bc7e0158c7d2e 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -24,6 +24,8 @@
 #include "gettext.h"
 #include "lyxlex.h"
 
+#include "graphics/GraphicsTypes.h"
+
 #include "bufferlist.h"
 #include "buffer.h"
 #include "lyxserver.h"
@@ -85,6 +87,11 @@ LyX::LyX(int & argc, char * argv[])
        toplevel_keymap.reset(new kb_keymap);
        defaultKeyBindings(toplevel_keymap.get());
 
+       // set the DisplayTranslator only once; should that be done here??
+       // if this should not be in this file, please also remove
+       // #include "graphics/GraphicsTypes.h" at the top -- Rob Lahaye.
+       grfx::setDisplayTranslator();
+       
        if (want_gui) {
                lyx_gui::parse_init(argc, argv);
        }
@@ -570,7 +577,7 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
                first_start = false;
                return;
        }
- 
+
        first_start = !explicit_userdir;
 
        // If the user specified explicitly a directory, ask whether
@@ -635,7 +642,7 @@ void LyX::readUIFile(string const & name)
                ui_last
        };
 
-       struct keyword_item uitags[ui_last-1] = {
+       struct keyword_item uitags[ui_last - 1] = {
                { "menuset", ui_menuset },
                { "toolbar", ui_toolbar }
        };
@@ -860,7 +867,7 @@ bool LyX::easyParse(int & argc, char * argv[])
 
                string arg((i + 1 < argc) ? argv[i + 1] : "");
                string arg2((i + 2 < argc) ? argv[i + 2] : "");
- 
+
                int const remove = 1 + it->second(arg, arg2);
 
                // Now, remove used arguments by shifting