#include "buffer_funcs.h"
#include "Buffer.h"
#include "BufferList.h"
-#include "BufferParams.h"
-#include "DocIterator.h"
-#include "Counters.h"
-#include "ErrorList.h"
-#include "Floating.h"
-#include "FloatList.h"
-#include "InsetList.h"
-#include "Language.h"
-#include "LaTeX.h"
-#include "Layout.h"
-#include "LyX.h"
#include "LyXVC.h"
-#include "TextClass.h"
-#include "Paragraph.h"
-#include "ParagraphList.h"
-#include "ParagraphParameters.h"
-#include "ParIterator.h"
-#include "TexRow.h"
-#include "Text.h"
-#include "TocBackend.h"
#include "frontends/alert.h"
-#include "insets/InsetBibitem.h"
-#include "insets/InsetInclude.h"
-
#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/textutils.h"
+#include "support/mutex.h"
using namespace std;
using namespace lyx::support;
case 0: {
// reload the document
if (checkBuffer->reload() != Buffer::ReadSuccess)
- return 0;
+ return nullptr;
return checkBuffer;
}
case 1:
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;
}
"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;
}
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.
file);
Alert::error(_("Could not read template"), text);
theBufferList().release(b);
- return 0;
+ return nullptr;
}
}
Buffer * newUnnamedFile(FileName const & path, string const & prefix,
string const & templatename)
{
- // FIXME THREAD
static map<string, int> file_number;
+ static Mutex mutex;
+ Mutex::Locker locker(&mutex);
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);
}
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;