insets/InsetTabular.cpp (doDispatch): fix to #9291. The problem was simply that the default status for the cursor in the call to *::doDispatch is "dispatched".

insets/InsetTabular.cpp (edit): do not reset the selection

(cherry picked from commit b2246c4ea2)
This commit is contained in:
Alfredo Braunstein 2014-10-13 10:59:50 +02:00 committed by Richard Heck
parent d91035d89f
commit 10b0fab02d

View File

@ -3881,7 +3881,7 @@ void InsetTabular::edit(Cursor & cur, bool front, EntryDirection)
{
//lyxerr << "InsetTabular::edit: " << this << endl;
cur.finishUndo();
cur.setSelection(false);
//cur.setSelection(false);
cur.push(*this);
if (front) {
if (isRightToLeft(cur))
@ -4161,9 +4161,10 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd)
else
movePrevCell(cur, entry_from);
// if we're exiting the table, call the appropriate FINISHED lfun
if (sl == cur.top())
if (sl == cur.top()) {
cmd = FuncRequest(finish_lfun);
else
cur.undispatched();
} else
cur.dispatched();
cur.screenUpdateFlags(Update::Force | Update::FitCursor);
@ -6448,7 +6449,8 @@ string InsetTabular::params2string(InsetTabular const & inset)
}
void InsetTabular::setLayoutForHiddenCells(DocumentClass const & dc) {
void InsetTabular::setLayoutForHiddenCells(DocumentClass const & dc)
{
for (Tabular::col_type c = 0; c < tabular.ncols(); ++c) {
for (Tabular::row_type r = 0; r < tabular.nrows(); ++r) {
if (!tabular.isPartOfMultiColumn(r,c) &&