summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/svdmrkv.hxx4
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx4
-rw-r--r--sd/source/ui/animations/motionpathtag.hxx4
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx4
-rw-r--r--sd/source/ui/annotations/annotationtag.hxx4
-rw-r--r--sd/source/ui/func/smarttag.cxx4
-rw-r--r--sd/source/ui/inc/View.hxx4
-rw-r--r--sd/source/ui/inc/smarttag.hxx4
-rw-r--r--sd/source/ui/view/sdview.cxx8
-rw-r--r--svx/source/svdraw/svddrgv.cxx2
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx8
11 files changed, 25 insertions, 25 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 3fba52b0453e..1741f7c8ca38 100644
--- a/include/svx/svdmrkv.hxx
+++ b/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;
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index c99e729f9fe7..cdc7dac65b24 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/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 )
{
diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx
index 54ba50d03617..0e785cece1e2 100644
--- a/sd/source/ui/animations/motionpathtag.hxx
+++ b/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;
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index b607a3a4bfad..bd3de09cabfe 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/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;
}
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 9be1541bf988..3f5870227269 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/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;
diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx
index 53a2e545af16..f72830c15383 100644
--- a/sd/source/ui/func/smarttag.cxx
+++ b/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;
}
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 63b124b33f42..271a8850f707 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/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;
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index 47006f8b75b0..821f2e45f364 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/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);
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index a850126f0891..28c80e6204b0 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/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;
}
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 252dfd456b9b..19cafe3e0b30 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/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)
{
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index b83a99f82c84..e1f41bf58e96 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/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)) {
generated by cgit (git 2.34.1) at 2024-08-09 22:19:31 +0000