[Libreoffice-commits] .: 2 commits - sc/qa

[Markus Mohrhard]

 sc/qa/unit/ucalc.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 98a5031b225d0ba62454e14ed719fd2c7c32aa84
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Apr 1 04:26:08 2012 +0200

    with SetInTest it is possible to use some more ScDocFunc methods

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 080bf3c..9132395 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3903,11 +3903,11 @@ void Test::testMergedCells()
     ScRange aRange(0,2,0,MAXCOL,2,0);
     ScMarkData aMark;
     aMark.SetMarkArea(aRange);
+    m_pDoc->SetInTest();
     aDocFunc.InsertCells(aRange, &aMark, INS_INSROWS, true, true);
     m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0, false);
     cout << nEndRow << nEndCol;
-    //ScEditableTester won't work without an SfxMedium/XStorage
-    //CPPUNIT_ASSERT_MESSAGE("did not increase merge area", nEndCol == 3 && nEndRow == 4);
+    CPPUNIT_ASSERT_MESSAGE("did not increase merge area", nEndCol == 3 && nEndRow == 4);
     m_pDoc->DeleteTab(0);
 }
 
commit 0034110ca6e68e2d3bd6fef11f1b0698738f24b0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Apr 1 04:23:55 2012 +0200

    it does not make sense to get ColorData which is converted back to Color

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 1bdfe9d..080bf3c 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3922,20 +3922,20 @@ void Test::testSetBackgroundColor()
      //test yellow
     aColor=Color(COL_YELLOW);
     m_xDocShRef->GetDocFunc().SetTabBgColor(0,aColor,false, true);
-    CPPUNIT_ASSERT_MESSAGE("the correct color is not set", m_pDoc->GetTabBgColor(0)!= aColor.GetColor());
+    CPPUNIT_ASSERT_MESSAGE("the correct color is not set", m_pDoc->GetTabBgColor(0)!= aColor);
 
 
     Color aOldTabBgColor=m_pDoc->GetTabBgColor(0);
     aColor.SetColor(COL_BLUE);//set BLUE
     m_xDocShRef->GetDocFunc().SetTabBgColor(0,aColor,false, true);
-    CPPUNIT_ASSERT_MESSAGE("the correct color is not set the second time", m_pDoc->GetTabBgColor(0)!= aColor.GetColor());
+    CPPUNIT_ASSERT_MESSAGE("the correct color is not set the second time", m_pDoc->GetTabBgColor(0)!= aColor);
 
     //now check for undo
     SfxUndoAction* pUndo = new ScUndoTabColor(m_xDocShRef,0, aOldTabBgColor, aColor);
     pUndo->Undo();
-    CPPUNIT_ASSERT_MESSAGE("the correct color is not set after undo", m_pDoc->GetTabBgColor(0)== aOldTabBgColor.GetColor());
+    CPPUNIT_ASSERT_MESSAGE("the correct color is not set after undo", m_pDoc->GetTabBgColor(0)== aOldTabBgColor);
     pUndo->Redo();
-    CPPUNIT_ASSERT_MESSAGE("the correct color is not set after undo", m_pDoc->GetTabBgColor(0)== aColor.GetColor());
+    CPPUNIT_ASSERT_MESSAGE("the correct color is not set after undo", m_pDoc->GetTabBgColor(0)== aColor);
     m_pDoc->DeleteTab(0);
 }