diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-16 12:59:11 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-16 21:52:32 +0200 |
| commit | 47e2fd0dc8d88af120508e463decf5b15563a629 (patch) | |
| tree | 55ca49e099c6401643772db012fae6e3ec15c501 /sc/qa/unit | |
| parent | df159d3cd0bce255e14839a81d921e73771ca886 (diff) | |
Consistently use size_t and SAL_MAX_SIZE
Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec
Diffstat (limited to 'sc/qa/unit')
| -rw-r--r-- | sc/qa/unit/filters-test.cxx | 2 | ||||
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 6 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index d50a6f881071..27db9c0a3009 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -401,7 +401,7 @@ void impl_testLegacyCellAnchoredRotatedShape( ScDocument& rDoc, Rectangle& aRect CPPUNIT_ASSERT_MESSAGE("No drawing layer.", pDrawLayer); SdrPage* pPage = pDrawLayer->GetPage(0); CPPUNIT_ASSERT_MESSAGE("No page instance for the 1st sheet.", pPage); - CPPUNIT_ASSERT_EQUAL( sal_uIntPtr(1), pPage->GetObjCount() ); + CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(1), pPage->GetObjCount() ); SdrObject* pObj = pPage->GetObj(0); const Rectangle& aSnap = pObj->GetSnapRect(); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index c2fe73a7ffbb..3622600e8b24 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1569,10 +1569,10 @@ void ScFiltersTest::testCellAnchoredShapesODS() ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer(); SdrPage* pPage = pDrawLayer->GetPage(0); CPPUNIT_ASSERT_MESSAGE("draw page for sheet 1 should exist.", pPage); - sal_uIntPtr nCount = pPage->GetObjCount(); + const size_t nCount = pPage->GetObjCount(); CPPUNIT_ASSERT_EQUAL_MESSAGE( - "There should be 2 objects.", sal_uIntPtr(2), nCount); - for (sal_uIntPtr i = 0; i < nCount; ++i) + "There should be 2 objects.", static_cast<size_t>(2), nCount); + for (size_t i = 0; i < nCount; ++i) { SdrObject* pObj = pPage->GetObj(i); CPPUNIT_ASSERT_MESSAGE("Failed to get drawing object.", pObj); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 644f7fb70dc3..d9097bf250a2 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3046,7 +3046,7 @@ void Test::testGraphicsOnSheetMove() pPage->InsertObject(pObj); ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0); - CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be one object on the 1st sheet.", pPage->GetObjCount(), static_cast<sal_uIntPtr>(1)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be one object on the 1st sheet.", pPage->GetObjCount(), static_cast<size_t>(1)); const ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Object meta-data doesn't exist.", pData); |