anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-07 17:55:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix crash when toggling change tracking off

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10421 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-09-07 10:00:19 +00:00
parent 742ff585a2
commit 5d0f08d856
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BufferView_pimpl.C
View File

@ -877,13 +877,13 @@ void BufferView::Pimpl::trackChanges()
// We cannot allow undos beyond the freeze point // We cannot allow undos beyond the freeze point
buffer_->undostack().clear(); buffer_->undostack().clear();
} else { } else {
update(); cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
bv_->text()->setCursor(cursor_, 0, 0);
#ifdef WITH_WARNINGS
#warning changes FIXME
#endif
bool const found = lyx::find::findNextChange(bv_); bool const found = lyx::find::findNextChange(bv_);
if (found) { if (found) {
// We reset the cursor to the start of the
// document, since the Changes Dialog is going
// to search for the next change anyway.
cursor_.setCursor(doc_iterator_begin(buffer_->inset()));
owner_->getDialogs().show("changes"); owner_->getDialogs().show("changes");
return; return;
} }

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2005-08-04 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxfind.C (findNextChange): tiny cleanup.
* BufferView_pimpl.C (trackChanges): avoid crash when stopping
change tracking with the cursor in an inset; make sure the first
change is not skipped.
2005-09-06 Jürgen Spitzmüller <j.spitzmueller@gmx.de> 2005-09-06 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* CutAndPaste.[Ch]: new methods dirtyTabularStack and * CutAndPaste.[Ch]: new methods dirtyTabularStack and

2
src/lyxfind.C
View File

@ -339,7 +339,7 @@ bool findNextChange(BufferView * bv)
if (!bv->available()) if (!bv->available())
return false; return false;
DocIterator cur = DocIterator(bv->cursor()); DocIterator cur = bv->cursor();
if (!findChange(cur)) if (!findChange(cur))
return false; return false;