long->sal_Int32 in tools/gen.hxx

which triggered a lot of changes in sw/

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

1 files changed, 5 insertions, 5 deletions

diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 2a20c9c70e9d..b1c67634618b 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -485,10 +485,10 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize &rSz )
     ::CalcClipRect( pObj, aTmpStretch, false );
     aClip.Intersection_( aTmpStretch );
 
-    const long nBot = getFrameArea().Top() + getFrameArea().Height();
-    const long nRig = getFrameArea().Left() + getFrameArea().Width();
-    const long nClipBot = aClip.Top() + aClip.Height();
-    const long nClipRig = aClip.Left() + aClip.Width();
+    const sal_Int32 nBot = getFrameArea().Top() + getFrameArea().Height();
+    const sal_Int32 nRig = getFrameArea().Left() + getFrameArea().Width();
+    const sal_Int32 nClipBot = aClip.Top() + aClip.Height();
+    const sal_Int32 nClipRig = aClip.Left() + aClip.Width();
 
     const bool bBot = nBot > nClipBot;
     const bool bRig = nRig > nClipRig;
@@ -660,7 +660,7 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize &rSz )
             {
                 SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
                 aFrm.Height( aFrameRect.Height() );
-                aFrm.Width ( std::max( long(MINLAY), aFrameRect.Width() ) );
+                aFrm.Width ( std::max<sal_Int32>( MINLAY, aFrameRect.Width() ) );
             }
 
             if ( Lower() && Lower()->IsColumnFrame() )