sc/qa/unit/ucalc.hxx | 4
sc/qa/unit/ucalc_formula.cxx | 226 ++++++++++++++++++++++++++++++++++++++++++
sc/source/core/tool/token.cxx | 67 +++++++++++-
3 files changed, 291 insertions(+), 6 deletions(-)
New commits:
commit 0dc61dab04507cb4b3698a1fa1ed696a123b9219
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date: Mon Oct 27 07:33:38 2014 -0700
fdo#85282: Write test for this.
Change-Id: I2a0567c2872b503ceb3740127b6b58b1d1789690
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 9eaa709..0e58c18 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -133,6 +133,8 @@ public:
void testFormulaRefUpdateMoveUndo();
void testFormulaRefUpdateMoveToSheet();
void testFormulaRefUpdateDeleteContent();
+ void testFormulaRefUpdateDeleteAndShiftLeft();
+ void testFormulaRefUpdateDeleteAndShiftUp();
void testFormulaRefUpdateName();
void testFormulaRefUpdateNameMove();
void testFormulaRefUpdateNameExpandRef();
@@ -427,6 +429,8 @@ public:
CPPUNIT_TEST(testFormulaRefUpdateMoveUndo);
CPPUNIT_TEST(testFormulaRefUpdateMoveToSheet);
CPPUNIT_TEST(testFormulaRefUpdateDeleteContent);
+ CPPUNIT_TEST(testFormulaRefUpdateDeleteAndShiftLeft);
+ CPPUNIT_TEST(testFormulaRefUpdateDeleteAndShiftUp);
CPPUNIT_TEST(testFormulaRefUpdateName);
CPPUNIT_TEST(testFormulaRefUpdateNameMove);
CPPUNIT_TEST(testFormulaRefUpdateNameExpandRef);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 5e0018a..f96c07b 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1944,6 +1944,232 @@ void Test::testFormulaRefUpdateDeleteContent()
m_pDoc->DeleteTab(0);
}
+void Test::testFormulaRefUpdateDeleteAndShiftLeft()
+{
+ sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+ m_pDoc->InsertTab(0, "Test");
+
+ // Insert 1,2,3,4,5 in C1:G1.
+ for (SCCOL i = 0; i <= 4; ++i)
+ m_pDoc->SetValue(ScAddress(i+2,0,0), i+1);
+
+ // Insert formula in H1.
+ ScAddress aPos(7,0,0);
+ m_pDoc->SetString(aPos, "=SUM(C1:G1)");
+
+ CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos));
+
+ // Delete columns D:E (middle of the reference).
+ ScMarkData aMark;
+ aMark.SelectOneTable(0);
+ ScDocFunc& rFunc = getDocShell().GetDocFunc();
+ bool bDeleted = rFunc.DeleteCells(ScRange(3,0,0,4,MAXROW,0), &aMark,
DEL_CELLSLEFT, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ aPos.IncCol(-2);
+ CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:E1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check.
+ SfxUndoManager* pUndo = m_pDoc->GetUndoManager();
+ CPPUNIT_ASSERT(pUndo);
+
+ pUndo->Undo();
+ aPos.IncCol(2);
+ CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:G1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Delete columns C:D (left end of the reference).
+ bDeleted = rFunc.DeleteCells(ScRange(2,0,0,3,MAXROW,0), &aMark,
DEL_CELLSLEFT, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ aPos.IncCol(-2);
+ CPPUNIT_ASSERT_EQUAL(12.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:E1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check again.
+ pUndo->Undo();
+ aPos.IncCol(2);
+ CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:G1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Delete columns B:E (overlaps on the left).
+ bDeleted = rFunc.DeleteCells(ScRange(1,0,0,4,MAXROW,0), &aMark,
DEL_CELLSLEFT, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ aPos.IncCol(-4);
+ CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(B1:C1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check again.
+ pUndo->Undo();
+ aPos.IncCol(4);
+ CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:G1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Start over with a new scenario.
+ clearSheet(m_pDoc, 0);
+
+ // Insert 1,2,3,4,5,6 into C1:H1.
+ for (SCCOL i = 0; i <= 5; ++i)
+ m_pDoc->SetValue(ScAddress(i+2,0,0), i+1);
+
+ // Set formula in B1.
+ aPos = ScAddress(1,0,0);
+ m_pDoc->SetString(aPos, "=SUM(C1:H1)");
+ CPPUNIT_ASSERT_EQUAL(21.0, m_pDoc->GetValue(aPos));
+
+ // Delete columns F:H (right end of the reference).
+ bDeleted = rFunc.DeleteCells(ScRange(5,0,0,7,MAXROW,0), &aMark,
DEL_CELLSLEFT, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:E1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check.
+ pUndo->Undo();
+ CPPUNIT_ASSERT_EQUAL(21.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:H1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Delete columns G:I (overlaps on the right).
+ bDeleted = rFunc.DeleteCells(ScRange(6,0,0,8,MAXROW,0), &aMark,
DEL_CELLSLEFT, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:F1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check again.
+ pUndo->Undo();
+ CPPUNIT_ASSERT_EQUAL(21.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(C1:H1)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ m_pDoc->DeleteTab(0);
+}
+
+void Test::testFormulaRefUpdateDeleteAndShiftUp()
+{
+ sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+ m_pDoc->InsertTab(0, "Test");
+
+ // Insert 1,2,3,4,5 in A3:A7.
+ for (SCROW i = 0; i <= 4; ++i)
+ m_pDoc->SetValue(ScAddress(0,i+2,0), i+1);
+
+ // Insert formula in A8.
+ ScAddress aPos(0,7,0);
+ m_pDoc->SetString(aPos, "=SUM(A3:A7)");
+
+ CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos));
+
+ // Delete rows 4:5 (middle of the reference).
+ ScMarkData aMark;
+ aMark.SelectOneTable(0);
+ ScDocFunc& rFunc = getDocShell().GetDocFunc();
+ bool bDeleted = rFunc.DeleteCells(ScRange(0,3,0,MAXCOL,4,0), &aMark,
DEL_CELLSUP, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ aPos.IncRow(-2);
+ CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A5)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check.
+ SfxUndoManager* pUndo = m_pDoc->GetUndoManager();
+ CPPUNIT_ASSERT(pUndo);
+
+ pUndo->Undo();
+ aPos.IncRow(2);
+ CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A7)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Delete rows 3:4 (top end of the reference).
+ bDeleted = rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,3,0), &aMark,
DEL_CELLSUP, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ aPos.IncRow(-2);
+ CPPUNIT_ASSERT_EQUAL(12.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A5)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check again.
+ pUndo->Undo();
+ aPos.IncRow(2);
+ CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A7)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Delete rows 2:5 (overlaps on the top).
+ bDeleted = rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,4,0), &aMark,
DEL_CELLSUP, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ aPos.IncRow(-4);
+ CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A2:A3)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check again.
+ pUndo->Undo();
+ aPos.IncRow(4);
+ CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A7)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Start over with a new scenario.
+ clearSheet(m_pDoc, 0);
+
+ // Insert 1,2,3,4,5,6 into A3:A8.
+ for (SCROW i = 0; i <= 5; ++i)
+ m_pDoc->SetValue(ScAddress(0,i+2,0), i+1);
+
+ // Set formula in B1.
+ aPos = ScAddress(0,1,0);
+ m_pDoc->SetString(aPos, "=SUM(A3:A8)");
+ CPPUNIT_ASSERT_EQUAL(21.0, m_pDoc->GetValue(aPos));
+
+ // Delete rows 6:8 (bottom end of the reference).
+ bDeleted = rFunc.DeleteCells(ScRange(0,5,0,MAXCOL,7,0), &aMark,
DEL_CELLSUP, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A5)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check.
+ pUndo->Undo();
+ CPPUNIT_ASSERT_EQUAL(21.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A8)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Delete rows 7:9 (overlaps on the bottom).
+ bDeleted = rFunc.DeleteCells(ScRange(0,6,0,MAXCOL,8,0), &aMark,
DEL_CELLSUP, true, true);
+ CPPUNIT_ASSERT(bDeleted);
+
+ CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A6)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ // Undo and check again.
+ pUndo->Undo();
+ CPPUNIT_ASSERT_EQUAL(21.0, m_pDoc->GetValue(aPos));
+ if (!checkFormula(*m_pDoc, aPos, "SUM(A3:A8)"))
+ CPPUNIT_FAIL("Wrong formula!");
+
+ m_pDoc->DeleteTab(0);
+}
+
void Test::testFormulaRefUpdateName()
{
m_pDoc->InsertTab(0, "Formula");
commit c3c16d5b74fb5707691283538a969a03c2f918b0
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date: Mon Oct 27 07:32:32 2014 -0700
fdo#85282: Correct adjustment of range reference on delete & shift.
Change-Id: I6e01c160f77599dfa4a2e55b60e23d256184c822
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index b830d4d..717e62b 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2419,6 +2419,9 @@ void setRefDeleted( ScComplexRefData& rRef, const
sc::RefUpdateContext& rCxt )
bool shrinkRange( const sc::RefUpdateContext& rCxt, ScRange& rRefRange, const
ScRange& rDeletedRange )
{
+ if (!rDeletedRange.Intersects(rRefRange))
+ return false;
+
if (rCxt.mnColDelta < 0)
{
// Shifting left.
@@ -2426,9 +2429,35 @@ bool shrinkRange( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, const Sc
// Deleted range is only partially overlapping in vertical
direction. Bail out.
return false;
- // Move the last column position to the left.
- SCCOL nDelta = rDeletedRange.aStart.Col() - rDeletedRange.aEnd.Col() -
1;
- rRefRange.aEnd.IncCol(nDelta);
+ if (rDeletedRange.aStart.Col() <= rRefRange.aStart.Col())
+ {
+ if (rRefRange.aEnd.Col() <= rDeletedRange.aEnd.Col())
+ {
+ // Reference is entirely deleted.
+ rRefRange.SetInvalid();
+ }
+ else
+ {
+ // The reference range is truncated on the left.
+ SCCOL nOffset = rDeletedRange.aStart.Col() -
rRefRange.aStart.Col();
+ SCCOL nDelta = rRefRange.aStart.Col() -
rDeletedRange.aEnd.Col() - 1;
+ rRefRange.aStart.IncCol(nOffset);
+ rRefRange.aEnd.IncCol(nDelta+nOffset);
+ }
+ }
+ else if (rDeletedRange.aEnd.Col() < rRefRange.aEnd.Col())
+ {
+ // Reference is deleted in the middle. Move the last column
+ // position to the left.
+ SCCOL nDelta = rDeletedRange.aStart.Col() -
rDeletedRange.aEnd.Col() - 1;
+ rRefRange.aEnd.IncCol(nDelta);
+ }
+ else
+ {
+ // The reference range is truncated on the right.
+ SCCOL nDelta = rDeletedRange.aStart.Col() - rRefRange.aEnd.Col() -
1;
+ rRefRange.aEnd.IncCol(nDelta);
+ }
return true;
}
else if (rCxt.mnRowDelta < 0)
@@ -2439,9 +2468,35 @@ bool shrinkRange( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, const Sc
// Deleted range is only partially overlapping in horizontal
direction. Bail out.
return false;
- // Move the last row position up.
- SCROW nDelta = rDeletedRange.aStart.Row() - rDeletedRange.aEnd.Row() -
1;
- rRefRange.aEnd.IncRow(nDelta);
+ if (rDeletedRange.aStart.Row() <= rRefRange.aStart.Row())
+ {
+ if (rRefRange.aEnd.Row() <= rDeletedRange.aEnd.Row())
+ {
+ // Reference is entirely deleted.
+ rRefRange.SetInvalid();
+ }
+ else
+ {
+ // The reference range is truncated on the top.
+ SCCOL nOffset = rDeletedRange.aStart.Row() -
rRefRange.aStart.Row();
+ SCCOL nDelta = rRefRange.aStart.Row() -
rDeletedRange.aEnd.Row() - 1;
+ rRefRange.aStart.IncRow(nOffset);
+ rRefRange.aEnd.IncRow(nDelta+nOffset);
+ }
+ }
+ else if (rDeletedRange.aEnd.Row() < rRefRange.aEnd.Row())
+ {
+ // Reference is deleted in the middle. Move the last row
+ // position upward.
+ SCCOL nDelta = rDeletedRange.aStart.Row() -
rDeletedRange.aEnd.Row() - 1;
+ rRefRange.aEnd.IncRow(nDelta);
+ }
+ else
+ {
+ // The reference range is truncated on the bottom.
+ SCCOL nDelta = rDeletedRange.aStart.Row() - rRefRange.aEnd.Row() -
1;
+ rRefRange.aEnd.IncRow(nDelta);
+ }
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
