[Libreoffice-commits] core.git: include/vcl svtools/source vcl/source

[Noel Grandin (via logerrit)]

 include/vcl/imapcirc.hxx       |    9 ++++-----
 svtools/source/uno/unoimap.cxx |    2 +-
 vcl/source/treelist/imap.cxx   |    8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 5e66cb1cfc747b118d480194d88737d54197a800
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun May 2 20:01:57 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon May 3 10:00:40 2021 +0200

    sal_uLong->sal_Int32 in IMapCircleObject
    
    Change-Id: I47f4901d38cfb14011a0b7db4cc38203e3e14e30
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115009
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/imapcirc.hxx b/include/vcl/imapcirc.hxx
index 0be06dff8cd3..e7dac3b32b3c 100644
--- a/include/vcl/imapcirc.hxx
+++ b/include/vcl/imapcirc.hxx
@@ -21,7 +21,6 @@
 
 #include <vcl/dllapi.h>
 #include <tools/gen.hxx>
-#include <tools/solar.h>
 #include <vcl/imapobj.hxx>
 
 class Fraction;
@@ -29,9 +28,9 @@ class Fraction;
 class VCL_DLLPUBLIC IMapCircleObject final : public IMapObject
 {
     Point               aCenter;
-    sal_Int32               nRadius;
+    sal_Int32           nRadius;
 
-    void                ImpConstruct( const Point& rCenter, sal_uLong nRad, bool bPixel );
+    void                ImpConstruct( const Point& rCenter, sal_Int32 nRad, bool bPixel );
 
     // binary import/export
     virtual void        WriteIMapObject( SvStream& rOStm ) const override;
@@ -40,7 +39,7 @@ class VCL_DLLPUBLIC IMapCircleObject final : public IMapObject
 public:
 
                         IMapCircleObject() : nRadius(0) {}
-                        IMapCircleObject( const Point& rCenter, sal_uLong nRad,
+                        IMapCircleObject( const Point& rCenter, sal_Int32 nRad,
                                           const OUString& rURL,
                                           const OUString& rAltText,
                                           const OUString& rDesc,
@@ -53,7 +52,7 @@ public:
     virtual bool        IsHit( const Point& rPoint ) const override;
 
     Point               GetCenter( bool bPixelCoords = true ) const;
-    sal_uLong           GetRadius( bool bPixelCoords = true ) const;
+    sal_Int32           GetRadius( bool bPixelCoords = true ) const;
 
     void                Scale( const Fraction& rFractX, const Fraction& rFracY );
 
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index f87973281f45..9ac7eb8e03d5 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -218,7 +218,7 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv
         break;
     case IMapObjectType::Circle:
         {
-            mnRadius = static_cast<sal_Int32>(static_cast<const IMapCircleObject*>(&rMapObject)->GetRadius(false));
+            mnRadius = static_cast<const IMapCircleObject*>(&rMapObject)->GetRadius(false);
             const Point aPoint( static_cast<const IMapCircleObject*>(&rMapObject)->GetCenter(false) );
 
             maCenter.X = aPoint.X();
diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx
index 02eeec49c8d8..eafcc4c19859 100644
--- a/vcl/source/treelist/imap.cxx
+++ b/vcl/source/treelist/imap.cxx
@@ -235,7 +235,7 @@ bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
     return ( IMapObject::IsEqual( rEqObj ) && ( aRect == rEqObj.aRect ) );
 }
 
-IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uLong nCircleRadius,
+IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_Int32 nCircleRadius,
                                     const OUString& rURL,
                                     const OUString& rAltText,
                                     const OUString& rDesc,
@@ -248,7 +248,7 @@ IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uLong nCircleRadiu
     ImpConstruct( rCenter, nCircleRadius, bPixelCoords );
 }
 
-void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_uLong nRad, bool bPixel )
+void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_Int32 nRad, bool bPixel )
 {
     if ( bPixel )
     {
@@ -342,9 +342,9 @@ Point IMapCircleObject::GetCenter( bool bPixelCoords ) const
     return aNewPoint;
 }
 
-sal_uLong IMapCircleObject::GetRadius( bool bPixelCoords ) const
+sal_Int32 IMapCircleObject::GetRadius( bool bPixelCoords ) const
 {
-    sal_uLong nNewRadius;
+    sal_Int32 nNewRadius;
 
     if ( bPixelCoords )
         nNewRadius = Application::GetDefaultDevice()->LogicToPixel( Size( nRadius, 0 ), MapMode( MapUnit::Map100thMM ) ).Width();