use tools::Long in sw

Change-Id: I44be72b3a9b14823ec37a3c799cffb4fb4d6e1de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104527
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 14 insertions, 14 deletions

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 5481b4d9e4c3..8bdcac6344de 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2368,7 +2368,7 @@ void SwDrawVirtObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fr
     SetRectsDirty();
 }
 
-void SwDrawVirtObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
+void SwDrawVirtObj::NbcRotate(const Point& rRef, tools::Long nAngle, double sn, double cs)
 {
     rRefObj.NbcRotate(rRef - GetOffset(), nAngle, sn, cs);
     SetRectsDirty();
@@ -2380,7 +2380,7 @@ void SwDrawVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2)
     SetRectsDirty();
 }
 
-void SwDrawVirtObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
+void SwDrawVirtObj::NbcShear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear)
 {
     rRefObj.NbcShear(rRef - GetOffset(), nAngle, tn, bVShear);
     SetRectsDirty();
@@ -2402,7 +2402,7 @@ void SwDrawVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fract
     }
 }
 
-void SwDrawVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs)
+void SwDrawVirtObj::Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs)
 {
     if(nAngle)
     {
@@ -2421,7 +2421,7 @@ void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
     SendUserCall(SdrUserCallType::Resize, aBoundRect0);
 }
 
-void SwDrawVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
+void SwDrawVirtObj::Shear(const Point& rRef, tools::Long nAngle, double tn, bool bVShear)
 {
     if(nAngle)
     {
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 94d566d046f0..3360229124df 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -378,7 +378,7 @@ bool SwVirtFlyDrawObj::HasLimitedRotation() const
     return ContainsSwGrfNode();
 }
 
-void SwVirtFlyDrawObj::Rotate(const Point& rRef, long nAngle, double sn, double cs)
+void SwVirtFlyDrawObj::Rotate(const Point& rRef, tools::Long nAngle, double sn, double cs)
 {
     if(ContainsSwGrfNode())
     {
@@ -665,7 +665,7 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
         const SwFrameFormat *pTmpFormat = GetFormat();
         const SwFormatVertOrient &rVert = pTmpFormat->GetVertOrient();
         const SwFormatHoriOrient &rHori = pTmpFormat->GetHoriOrient();
-        long lXDiff = aNewPos.X() - aOldPos.X();
+        tools::Long lXDiff = aNewPos.X() - aOldPos.X();
         if( rHori.IsPosToggle() && text::HoriOrientation::NONE == eHori &&
             !GetFlyFrame()->FindPageFrame()->OnRightPage() )
             lXDiff = -lXDiff;
@@ -674,7 +674,7 @@ void SwVirtFlyDrawObj::NbcMove(const Size& rSiz)
             text::HoriOrientation::NONE == eHori )
             lXDiff = -lXDiff;
 
-        long lYDiff = aNewPos.Y() - aOldPos.Y();
+        tools::Long lYDiff = aNewPos.Y() - aOldPos.Y();
         if( GetFlyFrame()->GetAnchorFrame()->IsVertical() )
         {
             //lXDiff -= rVert.GetPos();
@@ -842,8 +842,8 @@ void SwVirtFlyDrawObj::NbcCrop(const basegfx::B2DPoint& rRef, double fxFact, dou
     const tools::Rectangle aOldRect(
         GetFlyFrame()->getFrameArea().TopLeft() + GetFlyFrame()->getFramePrintArea().TopLeft(),
         GetFlyFrame()->getFramePrintArea().SSize());
-    const long nOldWidth(aOldRect.GetWidth());
-    const long nOldHeight(aOldRect.GetHeight());
+    const tools::Long nOldWidth(aOldRect.GetWidth());
+    const tools::Long nOldHeight(aOldRect.GetHeight());
 
     if (!nOldWidth || !nOldHeight)
     {
@@ -904,8 +904,8 @@ void SwVirtFlyDrawObj::NbcCrop(const basegfx::B2DPoint& rRef, double fxFact, dou
     // Set new frame size
     SwFrameFormat *pFormat = GetFormat();
     SwFormatFrameSize aSz( pFormat->GetFrameSize() );
-    const long aNewWidth(aNewRect.GetWidth() + (aOutRect.GetWidth() - aOldRect.GetWidth()));
-    const long aNewHeight(aNewRect.GetHeight() + (aOutRect.GetHeight() - aOldRect.GetHeight()));
+    const tools::Long aNewWidth(aNewRect.GetWidth() + (aOutRect.GetWidth() - aOldRect.GetWidth()));
+    const tools::Long aNewHeight(aNewRect.GetHeight() + (aOutRect.GetHeight() - aOldRect.GetHeight()));
     aSz.SetWidth(aNewWidth);
     aSz.SetHeight(aNewHeight);
     pFormat->GetDoc()->SetAttr( aSz, *pFormat );
@@ -1033,7 +1033,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef, const Fraction& xFact, const
         {
             SwBorderAttrAccess aAccess( SwFrame::GetCache(), GetFlyFrame() );
             const SwBorderAttrs &rAttrs = *aAccess.Get();
-            long nMin = rAttrs.CalcLeftLine()+rAttrs.CalcRightLine();
+            tools::Long nMin = rAttrs.CalcLeftLine()+rAttrs.CalcRightLine();
             const SwFormatCol& rCol = rAttrs.GetAttrSet().GetCol();
             if ( rCol.GetColumns().size() > 1 )
             {
@@ -1053,7 +1053,7 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef, const Fraction& xFact, const
 
         if ( aFrameSz.GetWidthPercent() || aFrameSz.GetHeightPercent() )
         {
-            long nRelWidth, nRelHeight;
+            tools::Long nRelWidth, nRelHeight;
             const SwFrame *pRel = GetFlyFrame()->IsFlyLayFrame() ?
                                 GetFlyFrame()->GetAnchorFrame() :
                                 GetFlyFrame()->GetAnchorFrame()->GetUpper();
@@ -1167,7 +1167,7 @@ sal_uInt16 SwVirtFlyDrawObj::getPossibleRotationFromFraphicFrame(Size& rSize) co
     return nRetval;
 }
 
-long SwVirtFlyDrawObj::GetRotateAngle() const
+tools::Long SwVirtFlyDrawObj::GetRotateAngle() const
 {
     if(ContainsSwGrfNode())
     {