sal_uIntPtr->sal_Int32 in SdrMarkView

Change-Id: Iec5c9e45ec753de98142615fdde16f61c393a6e2
Reviewed-on: https://gerrit.libreoffice.org/46311Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

include/svx/svdmrkv.hxx

@@ -305,9 +305,9 @@ public:
     void SetMarkHdlSizePixel(sal_uInt16 nSiz);
 
     virtual bool HasMarkablePoints() const;
-    virtual sal_uIntPtr GetMarkablePointCount() const;
+    virtual sal_Int32 GetMarkablePointCount() const;
     virtual bool HasMarkedPoints() const;
-    virtual sal_uIntPtr GetMarkedPointCount() const;
+    virtual sal_Int32 GetMarkedPointCount() const;
 
     // There might be points which can't be marked:
     virtual bool IsPointMarkable(const SdrHdl& rHdl) const;

sd/source/ui/animations/motionpathtag.cxx

@@ -752,7 +752,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt )
     return true;
 }
 
-sal_uLong MotionPathTag::GetMarkablePointCount() const
+sal_Int32 MotionPathTag::GetMarkablePointCount() const
 {
     if( mpPathObj && isSelected() )
     {
@@ -764,7 +764,7 @@ sal_uLong MotionPathTag::GetMarkablePointCount() const
     }
 }
 
-sal_uLong MotionPathTag::GetMarkedPointCount() const
+sal_Int32 MotionPathTag::GetMarkedPointCount() const
 {
     if( mpMark )
     {

sd/source/ui/animations/motionpathtag.hxx

@@ -50,8 +50,8 @@ public:
     virtual bool KeyInput( const KeyEvent& rKEvt ) override;
 
     // callbacks from sdr view
-    virtual sal_uLong GetMarkablePointCount() const override;
-    virtual sal_uLong GetMarkedPointCount() const override;
+    virtual sal_Int32 GetMarkablePointCount() const override;
+    virtual sal_Int32 GetMarkedPointCount() const override;
     virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark) override;
     virtual void CheckPossibilities() override;
     virtual bool MarkPoints(const ::tools::Rectangle* pRect, bool bUnmark) override;

sd/source/ui/annotations/annotationtag.cxx

@@ -420,12 +420,12 @@ void AnnotationTag::CheckPossibilities()
 {
 }
 
-sal_uLong AnnotationTag::GetMarkablePointCount() const
+sal_Int32 AnnotationTag::GetMarkablePointCount() const
 {
     return 0;
 }
 
-sal_uLong AnnotationTag::GetMarkedPointCount() const
+sal_Int32 AnnotationTag::GetMarkedPointCount() const
 {
     return 0;
 }

sd/source/ui/annotations/annotationtag.hxx

@@ -50,8 +50,8 @@ public:
     virtual bool Command( const CommandEvent& rCEvt ) override;
 
     // callbacks from sdr view
-    virtual sal_uLong GetMarkablePointCount() const override;
-    virtual sal_uLong GetMarkedPointCount() const override;
+    virtual sal_Int32 GetMarkablePointCount() const override;
+    virtual sal_Int32 GetMarkedPointCount() const override;
     virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark) override;
     virtual void CheckPossibilities() override;
     virtual bool MarkPoints(const ::tools::Rectangle* pRect, bool bUnmark) override;

sd/source/ui/func/smarttag.cxx

@@ -85,12 +85,12 @@ bool SmartTag::getContext( SdrViewContext& /*rContext*/ )
     return false;
 }
 
-sal_uLong SmartTag::GetMarkablePointCount() const
+sal_Int32 SmartTag::GetMarkablePointCount() const
 {
     return 0;
 }
 
-sal_uLong SmartTag::GetMarkedPointCount() const
+sal_Int32 SmartTag::GetMarkedPointCount() const
 {
     return 0;
 }

sd/source/ui/inc/View.hxx

