Consistently use size_t and SAL_MAX_SIZE

Instead of a mix of sal_uIntPtr, sal_uLong, int, and so on.
Also change CONTAINER_ENTRY_NOTFOUND=ULONG_MAX to SAL_MAX_SIZE as
return value in case of failure and in the related tests.

Change-Id: Ie778a849253b4be84fbcdab9557b7c4240233927

14 files changed, 43 insertions, 45 deletions

diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 4195ff60c850..83b67b22d1ba 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -634,8 +634,8 @@ static void lcl_InitMarks( SdrMarkView& rDest, const SdrMarkView& rSource, SCTAB
     OSL_ENSURE(pDestPV,"PageView ?");
 
     const SdrMarkList& rMarkList = rSource.GetMarkedObjectList();
-    sal_uLong nCount = rMarkList.GetMarkCount();
-    for (sal_uLong i=0; i<nCount; i++)
+    const size_t nCount = rMarkList.GetMarkCount();
+    for (size_t i=0; i<nCount; ++i)
     {
         SdrMark* pMark = rMarkList.GetMark(i);
         SdrObject* pObj = pMark->GetMarkedSdrObj();
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 813935134cdc..0ad7efe45a09 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -82,7 +82,7 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView
             {
                 //  handle selection on drawing layer
                 const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
-                sal_uLong nMarkCount = rMarkList.GetMarkCount();
+                const size_t nMarkCount = rMarkList.GetMarkCount();
                 if ( nMarkCount )
                 {
                     if ( nMarkCount == 1 )
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 6994a2463171..a63cd3f37bed 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -106,7 +106,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
     SdrModel*           pDoc        = pViewData->GetDocument()->GetDrawLayer();
 
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    sal_uLong nMarkCount = rMarkList.GetMarkCount();
+    const size_t nMarkCount = rMarkList.GetMarkCount();
     SdrObject* pSingleSelectedObj = NULL;
     if ( nMarkCount > 0 )
         pSingleSelectedObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 54a6ee8ddea5..294e630e0d90 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -96,8 +96,7 @@ void ScDrawShell::GetState( SfxItemSet& rSet )          // Zustaende / Toggles
         // Notes always default to Page anchor.
     bool bDisableAnchor = false;
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    sal_uLong nMarkCount = rMarkList.GetMarkCount();
-    if ( nMarkCount == 1 )
+    if ( rMarkList.GetMarkCount() == 1 )
     {
         SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
         if( ScDrawLayer::IsNoteCaption( pObj ) )
@@ -145,7 +144,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet )      // Funktionen disabl
     }
 
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    sal_uLong nMarkCount = rMarkList.GetMarkCount();
+    const size_t nMarkCount = rMarkList.GetMarkCount();
 
     if ( nMarkCount <= 1 || !pView->IsGroupPossible() )
         rSet.DisableItem( SID_GROUP );
@@ -363,8 +362,8 @@ void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet)
 bool ScDrawShell::AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark)
 {
     bool bResult=true;
-    sal_uLong nCount = rMark.GetMarkCount();
-    for (sal_uLong i=0; i<nCount; i++)
+    const size_t nCount = rMark.GetMarkCount();
+    for (size_t i=0; i<nCount; ++i)
     {
         SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj();
         if ( !pObj->ISA(SdrUnoObj) )
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 8294f683225f..614d49ff3cb4 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -66,13 +66,12 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet )             //  Hyperlink
 {
     ScDrawView* pView = pViewData->GetScDrawView();
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    sal_uLong nMarkCount = rMarkList.GetMarkCount();
 
         //  Hyperlink
 
     SvxHyperlinkItem aHLinkItem;
 
-    if ( nMarkCount == 1 )              // URL-Button markiert ?
+    if ( rMarkList.GetMarkCount() == 1 )              // URL-Button markiert ?
     {
         SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
         ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj );
@@ -476,10 +475,10 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
 
         case SID_RENAME_OBJECT:
             {
-                if(1L == pView->GetMarkedObjectCount())
+                if(1 == pView->GetMarkedObjectCount())
                 {
                     // #i68101#
-                    SdrObject* pSelected = pView->GetMarkedObjectByIndex(0L);
+                    SdrObject* pSelected = pView->GetMarkedObjectByIndex(0);
                     OSL_ENSURE(pSelected, "ScDrawShell::ExecDrawFunc: nMarkCount, but no object (!)");
 
                     if(SC_LAYER_INTERN != pSelected->GetLayer())
@@ -545,9 +544,9 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
         // #i68101#
         case SID_TITLE_DESCRIPTION_OBJECT:
             {
-                if(1L == pView->GetMarkedObjectCount())
+                if(1 == pView->GetMarkedObjectCount())
                 {
-                    SdrObject* pSelected = pView->GetMarkedObjectByIndex(0L);
+                    SdrObject* pSelected = pView->GetMarkedObjectByIndex(0);
                     OSL_ENSURE(pSelected, "ScDrawShell::ExecDrawFunc: nMarkCount, but no object (!)");
 
                     if(SC_LAYER_INTERN != pSelected->GetLayer())
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 59a9a5e1ab6b..aef82de665ea 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -619,7 +619,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
                             // restore point with focus
                             SdrHdl* pNewOne = 0L;
 
-                            for(sal_uInt32 a(0); !pNewOne && a < rHdlList.GetHdlCount(); a++)
+                            for(size_t a = 0; !pNewOne && a < rHdlList.GetHdlCount(); ++a)
                             {
                                 SdrHdl* pAct = rHdlList.GetHdl(a);
 
@@ -783,8 +783,8 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
 bool FuDraw::IsEditingANote() const
 {
     const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-    sal_Int32 backval=rMarkList.GetMarkCount();
-    for (sal_Int32 nlv1=0;nlv1<backval;nlv1++)
+    const size_t backval=rMarkList.GetMarkCount();
+    for (size_t nlv1=0; nlv1<backval; ++nlv1)
     {
         SdrObject* pObj = rMarkList.GetMark( nlv1 )->GetMarkedSdrObj();
         if ( ScDrawLayer::IsNoteCaption( pObj ) )
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 415e5a436b4e..75fea9f31369 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -413,8 +413,8 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                 if ( pView && pDocument )
                 {
                     const SdrMarkList& rSdrMarkList = pView->GetMarkedObjectList();
-                    sal_uLong nMarkCount = rSdrMarkList.GetMarkCount();
-                    for ( sal_uLong i = 0; i < nMarkCount; ++i )
+                    const size_t nMarkCount = rSdrMarkList.GetMarkCount();
+                    for ( size_t i = 0; i < nMarkCount; ++i )
                     {
                         SdrMark* pMark = rSdrMarkList.GetMark( i );
                         pObj = ( pMark ? pMark->GetMarkedSdrObj() : NULL );
@@ -468,11 +468,11 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                 /*  if multi-selection contains a note caption object, remove
                     all other objects from selection. */
                 const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-                sal_uLong nCount = rMarkList.GetMarkCount();
+                const size_t nCount = rMarkList.GetMarkCount();
                 if( nCount > 1 )
                 {
                     bool bFound = false;
-                    for( sal_uLong nIdx = 0; !bFound && (nIdx < nCount); ++nIdx )
+                    for( size_t nIdx = 0; !bFound && (nIdx < nCount); ++nIdx )
                     {
                         pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj();
                         bFound = ScDrawLayer::IsNoteCaption( pObj );
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 911b1a69c059..ec407b1fe328 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -164,7 +164,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
     {
         SdrHdl* pHdl = pView->PickHandle(aMDPos);
 
-        sal_uLong nHdlNum = pView->GetHdlNum(pHdl);
+        const size_t nHdlNum = pView->GetHdlNum(pHdl);
 
         if (pHdl != NULL)
         {
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 604a714b30a4..10292a991eb0 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -873,7 +873,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection()
         if (pDrawView)
         {
             const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList();
-            sal_uLong nMarkCount = rMarkList.GetMarkCount();
+            const size_t nMarkCount = rMarkList.GetMarkCount();
             if (nMarkCount)
             {
                 //  ShapeCollection erzeugen (wie in SdXImpressView::getSelection im Draw)
@@ -884,7 +884,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection()
 
                 uno::Reference<uno::XInterface> xRet(xShapes);
 
-                for (sal_uLong i=0; i<nMarkCount; i++)
+                for (size_t i=0; i<nMarkCount; ++i)
                 {
                     SdrObject* pDrawObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
                     if (pDrawObj)
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index cfdc4f9f4087..f4a702525df3 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -59,8 +59,8 @@ void ScDrawView::SetPageAnchored()
     {
         SdrObject* pObj = NULL;
         const SdrMarkList* pMark = &GetMarkedObjectList();
-        sal_uLong nCount = pMark->GetMarkCount();
-        for( sal_uLong i=0; i<nCount; i++ )
+        const size_t nCount = pMark->GetMarkCount();
+        for( size_t i=0; i<nCount; ++i )
         {
             pObj = pMark->GetMark(i)->GetMarkedSdrObj();
             ScDrawLayer::SetPageAnchored( *pObj );
@@ -84,8 +84,8 @@ void ScDrawView::SetCellAnchored()
     {
         SdrObject* pObj = NULL;
         const SdrMarkList* pMark = &GetMarkedObjectList();
-        sal_uLong nCount = pMark->GetMarkCount();
-        for( sal_uLong i=0; i<nCount; i++ )
+        const size_t nCount = pMark->GetMarkCount();
+        for( size_t i=0; i<nCount; ++i )
         {
             pObj = pMark->GetMark(i)->GetMarkedSdrObj();
             ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *pDoc, nTab);
@@ -106,9 +106,9 @@ ScAnchorType ScDrawView::GetAnchorType() const
     if( AreObjectsMarked() )
     {
         const SdrMarkList* pMark = &GetMarkedObjectList();
-        sal_uLong nCount = pMark->GetMarkCount();
+        const size_t nCount = pMark->GetMarkCount();
         const SdrObject* pObj = NULL;
-        for( sal_uLong i=0; i<nCount; i++ )
+        for( size_t i=0; i<nCount; ++i )
         {
             pObj = pMark->GetMark(i)->GetMarkedSdrObj();
             if( ScDrawLayer::GetAnchorType( *pObj ) == SCA_CELL )
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 841d23863e17..d9c0a691ce6d 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -58,8 +58,8 @@ Point aDragStartDiff;
 void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle )
 {
     rAnyOle = rOneOle = false;
-    sal_uLong nCount = rMarkList.GetMarkCount();
-    for (sal_uLong i=0; i<nCount; i++)
+    const size_t nCount = rMarkList.GetMarkCount();
+    for (size_t i=0; i<nCount; ++i)
     {
         SdrMark* pMark = rMarkList.GetMark(i);
         SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -464,8 +464,8 @@ void ScDrawView::SetMarkedOriginalSize()
 
     const SdrMarkList& rMarkList = GetMarkedObjectList();
     long nDone = 0;
-    sal_uLong nCount = rMarkList.GetMarkCount();
-    for (sal_uLong i=0; i<nCount; i++)
+    const size_t nCount = rMarkList.GetMarkCount();
+    for (size_t i=0; i<nCount; ++i)
     {
         SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
         sal_uInt16 nIdent = pObj->GetObjIdentifier();
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 2dc101875926..24a8c5a2d77e 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -135,8 +135,8 @@ ScDrawView::~ScDrawView()
 void ScDrawView::AddCustomHdl()
 {
     const SdrMarkList &rMrkList = GetMarkedObjectList();
-    sal_uInt32 nCount = rMrkList.GetMarkCount();
-    for(sal_uInt32 nPos=0; nPos<nCount; nPos++ )
+    const size_t nCount = rMrkList.GetMarkCount();
+    for(size_t nPos=0; nPos<nCount; ++nPos )
     {
         SdrObject* pObj = rMrkList.GetMark(nPos)->GetMarkedSdrObj();
         if (ScDrawObjData *pAnchor = ScDrawLayer::GetObjDataTab(pObj, nTab))
@@ -214,8 +214,8 @@ void ScDrawView::SetMarkedToLayer( sal_uInt8 nLayerNo )
         BegUndo( ScGlobal::GetRscString( STR_UNDO_SELATTR ) );
 
         const SdrMarkList& rMark = GetMarkedObjectList();
-        sal_uLong nCount = rMark.GetMarkCount();
-        for (sal_uLong i=0; i<nCount; i++)
+        const size_t nCount = rMark.GetMarkCount();
+        for (size_t i=0; i<nCount; ++i)
         {
             SdrObject* pObj = rMark.GetMark(i)->GetMarkedSdrObj();
             if ( !pObj->ISA(SdrUnoObj) && (pObj->GetLayer() != SC_LAYER_INTERN) )
@@ -383,7 +383,7 @@ void ScDrawView::MarkListHasChanged()
     SdrGrafObj* pGrafObj = NULL;
 
     const SdrMarkList& rMarkList = GetMarkedObjectList();
-    sal_uLong nMarkCount = rMarkList.GetMarkCount();
+    const size_t nMarkCount = rMarkList.GetMarkCount();
 
     if ( nMarkCount == 0 && !pViewData->GetViewShell()->IsDrawSelMode() && !bInConstruct )
     {
@@ -427,7 +427,7 @@ void ScDrawView::MarkListHasChanged()
     {
         bool bOnlyControls = true;
         bool bOnlyGraf     = true;
-        for (sal_uLong i=0; i<nMarkCount; i++)
+        for (size_t i=0; i<nMarkCount; ++i)
         {
             SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
             if ( pObj->ISA( SdrObjGroup ) )
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index bf777ae03a20..7055bef0f397 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4481,8 +4481,8 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
     SdrView* pDrawView = pViewData->GetViewShell()->GetSdrView();
     if (pDrawView)
     {
-        sal_uLong nCount = pDrawView->GetMarkedObjectCount();
-        for (sal_uLong i = 0; i < nCount; ++i)
+        const size_t nCount = pDrawView->GetMarkedObjectCount();
+        for (size_t i = 0; i < nCount; ++i)
         {
             SdrObject* pObj = pDrawView->GetMarkedObjectByIndex(i);
             if (pObj && pObj->GetLogicRect().IsInside(aLogicPos))
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index 47004061ec3d..fef41354be2b 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -150,8 +150,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
 
             SdrMarkList aMark = pDragEditView->GetMarkedObjectList();
             aMark.ForceSort();
-            sal_uLong nMarkAnz=aMark.GetMarkCount();
-            for (sal_uLong nm=0; nm<nMarkAnz; nm++) {
+            const size_t nMarkAnz=aMark.GetMarkCount();
+            for (size_t nm=0; nm<nMarkAnz; ++nm) {
                 const SdrMark* pM=aMark.GetMark(nm);
                 const SdrObject* pObj=pM->GetMarkedSdrObj();