Spreadsheet: Fixed issue #3361.

FreeCAD · Jul 31, 2018 · d2f9ab6 · d2f9ab6
1 parent 13da3dd
commit d2f9ab6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp
@@ -461,8 +461,8 @@ void Cell::setSpans(int rows, int columns)
     if (rows != rowSpan || columns != colSpan) {
         PropertySheet::AtomicPropertyChange signaller(*owner);
 
-        rowSpan = rows;
-        colSpan = columns;
+        rowSpan = (rows == -1 ? 1 : rows);
+        colSpan = (columns == -1 ? 1 : columns);
         setUsed(SPANS_SET, (rowSpan != 1 || colSpan != 1) );
         setUsed(SPANS_UPDATED);
     }

diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp
@@ -552,7 +552,14 @@ void PropertySheet::moveCell(CellAddress currPos, CellAddress newPos, std::map<A
 
     if (i != data.end()) {
         Cell * cell = i->second;
+        int rows, columns;
 
+        // Get merged cell data
+        cell->getSpans(rows, columns);
+
+        // Remove merged cell data
+        splitCell(currPos);
+
         // Remove from old
         removeDependencies(currPos);
         data.erase(currPos);
@@ -561,6 +568,15 @@ void PropertySheet::moveCell(CellAddress currPos, CellAddress newPos, std::map<A
         // Insert into new spot
         cell->moveAbsolute(newPos);
         data[newPos] = cell;
+
+        if (rows > 1 || columns > 1) {
+            CellAddress toPos(newPos.row() + rows - 1, newPos.col() + columns - 1);
+
+            mergeCells(newPos, toPos);
+        }
+        else
+            cell->setSpans(-1, -1);
+
         addDependencies(newPos);
         setDirty(newPos);
 
@@ -875,7 +891,7 @@ void PropertySheet::splitCell(CellAddress address)
             mergedCells.erase(CellAddress(r, c));
         }
 
-    setSpans(anchor, 1, 1);
+    setSpans(anchor, -1, -1);
 }
 
 void PropertySheet::getSpans(CellAddress address, int & rows, int & cols) const
@@ -885,7 +901,10 @@ void PropertySheet::getSpans(CellAddress address, int & rows, int & cols) const
     if (i != mergedCells.end()) {
         CellAddress anchor = i->second;
 
-        cellAt(anchor)->getSpans(rows, cols);
+        if (anchor == address)
+            cellAt(anchor)->getSpans(rows, cols);
+        else
+            rows = cols = 1;
     }
     else {
         rows = cols = 1;