cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / output.C

diff --git a/src/output.C b/src/output.C
index 11e96aee6a42a5818b0bafc307c59ff56c6d4e66..e45640df36684daf5f246de69fce3f7eeb83c80f 100644 (file)
--- a/src/output.C
+++ b/src/output.C
@@ -23,6 +23,8 @@
 using lyx::support::bformat;
 using lyx::support::makeDisplayPath;
 
+using lyx::docstring;
+
 using std::ofstream;
 using std::string;
 
@@ -30,10 +32,10 @@ bool openFileWrite(ofstream & ofs, string const & fname)
 {
        ofs.open(fname.c_str());
        if (!ofs) {
-               string const file = makeDisplayPath(fname, 50);
-               string text = bformat(lyx::to_utf8(_("Could not open the specified "
-                                                    "document\n%1$s.")), file);
-               Alert::error(lyx::to_utf8(_("Could not open file")), text);
+               docstring const file = makeDisplayPath(fname, 50);
+               docstring text = bformat(_("Could not open the specified "
+                                                    "document\n%1$s."), file);
+               Alert::error(_("Could not open file"), text);
                return false;
        }
        return true;