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

3 files changed, 23 insertions, 21 deletions

diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 88a71e219cc8..d4e2f2fae33f 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -441,7 +441,7 @@ public:
 class SVX_DLLPUBLIC SdrHdlList
 {
 protected:
-    sal_uIntPtr                 mnFocusIndex;
+    size_t                      mnFocusIndex;
     SdrMarkView*                pView;
     std::deque<SdrHdl*>         aList;
     sal_uInt16                  nHdlSize;
@@ -474,9 +474,9 @@ public:
     //             2.Level PageView (Pointer)
     //             3.Level Position (x+y)
     void     Sort();
-    sal_uIntPtr    GetHdlCount() const                       { return aList.size(); }
-    SdrHdl*  GetHdl(sal_uIntPtr nNum) const                  { return nNum != CONTAINER_ENTRY_NOTFOUND ? aList[nNum] : NULL; }
-    sal_uIntPtr    GetHdlNum(const SdrHdl* pHdl) const;
+    size_t   GetHdlCount() const { return aList.size(); }
+    SdrHdl*  GetHdl(size_t nNum) const { return nNum<aList.size() ? aList[nNum] : NULL; }
+    size_t   GetHdlNum(const SdrHdl* pHdl) const;
     void     SetHdlSize(sal_uInt16 nSiz);
     sal_uInt16   GetHdlSize() const                        { return nHdlSize; }
     void     SetMoveOutside(bool bOn);
@@ -489,7 +489,7 @@ public:
     // AddHdl uebernimmt das Handle in sein Eigentum. Es muss
     // also auf dem Heap stehen, da Clear() ein delete macht.
     void    AddHdl(SdrHdl* pHdl, bool bAtBegin=false);
-    SdrHdl* RemoveHdl(sal_uIntPtr nNum);
+    SdrHdl* RemoveHdl(size_t nNum);
     void RemoveAllByKind(SdrHdlKind eKind);
 
     // Zuletzt eingefuegte Handles werden am ehesten getroffen
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index 97f5b8d4b08b..7c5181f8845e 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -212,16 +212,17 @@ public:
         mbSorted = false;
     }
 
-    sal_uLong GetMarkCount() const
+    size_t GetMarkCount() const
     {
         return maList.size();
     }
 
-    SdrMark* GetMark(sal_uLong nNum) const;
-    sal_uLong FindObject(const SdrObject* pObj) const;
+    SdrMark* GetMark(size_t nNum) const;
+    // returns SAL_MAX_SIZE if not found
+    size_t FindObject(const SdrObject* pObj) const;
     void InsertEntry(const SdrMark& rMark, bool bChkSort = true);
-    void DeleteMark(sal_uLong nNum);
-    void ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum);
+    void DeleteMark(size_t nNum);
+    void ReplaceMark(const SdrMark& rNewMark, size_t nNum);
     void Merge(const SdrMarkList& rSrcList, bool bReverse = false);
     bool DeletePageView(const SdrPageView& rPV);
     bool InsertPageView(const SdrPageView& rPV);
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 02e695ce4785..1401b919b517 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -241,13 +241,14 @@ protected:
 public:
     // all available const methods for read access to selection
     const SdrMarkList& GetMarkedObjectList() const { return mpSdrViewSelection->GetMarkedObjectList(); }
-    sal_uIntPtr TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); }
-    SdrPageView* GetSdrPageViewOfMarkedByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); }
-    SdrMark* GetSdrMarkByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum); }
-    SdrObject* GetMarkedObjectByIndex(sal_uIntPtr nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
-    sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
+    // returns SAL_MAX_SIZE if not found
+    size_t TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); }
+    SdrPageView* GetSdrPageViewOfMarkedByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); }
+    SdrMark* GetSdrMarkByIndex(size_t nNum) const { return GetMarkedObjectList().GetMark(nNum); }
+    SdrObject* GetMarkedObjectByIndex(size_t nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
+    size_t GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
     void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); }
-    bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); }
+    bool AreObjectsMarked() const { return 0 != GetMarkedObjectList().GetMarkCount(); }
     OUString GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); }
     OUString GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); }
     OUString GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); }
@@ -279,13 +280,13 @@ public:
     // SDRSEARCH_DEEP SDRSEARCH_ALSOONMASTER SDRSEARCH_TESTMARKABLE SDRSEARCH_TESTTEXTEDIT
     // SDRSEARCH_WITHTEXT SDRSEARCH_TESTTEXTAREA SDRSEARCH_BACKWARD SDRSEARCH_MARKED
     // SDRSEARCH_WHOLEPAGE
-    virtual bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const;
+    virtual bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, size_t* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const;
     virtual bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
     // bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
     bool MarkObj(const Point& rPnt, short nTol=-2, bool bToggle=false, bool bDeep=false);
 
     // Pick: Supported options for nOptions are SDRSEARCH_PASS2BOUND und SDRSEARCH_PASS3NEAREST
-    bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const;
+    bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, size_t* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const;
 
     // Selects the most upper of the marked objects (O1) and scans from there
     // towards bottom direction, selecting the first non-marked object (O2).
@@ -349,9 +350,9 @@ public:
     bool MarkNextPoint(const Point& rPnt, bool bPrev=false);
 
     // Search for the number of the suitable handle. In case of empty search result,
-    // CONTAINER_ENTRY_NOTFOUND is returned.
-    sal_uIntPtr GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
-    SdrHdl* GetHdl(sal_uIntPtr nHdlNum)  const { return aHdl.GetHdl(nHdlNum); }
+    // SAL_MAX_SIZE is returned.
+    size_t GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
+    SdrHdl* GetHdl(size_t nHdlNum)  const { return aHdl.GetHdl(nHdlNum); }
     const SdrHdlList& GetHdlList() const { return aHdl; }
 
     // Draw a selection frame for marking of points.