Consistently use size_t and SAL_MAX_SIZE

Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec

12 files changed, 45 insertions, 53 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);
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 79c989ebd98d..70f7634da6f4 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -472,8 +472,8 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC
 
     bool bNegativePage = pDoc && pDoc->IsNegativePage( nTab );
 
-    sal_uLong nCount = pPage->GetObjCount();
-    for ( sal_uLong i = 0; i < nCount; i++ )
+    const size_t nCount = pPage->GetObjCount();
+    for ( size_t i = 0; i < nCount; ++i )
     {
         SdrObject* pObj = pPage->GetObj( i );
         ScDrawObjData* pData = GetObjDataTab( pObj, nTab );
@@ -522,8 +522,8 @@ void ScDrawLayer::SetPageSize( sal_uInt16 nPageNo, const Size& rSize, bool bUpda
 
         bool bNegativePage = pDoc && pDoc->IsNegativePage( static_cast<SCTAB>(nPageNo) );
 
-        sal_uLong nCount = pPage->GetObjCount();
-        for ( sal_uLong i = 0; i < nCount; i++ )
+        const size_t nCount = pPage->GetObjCount();
+        for ( size_t i = 0; i < nCount; ++i )
         {
             SdrObject* pObj = pPage->GetObj( i );
             ScDrawObjData* pData = GetObjDataTab( pObj, static_cast<SCTAB>(nPageNo) );
@@ -1148,10 +1148,10 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
 
     pPage->RecalcObjOrdNums();
 
-    sal_uLong   nObjCount = pPage->GetObjCount();
+    const size_t nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
-        long nDelCount = 0;
+        size_t nDelCount = 0;
         Rectangle aDelRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab );
 
         boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]);
@@ -1172,12 +1172,11 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
             pObject = aIter.Next();
         }
 
-        long i;
         if (bRecording)
-            for (i=1; i<=nDelCount; i++)
+            for (size_t i=1; i<=nDelCount; ++i)
                 AddCalcUndo( new SdrUndoRemoveObj( *ppObj[nDelCount-i] ) );
 
-        for (i=1; i<=nDelCount; i++)
+        for (size_t i=1; i<=nDelCount; ++i)
             pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
     }
 }
@@ -1203,10 +1202,10 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
         if (pPage)
         {
             pPage->RecalcObjOrdNums();
-            sal_uLong   nObjCount = pPage->GetObjCount();
+            const size_t nObjCount = pPage->GetObjCount();
             if (nObjCount)
             {
-                long nDelCount = 0;
+                size_t nDelCount = 0;
                 //  Rechteck um die ganze Selektion
                 Rectangle aMarkBound = pDoc->GetMMRect(
                             aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
@@ -1236,12 +1235,11 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
 
                 //  Objekte loeschen (rueckwaerts)
 
-                long i;
                 if (bRecording)
-                    for (i=1; i<=nDelCount; i++)
+                    for (size_t i=1; i<=nDelCount; ++i)
                         AddCalcUndo( new SdrUndoRemoveObj( *ppObj[nDelCount-i] ) );
 
-                for (i=1; i<=nDelCount; i++)
+                for (size_t i=1; i<=nDelCount; ++i)
                     pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
             }
         }
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 6e12d9c31fd8..c71b7c5b6e88 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -668,10 +668,10 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, bool bDestPnt )
 
     pPage->RecalcObjOrdNums();
 
-    sal_uLong nObjCount = pPage->GetObjCount();
+    const size_t nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
-        long nDelCount = 0;
+        size_t nDelCount = 0;
         boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]);
 
         SdrObjListIter aIter( *pPage, IM_FLAT );
@@ -688,11 +688,10 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, bool bDestPnt )
             pObject = aIter.Next();
         }
 
-        long i;
-        for (i=1; i<=nDelCount; i++)
+        for (size_t i=1; i<=nDelCount; ++i)
             pModel->AddCalcUndo( new SdrUndoRemoveObj( *ppObj[nDelCount-i] ) );
 
-        for (i=1; i<=nDelCount; i++)
+        for (size_t i=1; i<=nDelCount; ++i)
             pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
 
         ppObj.reset();
@@ -732,10 +731,10 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR
 
     pPage->RecalcObjOrdNums();
 
