anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 06:19:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cosmetics: return early whenever possible to reduce indentation.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19724 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2007-08-22 14:36:18 +00:00
parent a921f1b7ae
commit 4c1144c187
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/LyXFunc.cpp
View File

@ -265,29 +265,32 @@ void LyXFunc::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
return; return;
} }
// open may fail, so we need to test it again // open may fail, so we need to test it again
if (theBufferList().exists(file)) { if (!theBufferList().exists(file))
// if the current buffer is not that one, switch to it. return;
if (lyx_view_->buffer()->fileName() != file) {
if (switchToBuffer) // if the current buffer is not that one, switch to it.
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file)); if (lyx_view_->buffer()->fileName() != file) {
else if (!switchToBuffer)
return;
}
// moveToPosition try paragraph id first and then paragraph (pit, pos).
if (!view()->moveToPosition(bm.bottom_pit, bm.bottom_pos,
bm.top_id, bm.top_pos))
return; return;
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
}
// moveToPosition try paragraph id first and then paragraph (pit, pos).
if (!view()->moveToPosition(bm.bottom_pit, bm.bottom_pos,
bm.top_id, bm.top_pos))
return;
// Cursor jump succeeded! // Cursor jump succeeded!
Cursor const & cur = view()->cursor(); Cursor const & cur = view()->cursor();
pit_type new_pit = cur.pit(); pit_type new_pit = cur.pit();
pos_type new_pos = cur.pos(); pos_type new_pos = cur.pos();
int new_id = cur.paragraph().id(); int new_id = cur.paragraph().id();
// if bottom_pit, bottom_pos or top_id has been changed, update bookmark // if bottom_pit, bottom_pos or top_id has been changed, update bookmark
// see http://bugzilla.lyx.org/show_bug.cgi?id=3092 // see http://bugzilla.lyx.org/show_bug.cgi?id=3092
if (bm.bottom_pit != new_pit || bm.bottom_pos != new_pos || bm.top_id != new_id ) if (bm.bottom_pit != new_pit || bm.bottom_pos != new_pos
const_cast<BookmarksSection::Bookmark &>(bm).updatePos(new_pit, new_pos, new_id); || bm.top_id != new_id) {
const_cast<BookmarksSection::Bookmark &>(bm).updatePos(
new_pit, new_pos, new_id);
} }
} }