return checkAndLoadLyXFile(filename);
}
- if (filename.isReadableFile()) {
+ if (filename.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 0;
+ }
Buffer * b = theBufferList().newBuffer(filename.absFilename());
if (!b)
// Buffer creation is not possible.
int chars = 0;
int blanks = 0;
for (DocIterator dit = from ; dit != to ; dit.forwardPos()) {
- if (dit.inTexted()
- && dit.pos() != dit.lastpos()
- && !dit.paragraph().isDeleted(dit.pos())) {
- if (dit.paragraph().isInset(dit.pos())) {
- if (dit.paragraph().getInset(dit.pos())->isLetter())
+
+ if (!dit.inTexted()) continue;
+ Paragraph const & par = dit.paragraph();
+ pos_type const pos = dit.pos();
+
+ if (pos != dit.lastpos() && !par.isDeleted(pos)) {
+ if (par.isInset(pos)) {
+ Inset const * ins = par.getInset(pos);
+ if (ins->isLetter())
++chars;
- else if (dit.paragraph().getInset(dit.pos())->isSpace() && with_blanks)
+ else if (with_blanks && ins->isSpace())
++blanks;
} else {
- char_type const c = dit.paragraph().getChar(dit.pos());
+ char_type const c = par.getChar(pos);
if (isPrintableNonspace(c))
++chars;
else if (isSpace(c) && with_blanks)
}
-void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
-{
- if (par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
- Buffer const * master = buffer.masterBuffer();
- master->tocBackend().updateItem(par_it);
- master->structureChanged();
- }
-}
-
-
} // namespace lyx