-    sal_uLong nObjCount = pPage->GetObjCount();
+    const size_t nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
-        long nDelCount = 0;
+        size_t nDelCount = 0;
         boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]);
 
         SdrObjListIter aIter( *pPage, IM_FLAT );
@@ -754,11 +753,10 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR
             pObject = aIter.Next();
         }
 
-        long i;
-        for (i=1; i<=nDelCount; i++)
+        for (size_t i=1; i<=nDelCount; ++i)
             pModel->AddCalcUndo( new SdrUndoRemoveObj( *ppObj[nDelCount-i] ) );
 
-        for (i=1; i<=nDelCount; i++)
+        for (size_t i=1; i<=nDelCount; ++i)
             pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
 
         ppObj.reset();
@@ -1241,8 +1239,8 @@ bool ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
 
     pPage->RecalcObjOrdNums();
 
-    long    nDelCount = 0;
-    sal_uLong   nObjCount = pPage->GetObjCount();
+    size_t nDelCount = 0;
+    const size_t nObjCount = pPage->GetObjCount();
     if (nObjCount)
     {
         boost::scoped_array<SdrObject*> ppObj(new SdrObject*[nObjCount]);
@@ -1276,11 +1274,10 @@ bool ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
             pObject = aIter.Next();
         }
 
-        long i;
-        for (i=1; i<=nDelCount; i++)
+        for (size_t i=1; i<=nDelCount; ++i)
             pModel->AddCalcUndo( new SdrUndoRemoveObj( *ppObj[nDelCount-i] ) );
 
-        for (i=1; i<=nDelCount; i++)
+        for (size_t i=1; i<=nDelCount; ++i)
             pPage->RemoveObject( ppObj[nDelCount-i]->GetOrdNum() );
 
         ppObj.reset();
