DocBook: simplify precooked bibliography code.

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 03ecc90abeb9d9a8bea5c4ec654ac38fde923016..ead443a99ce1987a2d78c4f119591cbd99f49a33 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -80,7 +80,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                        case 0: {
                                // reload the document
                                if (checkBuffer->reload() != Buffer::ReadSuccess)
-                                       return 0;
+                                       return nullptr;
                                return checkBuffer;
                        }
                        case 1:
@@ -88,30 +88,36 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                                return checkBuffer;
                        case 2:
                                // cancel
-                               return 0;
+                               return nullptr;
                }
        }
 
        bool const exists = filename.exists();
        bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
        if (exists || tryVC) {
-               if (exists && !filename.isReadableFile()) {
-                       docstring text = bformat(_("The file %1$s exists but is not "
-                               "readable by the current user."),
-                               from_utf8(filename.absFileName()));
-                       Alert::error(_("File not readable!"), text);
-                       return 0;
+               if (exists) {
+                       if (!filename.isReadableFile()) {
+                               docstring text = bformat(_("The file %1$s exists but is not "
+                                       "readable by the current user."),
+                                       from_utf8(filename.absFileName()));
+                               Alert::error(_("File not readable!"), text);
+                               return nullptr;
+                       }
+                       if (filename.extension() == "lyx" && filename.isFileEmpty()) {
+                               // Makes it possible to open an empty (0 bytes) .lyx file
+                               return newFile(filename.absFileName(), "", true);
+                       }
                }
                Buffer * b = theBufferList().newBuffer(filename.absFileName());
                if (!b) {
                        // Buffer creation is not possible.
-                       return 0;
+                       return nullptr;
                }
                if (b->loadLyXFile() != Buffer::ReadSuccess) {
                        // do not save an emergency file when releasing the buffer
                        b->markClean();
                        theBufferList().release(b);
-                       return 0;
+                       return nullptr;
                }
                return b;
        }
@@ -120,10 +126,10 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                "exist.\n\nDo you want to create a new document?"),
                from_utf8(filename.absFileName()));
        if (!Alert::prompt(_("Create new document?"),
-                       text, 0, 1, _("&Create"), _("Cancel")))
+                       text, 0, 1, _("&Yes, Create New Document"), _("&No, Do Not Create")))
                return newFile(filename.absFileName(), string(), true);
 
-       return 0;
+       return nullptr;
 }
 
 
@@ -135,7 +141,7 @@ Buffer * newFile(string const & filename, string const & templatename,
        Buffer * b = theBufferList().newBuffer(filename);
        if (!b)
                // Buffer creation is not possible.
-               return 0;
+               return nullptr;
 
        FileName tname;
        // use defaults.lyx as a default template if it exists.
@@ -152,7 +158,7 @@ Buffer * newFile(string const & filename, string const & templatename,
                                file);
                        Alert::error(_("Could not read template"), text);
                        theBufferList().release(b);
-                       return 0;
+                       return nullptr;
                }
        }
 
@@ -180,11 +186,11 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
        FileName filename;
 
        do {
-               filename.set(path, 
+               filename.set(path,
                        prefix + convert<string>(++file_number[prefix]) + ".lyx");
        }
        while (theBufferList().exists(filename) || filename.isReadableFile());
-               
+
        return newFile(filename.absFileName(), templatename, false);
 }
 
@@ -194,17 +200,17 @@ Buffer * loadIfNeeded(FileName const & fname)
        Buffer * buffer = theBufferList().getBuffer(fname);
        if (!buffer) {
                if (!fname.exists() && !LyXVC::fileInVC(fname))
-                       return 0;
+                       return nullptr;
 
                buffer = theBufferList().newBuffer(fname.absFileName());
                if (!buffer)
                        // Buffer creation is not possible.
-                       return 0;
+                       return nullptr;
 
                if (buffer->loadLyXFile() != Buffer::ReadSuccess) {
                        //close the buffer we just opened
                        theBufferList().release(buffer);
-                       return 0;
+                       return nullptr;
                }
        }
        return buffer;