Georg Baum's vspace change

[lyx.git] / src / mathed / math_gridinset.C

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 1b9e34db05464e00b0ee2b473178c187528a0050..d16f82776cfd17ed3badbd83fc1ff4662a07013c 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -14,6 +14,7 @@
 #include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "dispatchresult.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "LColor.h"
@@ -27,6 +28,7 @@ using std::max;
 using std::min;
 using std::swap;
 
+using std::string;
 using std::auto_ptr;
 using std::istream;
 using std::istringstream;
@@ -1040,21 +1042,21 @@ void MathGridInset::splitCell(idx_type & idx, pos_type & pos)
 }
 
 
-dispatch_result MathGridInset::dispatch
-       (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult MathGridInset::priv_dispatch(FuncRequest const & cmd,
+       idx_type & idx, pos_type & pos)
 {
        switch (cmd.action) {
 
                case LFUN_MOUSE_RELEASE:
                        //if (cmd.button() == mouse_button::button3) {
                        //      GridInsetMailer(*this).showDialog();
-                       //      return DISPATCHED;
+                       //      return DispatchResult(true, true);
                        //}
-                       return UNDISPATCHED;
+                       return DispatchResult(false);
 
                case LFUN_INSET_DIALOG_UPDATE:
                        GridInsetMailer(*this).updateDialog(cmd.view());
-                       return UNDISPATCHED;
+                       return DispatchResult(false);
 
                // insert file functions
                case LFUN_DELETE_LINE_FORWARD:
@@ -1070,12 +1072,12 @@ dispatch_result MathGridInset::dispatch
                                idx = nargs() - 1;
                        if (pos > cell(idx).size())
                                pos = cell(idx).size();
-                       return DISPATCHED_POP;
+                       return DispatchResult(true, FINISHED);
 
                case LFUN_CELL_SPLIT:
                        //recordUndo(bv, Undo::ATOMIC);
                        splitCell(idx, pos);
-                       return DISPATCHED_POP;
+                       return DispatchResult(true, FINISHED);
 
                case LFUN_BREAKLINE: {
                        //recordUndo(bv, Undo::INSERT);
@@ -1094,7 +1096,7 @@ dispatch_result MathGridInset::dispatch
                        pos = cell(idx).size();
 
                        //mathcursor->normalize();
-                       return DISPATCHED_POP;
+                       return DispatchResult(true, FINISHED);
                }
 
                case LFUN_TABULAR_FEATURE: {
@@ -1149,9 +1151,9 @@ dispatch_result MathGridInset::dispatch
                        else if (s == "swap-column")
                                swapCol(col(idx));
                        else
-                               return UNDISPATCHED;
-                       lyxerr << "returning DISPATCHED_POP" << endl;
-                       return DISPATCHED_POP;
+                               return DispatchResult(false);
+                       lyxerr << "returning DispatchResult(true, FINISHED)" << endl;
+                       return DispatchResult(true, FINISHED);
                }
 
                case LFUN_PASTE: {
@@ -1169,7 +1171,7 @@ dispatch_result MathGridInset::dispatch
                                for (row_type r = 0; r < numrows; ++r) {
                                        for (col_type c = 0; c < numcols; ++c) {
                                                idx_type i = index(r + row(idx), c + col(idx));
-                                               cell(i).append(grid.cell(grid.index(r, c)));
+                                               cell(i).insert(0, grid.cell(grid.index(r, c)));
                                        }
                                        // append the left over horizontal cells to the last column
                                        idx_type i = index(r + row(idx), ncols() - 1);
@@ -1182,10 +1184,10 @@ dispatch_result MathGridInset::dispatch
                                        for (col_type c = 0; c < grid.ncols(); ++c)
                                                cell(i).append(grid.cell(grid.index(r, c)));
                        }
-                       return DISPATCHED_POP;
+                       return DispatchResult(true, FINISHED);
                }
 
                default:
-                       return MathNestInset::dispatch(cmd, idx, pos);
+                       return MathNestInset::priv_dispatch(cmd, idx, pos);
        }
 }