@@ -185,9 +185,9 @@ public:
 
     virtual SdrViewContext GetContext() const override;
     virtual bool HasMarkablePoints() const override;
-    virtual sal_uLong GetMarkablePointCount() const override;
+    virtual sal_Int32 GetMarkablePointCount() const override;
     virtual bool HasMarkedPoints() const override;
-    virtual sal_uLong GetMarkedPointCount() const override;
+    virtual sal_Int32 GetMarkedPointCount() const override;
     virtual bool IsPointMarkable(const SdrHdl& rHdl) const override;
     virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) override;
     virtual void CheckPossibilities() override;

sd/source/ui/inc/smarttag.hxx

@@ -68,8 +68,8 @@ public:
     ::sd::View& getView() const { return mrView; }
 
 protected:
-    virtual sal_uLong GetMarkablePointCount() const;
-    virtual sal_uLong GetMarkedPointCount() const;
+    virtual sal_Int32 GetMarkablePointCount() const;
+    virtual sal_Int32 GetMarkedPointCount() const;
     virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark);
     virtual void CheckPossibilities();
     virtual bool MarkPoints(const ::tools::Rectangle* pRect, bool bUnmark);

sd/source/ui/view/sdview.cxx

@@ -1133,9 +1133,9 @@ bool View::HasMarkablePoints() const
         return FmFormView::HasMarkablePoints();
 }
 
-sal_uLong View::GetMarkablePointCount() const
+sal_Int32 View::GetMarkablePointCount() const
 {
-    sal_uLong nCount = FmFormView::GetMarkablePointCount();
+    sal_Int32 nCount = FmFormView::GetMarkablePointCount();
     nCount += maSmartTags.GetMarkablePointCount();
     return nCount;
 }
@@ -1148,9 +1148,9 @@ bool View::HasMarkedPoints() const
         return FmFormView::HasMarkedPoints();
 }
 
-sal_uLong View::GetMarkedPointCount() const
+sal_Int32 View::GetMarkedPointCount() const
 {
-    sal_uLong nCount = FmFormView::GetMarkedPointCount();
+    sal_Int32 nCount = FmFormView::GetMarkedPointCount();
     nCount += maSmartTags.GetMarkedPointCount();
     return nCount;
 }

svx/source/svdraw/svddrgv.cxx

@@ -519,7 +519,7 @@ bool SdrDragView::EndDragObj(bool bCopy)
     // #i73341# If inserting GluePoint, do not insist on last points being different
     if(mpCurrentSdrDragMethod && maDragStat.IsMinMoved() && (IsInsertGluePoint() || maDragStat.GetNow() != maDragStat.GetPrev()))
     {
-        sal_uIntPtr nSavedHdlCount=0;
+        sal_Int32 nSavedHdlCount=0;
 
         if (bEliminatePolyPoints)
         {

svx/source/svdraw/svdmrkv1.cxx

@@ -47,10 +47,10 @@ bool SdrMarkView::HasMarkablePoints() const
     return bRet;
 }
 
-sal_uIntPtr SdrMarkView::GetMarkablePointCount() const
+sal_Int32 SdrMarkView::GetMarkablePointCount() const
 {
     ForceUndirtyMrkPnt();
-    sal_uIntPtr nCount=0;
+    sal_Int32 nCount=0;
     if (!ImpIsFrameHandles()) {
         const size_t nMarkCount=GetMarkedObjectCount();
         if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) {
@@ -83,10 +83,10 @@ bool SdrMarkView::HasMarkedPoints() const
     return bRet;
 }
 
-sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
+sal_Int32 SdrMarkView::GetMarkedPointCount() const
 {
     ForceUndirtyMrkPnt();
-    sal_uIntPtr nCount=0;
+    sal_Int32 nCount=0;
     if (!ImpIsFrameHandles()) {
         size_t nMarkCount=GetMarkedObjectCount();
         if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) {