sc/qa/unit/ucalc.hxx | 2 +
sc/qa/unit/ucalc_sharedformula.cxx | 71 +++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
New commits:
commit 92657eed57548511f26f0c22f1bbc47d554c8b5b
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Thu Mar 21 18:09:12 2019 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Fri Mar 22 10:47:13 2019 +0100
Unit test for cut copy move with a group reference adjusting along,
tdf#121002
Change-Id: I4f3731e2236f1b8be97a6f5d21e32e678610fecb
Reviewed-on: https://gerrit.libreoffice.org/69532
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index b290fda217ee..aed9f69008cb 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -410,6 +410,7 @@ public:
void testSharedFormulaUpdateOnReplacement();
void testSharedFormulaDeleteTopCell();
void testSharedFormulaCutCopyMoveIntoRef();
+ void testSharedFormulaCutCopyMoveWithRef();
void testFormulaPosition();
void testFormulaWizardSubformula();
@@ -762,6 +763,7 @@ public:
CPPUNIT_TEST(testSharedFormulaUpdateOnReplacement);
CPPUNIT_TEST(testSharedFormulaDeleteTopCell);
CPPUNIT_TEST(testSharedFormulaCutCopyMoveIntoRef);
+ CPPUNIT_TEST(testSharedFormulaCutCopyMoveWithRef);
CPPUNIT_TEST(testFormulaPosition);
CPPUNIT_TEST(testFormulaWizardSubformula);
CPPUNIT_TEST(testMixData);
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx
b/sc/qa/unit/ucalc_sharedformula.cxx
index c144a466e4fe..5983ceef358e 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -2536,5 +2536,76 @@ void Test::testSharedFormulaCutCopyMoveIntoRef()
}
}
+// tdf#121002
+void Test::testSharedFormulaCutCopyMoveWithRef()
+{
+ sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.
+
+ m_pDoc->InsertTab(0, "Test");
+
+ // Data in A1:C4
+ std::vector<std::vector<const char*>> aData = {
+ { "", "", "=SUM(A1:B1)" },
+ { "", "", "=SUM(A2:B2)" },
+ { "1", "2", "=SUM(A3:B3)" },
+ { "4", "8", "=SUM(A4:B4)" }
+ };
+ const ScAddress aOrgPos(0,0,0);
+ insertRangeData( m_pDoc, aOrgPos, aData);
+
+ ScMarkData aMark;
+ aMark.SelectOneTable(0);
+
+ ScAddress aPos( ScAddress::UNINITIALIZED);
+
+ // Check results in C1:C4
+ const double fVec0[] = { 0.0, 0.0, 3.0, 12.0 };
+ aPos = ScAddress(2,0,0);
+ for (SCROW i=0; i < 4; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL( fVec0[i], m_pDoc->GetValue(aPos));
+ aPos.IncRow();
+ }
+
+ // Set up clip document.
+ ScDocument aClipDoc(SCDOCMODE_CLIP);
+ aClipDoc.ResetClip(m_pDoc, &aMark);
+ // Cut A3:B3 to clipboard.
+ cutToClip( getDocShell(), ScRange(0,2,0, 1,2,0), &aClipDoc, false);
+
+ // Check results in C1:C4 after Cut.
+ const double fVec1[] = { 0.0, 0.0, 0.0, 12.0 };
+ aPos = ScAddress(2,0,0);
+ for (SCROW i=0; i < 4; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL( fVec1[i], m_pDoc->GetValue(aPos));
+ aPos.IncRow();
+ }
+
+ // Paste to A1:B1
+ ScRange aPasteRange(0,0,0, 1,0,0);
+ aMark.SetMarkArea(aPasteRange);
+ m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS,
nullptr, &aClipDoc);
+
+ // Check results in C1:C4 after Paste.
+ const double fVec2[] = { 3.0, 0.0, 3.0, 12.0 };
+ aPos = ScAddress(2,0,0);
+ for (SCROW i=0; i < 4; ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL( fVec2[i], m_pDoc->GetValue(aPos));
+ aPos.IncRow();
+ }
+
+ // Check formulas in C1:C4 after Paste.
+ const OUStringLiteral sForm[] = { "=SUM(A1:B1)", "=SUM(A2:B2)",
"=SUM(A1:B1)", "=SUM(A4:B4)" };
+ for (SCROW i=0; i < 4; ++i)
+ {
+ OUString aFormula;
+ m_pDoc->GetFormula( 2,i,0, aFormula);
+ CPPUNIT_ASSERT_EQUAL( OUString(sForm[i]), aFormula);
+ }
+
+ m_pDoc->DeleteTab(0);
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
