Reduce caption hardcoding

[lyx.git] / src / insets / InsetTabular.cpp

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 2a9c7e64b7a983f2b35150d7342b5d9f3c664814..de9f862576e09290ccb1afd392f1fe7c7025ec6c 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3875,7 +3875,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))
@@ -4155,9 +4155,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);
@@ -6442,7 +6443,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) &&