ws changes only

[lyx.git] / src / insets / insettabular.C

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index ab4f7ef0f415c6c7ea1fba94be68c07ea9576897..232ada36a41988e15a875d0d91b44ac17de5a06c 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -36,6 +36,7 @@
 #include "frontends/Painter.h"
 
 #include "support/std_sstream.h"
+#include <iostream>
 
 using lyx::graphics::PreviewLoader;
 
@@ -624,12 +625,12 @@ void InsetTabular::lfunMouseMotion(FuncRequest const & cmd)
 }
 
 
-InsetOld::RESULT InsetTabular::localDispatch(FuncRequest const & cmd)
+dispatch_result InsetTabular::localDispatch(FuncRequest const & cmd)
 {
        // We need to save the value of the_locking_inset as the call to
        // the_locking_inset->localDispatch might unlock it.
        old_locking_inset = the_locking_inset;
-       RESULT result = UpdatableInset::localDispatch(cmd);
+       dispatch_result result = UpdatableInset::localDispatch(cmd);
        BufferView * bv = cmd.view();
 
        if (cmd.action == LFUN_INSET_EDIT) {
@@ -1299,7 +1300,7 @@ void InsetTabular::resetPos(BufferView * bv) const
        }
        // we need this only from here on!!!
        ++in_reset_pos;
-       static int const offset = ADD_TO_TABULAR_WIDTH + 2;
+       int const offset = ADD_TO_TABULAR_WIDTH + 2;
        int new_x = getCellXPos(actcell);
        int old_x = cursorx_;
        new_x += offset;
@@ -1352,7 +1353,7 @@ void InsetTabular::resetPos(BufferView * bv) const
 }
 
 
-InsetOld::RESULT InsetTabular::moveRight(BufferView * bv, bool lock)
+dispatch_result InsetTabular::moveRight(BufferView * bv, bool lock)
 {
        if (lock && !old_locking_inset) {
                if (activateCellInset(bv))
@@ -1370,7 +1371,7 @@ InsetOld::RESULT InsetTabular::moveRight(BufferView * bv, bool lock)
 }
 
 
-InsetOld::RESULT InsetTabular::moveLeft(BufferView * bv, bool lock)
+dispatch_result InsetTabular::moveLeft(BufferView * bv, bool lock)
 {
        bool moved = isRightToLeft(bv) ? moveNextCell(bv) : movePrevCell(bv);
        if (!moved)
@@ -1384,7 +1385,7 @@ InsetOld::RESULT InsetTabular::moveLeft(BufferView * bv, bool lock)
 }
 
 
-InsetOld::RESULT InsetTabular::moveUp(BufferView * bv, bool lock)
+dispatch_result InsetTabular::moveUp(BufferView * bv, bool lock)
 {
        int const ocell = actcell;
        actcell = tabular.getCellAbove(actcell);
@@ -1405,7 +1406,7 @@ InsetOld::RESULT InsetTabular::moveUp(BufferView * bv, bool lock)
 }
 
 
-InsetOld::RESULT InsetTabular::moveDown(BufferView * bv, bool lock)
+dispatch_result InsetTabular::moveDown(BufferView * bv, bool lock)
 {
        int const ocell = actcell;
        actcell = tabular.getCellBelow(actcell);
@@ -1632,12 +1633,11 @@ void InsetTabular::tabularFeatures(BufferView * bv,
 
        case LyXTabular::SET_PWIDTH:
        {
-               LyXLength const vallen(value);
-               LyXLength const & tmplen = tabular.getColumnPWidth(actcell);
+               LyXLength const len(value);
+               LyXLength const & oldlen = tabular.getColumnPWidth(actcell);
 
-               bool const update = (tmplen != vallen);
-               tabular.setColumnPWidth(actcell, vallen);
-               if (update) {
+               tabular.setColumnPWidth(actcell, len);
+               if (oldlen != len) {
                        // We need this otherwise we won't resize
                        // the insettext of the active cell (if any)
                        // until later (see InsetText::do_resize)
@@ -1645,10 +1645,10 @@ void InsetTabular::tabularFeatures(BufferView * bv,
                        bv->update();
                }
 
-               if (vallen.zero()
+               if (len.zero()
                    && tabular.getAlignment(actcell, true) == LYX_ALIGN_BLOCK)
                        tabularFeatures(bv, LyXTabular::ALIGN_CENTER, string());
-               else if (!vallen.zero()
+               else if (!len.zero()
                         && tabular.getAlignment(actcell, true) != LYX_ALIGN_BLOCK)
                        tabularFeatures(bv, LyXTabular::ALIGN_BLOCK, string());
                break;
@@ -1656,12 +1656,10 @@ void InsetTabular::tabularFeatures(BufferView * bv,
 
        case LyXTabular::SET_MPWIDTH:
        {
-               LyXLength const vallen(value);
-               LyXLength const & tmplen = tabular.getPWidth(actcell);
-
-               bool const update = (tmplen != vallen);
-               tabular.setMColumnPWidth(actcell, vallen);
-               if (update) {
+               LyXLength const len(value);
+               LyXLength const & oldlen = tabular.getPWidth(actcell);
+               tabular.setMColumnPWidth(actcell, len);
+               if (oldlen != len) {
                        // We need this otherwise we won't resize
                        // the insettext of the active cell (if any)
                        // until later (see InsetText::do_resize)
@@ -1679,12 +1677,14 @@ void InsetTabular::tabularFeatures(BufferView * bv,
                // append the row into the tabular
                unlockInsetInInset(bv, the_locking_inset);
                tabular.appendRow(bv->buffer()->params(), actcell);
+               tabular.setOwner(this);
                updateLocal(bv);
                break;
        case LyXTabular::APPEND_COLUMN:
                // append the column into the tabular
                unlockInsetInInset(bv, the_locking_inset);
                tabular.appendColumn(bv->buffer()->params(), actcell);
+               tabular.setOwner(this);
                actcell = tabular.getCellNumber(row, column);
                updateLocal(bv);
                break;
@@ -2304,7 +2304,8 @@ bool InsetTabular::cutSelection(BufferParams const & bp)
 
        for (int i = sel_row_start; i <= sel_row_end; ++i)
                for (int j = sel_col_start; j <= sel_col_end; ++j)
-                       tabular.getCellInset(tabular.getCellNumber(i, j)).clear(bp.tracking_changes);
+                       tabular.getCellInset(tabular.getCellNumber(i, j))
+                               .clear(bp.tracking_changes);
        return true;
 }