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

fix a few 'OUT OF SYNC'

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8055 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-11-06 11:56:10 +00:00
parent 338b173b3c
commit 32b65ce8ec
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cursor.C
View File

@ -120,8 +120,11 @@ void LCursor::push(InsetOld * inset, LyXText * text)
void LCursor::pop() void LCursor::pop()
{ {
BOOST_ASSERT(!data_.empty()); //BOOST_ASSERT(!data_.empty());
data_.pop_back(); if (data_.empty())
lyxerr << "### TRYING TO POP FROM EMPTY CURSOR" << endl;
else
data_.pop_back();
} }

4
src/insets/insettext.C
View File

@ -17,6 +17,7 @@
#include "bufferparams.h" #include "bufferparams.h"
#include "BufferView.h" #include "BufferView.h"
#include "CutAndPaste.h" #include "CutAndPaste.h"
#include "cursor.h"
#include "debug.h" #include "debug.h"
#include "dispatchresult.h" #include "dispatchresult.h"
#include "errorlist.h" #include "errorlist.h"
@ -719,6 +720,7 @@ InsetText::priv_dispatch(FuncRequest const & cmd,
if (result.val() >= FINISHED) { if (result.val() >= FINISHED) {
updateLocal(bv, false); updateLocal(bv, false);
bv->unlockInset(this); bv->unlockInset(this);
bv->cursor().pop();
} }
break; break;
case FINISHED_DOWN: case FINISHED_DOWN:
@ -726,6 +728,7 @@ InsetText::priv_dispatch(FuncRequest const & cmd,
if (result.val() >= FINISHED) { if (result.val() >= FINISHED) {
updateLocal(bv, false); updateLocal(bv, false);
bv->unlockInset(this); bv->unlockInset(this);
bv->cursor().pop();
} }
break; break;
default: default:
@ -951,6 +954,7 @@ InsetText::priv_dispatch(FuncRequest const & cmd,
if (result.val() >= FINISHED) { if (result.val() >= FINISHED) {
result.val(NONE); result.val(NONE);
bv->unlockInset(this); bv->unlockInset(this);
bv->cursor().pop();
} }
return result; return result;