fdo#63154: Change Min/Max/Abs for std::min/max/abs

Now all these usages were removed from LO.

Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6
Reviewed-on: https://gerrit.libreoffice.org/3326
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

6 files changed, 12 insertions, 12 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5928ee39a735..2adfb0aace50 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3124,7 +3124,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
     long nCtrlW = aTopLevelLabel.GetSizePixel().Width();
     if ( nTxtW >= nCtrlW )
     {
-        long nDelta = Max( (long)10, nTxtW - nCtrlW );
+        long nDelta = std::max( (long)10, nTxtW - nCtrlW );
         Size aNewSz = aTopLevelLabel.GetSizePixel();
         aNewSz.Width() += nDelta;
         aTopLevelLabel.SetSizePixel( aNewSz );
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 4f521a1e4386..e027b7480037 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -210,8 +210,8 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
                                                  double fScaleX, double fScaleY )
 {
     Graphic         aRet;
-    const Size      aSize( Max( FRound( GetTileWidth() * fScaleX ), 1L ),
-                           Max( FRound( GetTileHeight() * fScaleY ), 1L ) );
+    const Size      aSize( std::max( FRound( GetTileWidth() * fScaleX ), 1L ),
+                           std::max( FRound( GetTileHeight() * fScaleY ), 1L ) );
     BmpFilterParam  aParam( aSize );
 
     if( rGraphic.IsAnimated() )
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index ef193e379065..ad6cac1d5a63 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -395,9 +395,9 @@ void SvxFontSubstCheckListBox::setColSizes()
         return;
     long nW1 = rBar.GetTextWidth(rBar.GetItemText(3));
     long nW2 = rBar.GetTextWidth(rBar.GetItemText(4));
-    long nMax = Max( nW1, nW2 ) + 6; // width of the longest header + a little offset
+    long nMax = std::max( nW1, nW2 ) + 6; // width of the longest header + a little offset
     long nMin = rBar.LogicToPixel(Size(10, 0), MAP_APPFONT).Width();
-    nMax = Max( nMax, nMin );
+    nMax = std::max( nMax, nMin );
     const long nDoubleMax = 2*nMax;
     const long nRest = GetSizePixel().Width() - nDoubleMax;
     long aStaticTabs[] = { 4, 0, 0, 0, 0 };
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index f04d6a6ce811..63ea530487c5 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -130,8 +130,8 @@ sal_Bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
     if ( pSize )
     {
         Size aSize = pSize->GetSize();
-        long nDiffW = Abs( rSize.Width () - aSize.Width () );
-        long nDiffH = Abs( rSize.Height() - aSize.Height() );
+        long nDiffW = std::abs( rSize.Width () - aSize.Width () );
+        long nDiffH = std::abs( rSize.Height() - aSize.Height() );
         return ( nDiffW < 10 && nDiffH < 10 );
     }
     else
@@ -1446,8 +1446,8 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl)
     long nFHeight = m_pBspWin->GetFtHeight();
     long nFDist = m_pBspWin->GetFtDist();
 
-    long nHFLeft = Max( m_pBspWin->GetHdLeft(), m_pBspWin->GetFtLeft() );
-    long nHFRight = Max( m_pBspWin->GetHdRight(), m_pBspWin->GetFtRight() );
+    long nHFLeft = std::max( m_pBspWin->GetHdLeft(), m_pBspWin->GetFtLeft() );
+    long nHFRight = std::max( m_pBspWin->GetHdRight(), m_pBspWin->GetFtRight() );
 
     // current values for page margins
     long nBT = static_cast<long>(m_pTopMarginEdit->Denormalize(m_pTopMarginEdit->GetValue(FUNIT_TWIP)));
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 73c0e0fc58ff..95b0be90d8b7 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -901,12 +901,12 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet)
     }
 
     pItem = GetItem( rSet, SID_ATTR_TRANSFORM_WIDTH );
-    sal_Int32 nWidth = Max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, (sal_uInt32)1 );
+    sal_Int32 nWidth = std::max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, (sal_uInt32)1 );
 
     m_aWidthMF.SetValue(m_aWidthMF.Normalize(nWidth), FUNIT_TWIP);
 
     pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HEIGHT );
-    sal_Int32 nHeight = Max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, (sal_uInt32)1 );
+    sal_Int32 nHeight = std::max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, (sal_uInt32)1 );
     m_aHeightMF.SetValue(m_aHeightMF.Normalize(nHeight), FUNIT_TWIP);
     m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0;
 
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index f8f6f82ca928..e15bb8475271 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -1073,7 +1073,7 @@ void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK )
     sal_uInt16 const nColor2 = 255 - rColor.GetGreen();
     sal_uInt16 const nColor3 = 255 - rColor.GetBlue();
 
-    rK = Min( Min( nColor1, nColor2 ), nColor3 );
+    rK = std::min( std::min( nColor1, nColor2 ), nColor3 );
 
     rColor.SetRed( sal::static_int_cast< sal_uInt8 >( nColor1 - rK ) );
     rColor.SetGreen( sal::static_int_cast< sal_uInt8 >( nColor2 - rK ) );