[Libreoffice-commits] core.git: sc/qa

[Kohei Yoshida]

 sc/qa/unit/data/xls/shared-formula-gap.xls |binary
 sc/qa/unit/filters-test.cxx                |   34 ++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 830a7f501b12c1c34753a656491050a252043974
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Dec 5 09:29:35 2013 -0500

    New test document to handle Excel's wrong shared formula range.
    
    This is but just one example out of many out in the wild...
    
    Change-Id: Ia542cff0e583bdcc397d0ee6ee3eaaa84f64fe4f

diff --git a/sc/qa/unit/data/xls/shared-formula-gap.xls b/sc/qa/unit/data/xls/shared-formula-gap.xls
new file mode 100644
index 0000000..762e393
Binary files /dev/null and b/sc/qa/unit/data/xls/shared-formula-gap.xls differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index d12ea60..bec9f76 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -349,8 +349,8 @@ void ScFiltersTest::testContentXLS_XML()
 void ScFiltersTest::testSharedFormulaXLS()
 {
     ScDocShellRef xDocSh = loadDoc("shared-formula.", XLS);
+    CPPUNIT_ASSERT(xDocSh.Is());
     ScDocument* pDoc = xDocSh->GetDocument();
-    CPPUNIT_ASSERT(pDoc);
     xDocSh->DoHardRecalc(true);
     // Check the results of formula cells in the shared formula range.
     for (SCROW i = 1; i <= 18; ++i)
@@ -367,6 +367,38 @@ void ScFiltersTest::testSharedFormulaXLS()
     CPPUNIT_ASSERT_MESSAGE("Incorrect group geometry.", xGroup->mpTopCell->aPos.Row() == 1 && xGroup->mnLength == 18);
 
     xDocSh->DoClose();
+
+    // The following file contains shared formula whose range is inaccurate.
+    // Excel can easily mess up shared formula ranges, so we need to be able
+    // to handle these wrong ranges that Excel stores.
+
+    xDocSh = loadDoc("shared-formula-gap.", XLS);
+    CPPUNIT_ASSERT(xDocSh.Is());
+    pDoc = xDocSh->GetDocument();
+    pDoc->CalcAll();
+
+    if (!checkFormula(*pDoc, ScAddress(1,0,0), "A1*20"))
+        CPPUNIT_FAIL("Wrong formula.");
+
+    if (!checkFormula(*pDoc, ScAddress(1,1,0), "A2*20"))
+        CPPUNIT_FAIL("Wrong formula.");
+
+    if (!checkFormula(*pDoc, ScAddress(1,2,0), "A3*20"))
+        CPPUNIT_FAIL("Wrong formula.");
+
+    // There is an intentional gap at row 4.
+
+    if (!checkFormula(*pDoc, ScAddress(1,4,0), "A5*20"))
+        CPPUNIT_FAIL("Wrong formula.");
+
+    if (!checkFormula(*pDoc, ScAddress(1,5,0), "A6*20"))
+        CPPUNIT_FAIL("Wrong formula.");
+
+    if (!checkFormula(*pDoc, ScAddress(1,6,0), "A7*20"))
+        CPPUNIT_FAIL("Wrong formula.");
+
+    if (!checkFormula(*pDoc, ScAddress(1,7,0), "A8*20"))
+        CPPUNIT_FAIL("Wrong formula.");
 }
 
 void ScFiltersTest::testSharedFormulaXLSX()