@@ -1545,7 +1542,7 @@ bool ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange )
     if( pObject && pObject->GetPage() && (pObject->GetPage() == pObject->GetObjList()) )
     {
         // Is there a previous object?
-        const sal_uInt32 nOrdNum(pObject->GetOrdNum());
+        const size_t nOrdNum = pObject->GetOrdNum();
 
         if(nOrdNum > 0)
         {
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 5894fc6d563f..d7cc9c4eb6fa 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -67,8 +67,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
 void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab,
         SCCOL nStartCol, SCROW nStartRow,   SCCOL nEndCol, SCROW nEndRow )
 {
-    sal_uLong   nObjCount = pPage->GetObjCount();
-    if ( nObjCount )
+    if ( pPage->GetObjCount() )
     {
         Rectangle aRect;
         if ( !bAll )
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 64113182aab3..c38a8dc4df76 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -311,7 +311,7 @@ private:
 
     mutable ::accessibility::AccessibleShapeTreeInfo maShapeTreeInfo;
     mutable com::sun::star::uno::Reference<com::sun::star::view::XSelectionSupplier> xSelectionSupplier;
-    mutable sal_uInt32 mnSdrObjCount;
+    mutable size_t mnSdrObjCount;
     mutable sal_uInt32 mnShapesSelected;
     ScTabViewShell* mpViewShell;
     ScAccessibleDocument* mpAccessibleDocument;
@@ -544,7 +544,7 @@ sal_Int32 ScChildrenShapes::GetCount() const
     {
         mnSdrObjCount = pDrawPage->GetObjCount();
         maZOrderedShapes.reserve(mnSdrObjCount + 1); // the table is always in
-        for (sal_uInt32 i = 0; i < mnSdrObjCount; ++i)
+        for (size_t i = 0; i < mnSdrObjCount; ++i)
         {
             SdrObject* pObj = pDrawPage->GetObj(i);
             if (pObj/* && (pObj->GetLayer() != SC_LAYER_INTERN)*/)
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index ffa2ba401caa..1afaa5bfe0af 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1101,8 +1101,8 @@ void ScShapeChildren::FillShapes(const Rectangle& aPixelPaintRect, const MapMode
         maShapeRanges[nRangeId].maMapMode = aMapMode;
         ScIAccessibleViewForwarder aViewForwarder(mpViewShell, mpAccDoc, aMapMode);
         maShapeRanges[nRangeId].maViewForwarder = aViewForwarder;
-        sal_uInt32 nCount(pPage->GetObjCount());
-        for (sal_uInt32 i = 0; i < nCount; ++i)
+        const size_t nCount(pPage->GetObjCount());
+        for (size_t i = 0; i < nCount; ++i)
         {
             SdrObject* pObj = pPage->GetObj(i);
             if (pObj)
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index a63cd3f37bed..758cf0fa0fae 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -354,8 +354,8 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
             if ( pObj->IsGroupObject() )
             {
                 SdrObjList* pOL = pObj->GetSubList();
-                sal_uLong nObj = pOL->GetObjCount();
-                for ( sal_uLong index=0; index<nObj; ++index )
+                const size_t nObj = pOL->GetObjCount();
+                for ( size_t index=0; index<nObj; ++index )
                 {
                     pInfo = ScDrawLayer::GetMacroInfo( pOL->GetObj(index), true );
                     pInfo->SetMacro( sMacro );
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 10292a991eb0..fcbdceaf9ba1 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1143,10 +1143,9 @@ uno::Reference< uno::XInterface > ScTabViewObj::GetClickedObject(const Point& rP
                 sal_uInt16 nHitLog = (sal_uInt16) pActiveWin->PixelToLogic(
                                  Size(pDrawView->GetHitTolerancePixel(),0)).Width();
 
-                sal_uInt32 nCount(pDrawPage->GetObjCount());
+                const size_t nCount(pDrawPage->GetObjCount());
                 bool bFound(false);
-                sal_uInt32 i(0);
-                while (i < nCount && !bFound)
+                for (size_t i = 0; i < nCount && !bFound; ++i)
                 {
                     SdrObject* pObj = pDrawPage->GetObj(i);
                     if (pObj && SdrObjectPrimitiveHit(*pObj, aPos, nHitLog, *pDrawView->GetSdrPageView(), 0, false))
@@ -1154,7 +1153,6 @@ uno::Reference< uno::XInterface > ScTabViewObj::GetClickedObject(const Point& rP
                         xTarget.set(pObj->getUnoShape(), uno::UNO_QUERY);
                         bFound = true;
                     }
-                    ++i;
                 }
             }
         }
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 24a8c5a2d77e..8d7d71cd899b 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -330,8 +330,8 @@ void ScDrawView::RecalcScale()
     {
         if ( SdrPage* pPage = pPV->GetPage() )
         {
-            sal_uLong nCount = pPage->GetObjCount();
-            for ( sal_uLong i = 0; i < nCount; i++ )
+            const size_t nCount = pPage->GetObjCount();
+            for ( size_t i = 0; i < nCount; ++i )
             {
                 SdrObject* pObj = pPage->GetObj( i );
                 // Align objects to nearset grid position
@@ -433,7 +433,7 @@ void ScDrawView::MarkListHasChanged()
             if ( pObj->ISA( SdrObjGroup ) )
             {
                 const SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList();
-                sal_uLong nListCount = pLst->GetObjCount();
+                const size_t nListCount = pLst->GetObjCount();
                 if ( nListCount == 0 )
                 {
                     //  An empty group (may occur during Undo) is no control or graphics object.
@@ -441,7 +441,7 @@ void ScDrawView::MarkListHasChanged()
                     bOnlyControls = false;
                     bOnlyGraf = false;
                 }
-                for ( sal_uInt16 j = 0; j < nListCount; ++j )
+                for ( size_t j = 0; j < nListCount; ++j )
                 {
                     SdrObject *pSubObj = pLst->GetObj( j );
 
@@ -902,7 +902,7 @@ void ScDrawView::SyncForGrid( SdrObject* pObj )
     if ( pObj->ISA( SdrObjGroup ) )
     {
         SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList();
-        for ( sal_uLong i = 0, nCount = pLst->GetObjCount(); i < nCount; ++i )
+        for ( size_t i = 0, nCount = pLst->GetObjCount(); i < nCount; ++i )
             SyncForGrid( pLst->GetObj( i ) );
     }
 
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index f5481b8ff0f8..25859d371412 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -500,7 +500,7 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
             SvxDrawingLayerImport( pModel.get(), xInputStream );
 
             // set everything to right layer:
-            sal_uLong nObjCount = 0;
+            size_t nObjCount = 0;
             sal_uInt16 nPages = pModel->GetPageCount();
             for (sal_uInt16 i=0; i<nPages; i++)
             {