From 8bc951daf79decbd8a599a409c6d33c5456710e0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 26 Jan 2018 09:50:06 +0200 Subject: 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 Reviewed-by: Noel Grandin --- sw/source/uibase/frmdlg/frmmgr.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sw/source/uibase/frmdlg') diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx index 1debb81ca787..1813fe7e2115 100644 --- a/sw/source/uibase/frmdlg/frmmgr.cxx +++ b/sw/source/uibase/frmdlg/frmmgr.cxx @@ -516,24 +516,24 @@ void SwFlyFrameAttrMgr::DelAttr( sal_uInt16 nId ) void SwFlyFrameAttrMgr::SetLRSpace( long nLeft, long nRight ) { - OSL_ENSURE( LONG_MAX != nLeft && LONG_MAX != nRight, "Which border to set?" ); + OSL_ENSURE( SAL_MAX_INT32 != nLeft && SAL_MAX_INT32 != nRight, "Which border to set?" ); SvxLRSpaceItem aTmp( m_aSet.Get( RES_LR_SPACE ) ); - if( LONG_MAX != nLeft ) + if( SAL_MAX_INT32 != nLeft ) aTmp.SetLeft( sal_uInt16(nLeft) ); - if( LONG_MAX != nRight ) + if( SAL_MAX_INT32 != nRight ) aTmp.SetRight( sal_uInt16(nRight) ); m_aSet.Put( aTmp ); } void SwFlyFrameAttrMgr::SetULSpace( long nTop, long nBottom ) { - OSL_ENSURE(LONG_MAX != nTop && LONG_MAX != nBottom, "Which border to set?" ); + OSL_ENSURE(SAL_MAX_INT32 != nTop && SAL_MAX_INT32 != nBottom, "Which border to set?" ); SvxULSpaceItem aTmp( m_aSet.Get( RES_UL_SPACE ) ); - if( LONG_MAX != nTop ) + if( SAL_MAX_INT32 != nTop ) aTmp.SetUpper( sal_uInt16(nTop) ); - if( LONG_MAX != nBottom ) + if( SAL_MAX_INT32 != nBottom ) aTmp.SetLower( sal_uInt16(nBottom) ); m_aSet.Put( aTmp ); } @@ -591,7 +591,7 @@ void SwFlyFrameAttrMgr::SetRotation(sal_uInt16 nOld, sal_uInt16 nNew, const Size void SwFlyFrameAttrMgr::SetSize( const Size& rSize ) { SwFormatFrameSize aSize( GetFrameSize() ); - aSize.SetSize(Size(std::max(rSize.Width(), long(MINFLY)), std::max(rSize.Height(), long(MINFLY)))); + aSize.SetSize(Size(std::max(rSize.Width(), MINFLY), std::max(rSize.Height(), MINFLY))); m_aSet.Put( aSize ); } -- cgit