}
}
- FileName fname = libFileSearch("images/" + path, name1, "png");
+ QString imagedir = "images/" + path;
+ FileName fname = imageLibFileSearch(imagedir, name1, "png");
if (fname.exists())
return toqstr(fname.absFileName());
- fname = libFileSearch("images/" + path, name2, "png");
+ fname = imageLibFileSearch(imagedir, name2, "png");
if (fname.exists())
return toqstr(fname.absFileName());
<< '(' << to_utf8(f.argument()) << ")\"");
if (unknown) {
- fname = libFileSearch(QString("images/"), "unknown", "png");
+ imagedir = "images/";
+ fname = imageLibFileSearch(imagedir, "unknown", "png");
if (fname.exists())
return toqstr(fname.absFileName());
return QString(":/images/unknown.png");
QPixmap getPixmap(QString const & path, QString const & name, QString const & ext)
{
QPixmap pixmap;
- FileName fname = libFileSearch(path, name, ext);
+ QString imagedir = path;
+ FileName fname = imageLibFileSearch(imagedir, name, ext);
QString path1 = toqstr(fname.absFileName());
QString path2 = ":/" + path + name + "." + ext;
BufferView * bv = current_view_->currentBufferView();
if (bv) {
- Cursor & cursor = bv->cursor();
- Buffer & buf = bv->buffer();
-
- // FIXME
- // This check out to be done somewhere else. It got moved here
- // from TextMetrics.cpp, where it definitely didn't need to be.
- // Actually, this test ought not to be done at all, since the
- // whole InsetBibitem business is a mess. But that is a different
- // story.
- int moveCursor = 0;
- if (cursor.inTexted()) {
- moveCursor = cursor.paragraph().checkBiblio(buf);
- if (moveCursor > 0)
- cursor.posForward();
- else if (moveCursor < 0 && cursor.pos() >= -moveCursor)
- cursor.posBackward();
- }
- if (moveCursor != 0 || dr.needBufferUpdate()) {
- cursor.clearBufferUpdate();
- buf.updateBuffer();
+ if (dr.needBufferUpdate()) {
+ bv->cursor().clearBufferUpdate();
+ bv->buffer().updateBuffer();
}
// BufferView::update() updates the ViewMetricsInfo and
// also initializes the position cache for all insets in
}
actOnUpdatedPrefs(lyxrc_orig, lyxrc);
- setSpellChecker();
resetGui();
break;