"Inter-word Space"

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index 27b6d9d3f17eb5c1b5587af8d1c6d62ab20d2dcb..73e037cc309cc0491e3cefdf2c0e3b6e2101f5e8 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -8,24 +8,25 @@
  * Full author contact details are available in file CREDITS
  */
 
-#include "config.h"
+#include <config.h>
+
 #include "format.h"
+#include "buffer.h"
 #include "lyxrc.h"
 #include "debug.h"
 #include "lyx_cb.h" // for ShowMessage() ... to be removed?
 #include "gettext.h"
 #include "LString.h"
-#include "support/BoostFormat.h"
 
 #include "frontends/Alert.h" //to be removed?
 
+#include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
 #include "support/lyxfunctional.h"
 
 
-
 namespace {
 
 string const token_from("$$i");
@@ -160,16 +161,10 @@ bool Formats::view(Buffer const * buffer, string const & filename,
        if (!format || format->viewer().empty()) {
 // I believe this is the wrong place to show alerts, it should be done by
 // the caller (this should be "utility" code
-#if USE_BOOST_FORMAT
-               Alert::error(_("Cannot view file"),
-                            boost::io::str(boost::format(_("No information for viewing %1$s"))
-                          % prettyName(format_name)));
-#else
                Alert::error(_("Cannot view file"),
-                            _("No information for viewing ")
-                            + prettyName(format_name));
-#endif
-                          return false;
+                       bformat(_("No information for viewing %1$s"),
+                               prettyName(format_name)));
+               return false;
        }
 
        string command = format->viewer();
@@ -201,15 +196,9 @@ bool Formats::view(Buffer const * buffer, string const & filename,
        int const res = one.startscript(Systemcall::DontWait, command);
 
        if (res) {
-#if USE_BOOST_FORMAT
-               Alert::error(_("Cannot view file"),
-                            boost::io::str(boost::format(_("An error occurred whilst running %1$s"))
-                          % command.substr(0, 50)));
-#else
                Alert::error(_("Cannot view file"),
-                            _("An error occurred whilst running ")
-                            + command.substr(0, 50));
-#endif
+                            bformat(_("An error occurred whilst running %1$s"),
+                              command.substr(0, 50)));
                return false;
        }
        return true;