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

Jan Holesovsky kendy at suse.cz
Wed Jul 10 22:37:04 PDT 2013


 sc/qa/unit/ucalc_sharedformula.cxx |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 5d6bfead080f31c421c4b236e3d6f2a9e8118b97
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 11 07:36:06 2013 +0200

    Fix Windows build.
    
    Change-Id: I943171b14610f8a9e6561a60f4a3297e26e32f14

diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 7093985..7934483 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -243,8 +243,8 @@ void Test::testSharedFormulasCopyPaste()
     ScAddress aPos(1, 8, 0); // B9
     ScFormulaCell* pFC = m_pDoc->GetFormulaCell(aPos);
     CPPUNIT_ASSERT_MESSAGE("B9 should be a formula cell.", pFC);
-    CPPUNIT_ASSERT_EQUAL(0, pFC->GetSharedTopRow());
-    CPPUNIT_ASSERT_EQUAL(10, pFC->GetSharedLength());
+    CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow());
+    CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(10), pFC->GetSharedLength());
 
     // Copy formulas in B6:B9 to the clipboard doc.
     ScRange aSrcRange(1,5,0,1,8,0); // B6:B9
@@ -252,8 +252,8 @@ void Test::testSharedFormulasCopyPaste()
     copyToClip(m_pDoc, aSrcRange, &aClipDoc);
     pFC = aClipDoc.GetFormulaCell(aPos);
     CPPUNIT_ASSERT_MESSAGE("B9 in the clip doc should be a formula cell.", pFC);
-    CPPUNIT_ASSERT_EQUAL(5, pFC->GetSharedTopRow());
-    CPPUNIT_ASSERT_EQUAL(4, pFC->GetSharedLength());
+    CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(5), pFC->GetSharedTopRow());
+    CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(4), pFC->GetSharedLength());
 
     // Paste them to C2:C10.
     ScRange aDestRange(2,1,0,2,9,0);
@@ -264,8 +264,8 @@ void Test::testSharedFormulasCopyPaste()
     aPos.SetRow(1);
     pFC = m_pDoc->GetFormulaCell(aPos);
     CPPUNIT_ASSERT_MESSAGE("C2 should be a formula cell.", pFC);
-    CPPUNIT_ASSERT_EQUAL(1, pFC->GetSharedTopRow());
-    CPPUNIT_ASSERT_EQUAL(9, pFC->GetSharedLength());
+    CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(1), pFC->GetSharedTopRow());
+    CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(9), pFC->GetSharedLength());
 
     ScRange aRange(1,0,0,1,9,0); // B1:B10
     ScDocument* pUndoDoc = new ScDocument(SCDOCMODE_UNDO);
@@ -280,8 +280,8 @@ void Test::testSharedFormulasCopyPaste()
         aPos.SetRow(i);
         pFC = pUndoDoc->GetFormulaCell(aPos);
         CPPUNIT_ASSERT_MESSAGE("Must be a formula cell.", pFC);
-        CPPUNIT_ASSERT_EQUAL(0, pFC->GetSharedTopRow());
-        CPPUNIT_ASSERT_EQUAL(10, pFC->GetSharedLength());
+        CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow());
+        CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(10), pFC->GetSharedLength());
     }
 
     // Overwrite B1:B10.
@@ -300,8 +300,8 @@ void Test::testSharedFormulasCopyPaste()
         aPos.SetRow(i);
         pFC = m_pDoc->GetFormulaCell(aPos);
         CPPUNIT_ASSERT_MESSAGE("This should be a formula cell.", pFC);
-        CPPUNIT_ASSERT_EQUAL(0, pFC->GetSharedTopRow());
-        CPPUNIT_ASSERT_EQUAL(10, pFC->GetSharedLength());
+        CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), pFC->GetSharedTopRow());
+        CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(10), pFC->GetSharedLength());
     }
 
     m_pDoc->DeleteTab(0);


More information about the Libreoffice-commits mailing list