InsetHyperlink.cpp: fix a bug I introduced in r26218

[lyx.git] / src / output.cpp

diff --git a/src/output.cpp b/src/output.cpp
index 4e0890db192baa0fbb688bac63d4e66428479071..6fb2fe373ecb082f53e0411eb280b5b33f30cde5 100644 (file)
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -12,36 +12,32 @@
 
 #include "output.h"
 
-#include "gettext.h"
+#include "support/gettext.h"
 
-#include "frontends/Alert.h"
+#include "frontends/alert.h"
 
+#include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-using support::FileName;
-using support::makeDisplayPath;
-
-using std::ofstream;
-using std::string;
-
 namespace {
 
 template<typename OFStream>
 bool doOpenFileWrite(OFStream & ofs, FileName const & fname)
 {
        ofs.open(fname.toFilesystemEncoding().c_str());
-       if (!ofs) {
-               docstring const file = makeDisplayPath(fname.absFilename(), 50);
-               docstring text = bformat(_("Could not open the specified "
-                                                    "document\n%1$s."), file);
-               frontend::Alert::error(_("Could not open file"), text);
-               return false;
-       }
-       return true;
+       if (ofs)
+               return true;
+       docstring const file = fname.displayName(50);
+       docstring text = bformat(_("Could not open the specified "
+                                                        "document\n%1$s."), file);
+       frontend::Alert::error(_("Could not open file"), text);
+       return false;
 }
 
 }