sw/qa/core/uwriter.cxx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
New commits: commit d77dec325e97c82e405d7d9539b9261b654061ea Author: Tor Lillqvist <t...@collabora.com> Date: Thu Apr 24 22:39:22 2014 +0300 Blind fix attempt for error: no matching function for call to 'assertEquals' Change-Id: Icd90d8e765af4bce6e4c56068fcdf40ff2ed3af4 diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 5894f16..f17ffca 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -1047,20 +1047,20 @@ void SwDocTest::testMarkMove() ::sw::mark::IMark* pBM2 = pMarksAccess->findMark("Para2")->get(); ::sw::mark::IMark* pBM3 = pMarksAccess->findMark("Para3")->get(); - CPPUNIT_ASSERT_EQUAL(0 , pBM1->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(11, pBM1->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 0 , pBM1->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 11, pBM1->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM1->GetMarkStart().nNode.GetIndex(), pBM1->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL(0 , pBM2->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(11, pBM2->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 0 , pBM2->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 11, pBM2->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM2->GetMarkStart().nNode.GetIndex(), pBM2->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL(11, pBM3->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(22, pBM3->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 11, pBM3->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 22, pBM3->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM3->GetMarkStart().nNode.GetIndex(), pBM3->GetMarkEnd().nNode.GetIndex()); @@ -1084,20 +1084,20 @@ void SwDocTest::testMarkMove() pBM2 = pMarksAccess->findMark("Para2")->get(); pBM3 = pMarksAccess->findMark("Para3")->get(); - CPPUNIT_ASSERT_EQUAL(0, pBM1->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(6, pBM1->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 0, pBM1->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 6, pBM1->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM1->GetMarkStart().nNode.GetIndex(), pBM1->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL(6, pBM2->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(12, pBM2->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 6, pBM2->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 12, pBM2->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM2->GetMarkStart().nNode.GetIndex(), pBM2->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL(12, pBM3->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(23, pBM3->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 12, pBM3->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 23, pBM3->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM3->GetMarkStart().nNode.GetIndex(), pBM3->GetMarkEnd().nNode.GetIndex()); @@ -1120,20 +1120,20 @@ void SwDocTest::testMarkMove() pBM2 = pMarksAccess->findMark("Para2")->get(); pBM3 = pMarksAccess->findMark("Para3")->get(); - CPPUNIT_ASSERT_EQUAL(0, pBM1->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(6, pBM1->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 0, pBM1->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 6, pBM1->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM1->GetMarkStart().nNode.GetIndex(), pBM1->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL(6, pBM2->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(4, pBM2->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 6, pBM2->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 4, pBM2->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM2->GetMarkStart().nNode.GetIndex()+1, pBM2->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL(4, pBM3->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL(15, pBM3->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 4, pBM3->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL((sal_Int32) 15, pBM3->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM3->GetMarkStart().nNode.GetIndex(), pBM3->GetMarkEnd().nNode.GetIndex()); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits