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>

39 files changed, 168 insertions, 168 deletions

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index ac134b8282fd..d932210f3a96 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -786,16 +786,16 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
             nTol = ( pTols[i] * 255L ) / 100L;
 
             nVal = ( (long) pSrcCols[i].GetRed() );
-            pMinR[i] = Max( nVal - nTol, 0L );
-            pMaxR[i] = Min( nVal + nTol, 255L );
+            pMinR[i] = std::max( nVal - nTol, 0L );
+            pMaxR[i] = std::min( nVal + nTol, 255L );
 
             nVal = ( (long) pSrcCols[i].GetGreen() );
-            pMinG[i] = Max( nVal - nTol, 0L );
-            pMaxG[i] = Min( nVal + nTol, 255L );
+            pMinG[i] = std::max( nVal - nTol, 0L );
+            pMaxG[i] = std::min( nVal + nTol, 255L );
 
             nVal = ( (long) pSrcCols[i].GetBlue() );
-            pMinB[i] = Max( nVal - nTol, 0L );
-            pMaxB[i] = Min( nVal + nTol, 255L );
+            pMinB[i] = std::max( nVal - nTol, 0L );
+            pMaxB[i] = std::min( nVal + nTol, 255L );
 
             pTrans[ i ] = ( pDstCols[ i ] == TRANSP_COL );
         }
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index d5007a275807..681d1c62ba92 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1743,7 +1743,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             if ( nTxtW >= nBtnW )
             {
                 const long nMinDelta = 10;
-                long nDelta = Max( nTxtW - nBtnW, nMinDelta );
+                long nDelta = std::max( nTxtW - nBtnW, nMinDelta );
                 sal_uInt32 i = 0;
                 Window* pWins[] =
                 {
@@ -2043,12 +2043,12 @@ void BrokenRecoveryDialog::impl_askForSavePath()
             Size aBtnSz = maOKBtn.GetSizePixel();
             Point aEditPnt = maContentML.GetPosPixel();
 
-            long nNewHeight = Max( aWinSz.Height() - aEditPnt.Y() - 3 * a3Sz.Height() - aBtnSz.Height(), mnMinHeight );
+            long nNewHeight = std::max( aWinSz.Height() - aEditPnt.Y() - 3 * a3Sz.Height() - aBtnSz.Height(), mnMinHeight );
             long nNewWidth = aWinSz.Width() - 4 * a3Sz.Width();
 
             Size aNewSize( nNewWidth, nNewHeight );
             maContentML.SetSizePixel( aNewSize );
-            Point aNewPoint( Max( aEditPnt.X() + aNewSize.Width() - aBtnSz.Width(), aEditPnt.X() ),
+            Point aNewPoint( std::max( aEditPnt.X() + aNewSize.Width() - aBtnSz.Width(), aEditPnt.X() ),
                              aEditPnt.Y() + aNewSize.Height() + a3Sz.Height() );
             maOKBtn.SetPosPixel( aNewPoint );
         }
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 43811e395e7e..20fdd3f68c3d 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -1264,7 +1264,7 @@ bool operator<( const Style& rL, const Style& rR )
 
 double GetHorDiagAngle( long nWidth, long nHeight )
 {
-    return atan2( static_cast< double >( Abs( nHeight ) ), static_cast< double >( Abs( nWidth ) ) );
+    return atan2( static_cast< double >( std::abs( nHeight ) ), static_cast< double >( std::abs( nWidth ) ) );
 }
 
 // ============================================================================
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 1db80abc1fb3..f680f43510ee 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -331,7 +331,7 @@ void FrameSelectorImpl::InitGlobalGeometry()
     /*  nMinSize is the lower of width and height (control will always be squarish).
         FRAMESEL_GEOM_OUTER is the minimal distance between inner control border
         and any element. */
-    long nMinSize = Min( aCtrlSize.Width(), aCtrlSize.Height() ) - 2 * FRAMESEL_GEOM_OUTER;
+    long nMinSize = std::min( aCtrlSize.Width(), aCtrlSize.Height() ) - 2 * FRAMESEL_GEOM_OUTER;
     /*  nFixedSize is the size all existing elements need in one direction:
         the diag. arrow, space betw. arrow and frame border, outer frame border,
         inner frame border, other outer frame border, space betw. frame border
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index f864f4ed760f..e0097e671f4c 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -877,7 +877,7 @@ IMPL_LINK_NOARG(SvxHFPage, RangeHdl)
     long nFHeight = m_pBspWin->GetFtHeight();
     long nFDist   = m_pBspWin->GetFtDist();
 
-    long nHeight = Max( (long)MINBODY,
+    long nHeight = std::max( (long)MINBODY,
         static_cast<long>(m_pHeightEdit->Denormalize( m_pHeightEdit->GetValue( FUNIT_TWIP ) ) ) );
     long nDist   = m_pTurnOnBox->IsChecked() ?
         static_cast<long>(m_pDistEdit->Denormalize( m_pDistEdit->GetValue( FUNIT_TWIP ) )) : 0;
@@ -910,11 +910,11 @@ IMPL_LINK_NOARG(SvxHFPage, RangeHdl)
     {
         // Header
         nMin = ( nH - nBB - nBT ) / 5; // 20%
-        nMax = Max( nH - nMin - nHDist - nFDist - nFHeight - nBB - nBT,
+        nMax = std::max( nH - nMin - nHDist - nFDist - nFHeight - nBB - nBT,
                     nMin );
         m_pHeightEdit->SetMax( m_pHeightEdit->Normalize( nMax ), FUNIT_TWIP );
         nMin = ( nH - nBB - nBT ) / 5; // 20%
-        nDist = Max( nH - nMin - nHHeight - nFDist - nFHeight - nBB - nBT,
+        nDist = std::max( nH - nMin - nHHeight - nFDist - nFHeight - nBB - nBT,
                      long(0) );
         m_pDistEdit->SetMax( m_pDistEdit->Normalize( nDist ), FUNIT_TWIP );
     }
@@ -922,11 +922,11 @@ IMPL_LINK_NOARG(SvxHFPage, RangeHdl)
     {
         // Footer
         nMin = ( nH - nBT - nBB ) / 5; // 20%
-        nMax = Max( nH - nMin - nFDist - nHDist - nHHeight - nBT - nBB,
+        nMax = std::max( nH - nMin - nFDist - nHDist - nHHeight - nBT - nBB,
                     nMin );
         m_pHeightEdit->SetMax( m_pHeightEdit->Normalize( nMax ), FUNIT_TWIP );
         nMin = ( nH - nBT - nBB ) / 5; // 20%
-        nDist = Max( nH - nMin - nFHeight - nHDist - nHHeight - nBT - nBB,
+        nDist = std::max( nH - nMin - nFHeight - nHDist - nHHeight - nBT - nBB,
                      long(0) );
         m_pDistEdit->SetMax( m_pDistEdit->Normalize( nDist ), FUNIT_TWIP );
     }
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 9e7296061f1f..ee4f809432ec 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -676,7 +676,7 @@ void SvxSearchDialog::InitControls_Impl()
         LINK( this, SvxSearchDialog, AttributeHdl_Impl ) );
 
     // check if buttontext is to wide
-    long nTxtW = Max( pMoreBtn->GetCtrlTextWidth( pMoreBtn->GetMoreText() ),
+    long nTxtW = std::max( pMoreBtn->GetCtrlTextWidth( pMoreBtn->GetMoreText() ),
                       pMoreBtn->GetCtrlTextWidth( pMoreBtn->GetLessText() ) );
     nTxtW += ( pMoreBtn->GetTextHeight() * 2 ); // add image size + offset
     long nBtnW = pMoreBtn->GetSizePixel().Width();
@@ -684,7 +684,7 @@ void SvxSearchDialog::InitControls_Impl()
     {
         // broaden the button
         const long nMinDelta = 10;
-        long nDelta = Max( nTxtW - nBtnW, nMinDelta );
+        long nDelta = std::max( nTxtW - nBtnW, nMinDelta );
         Size aNewSize = pMoreBtn->GetSizePixel();
         aNewSize.Width() += nDelta;
         pMoreBtn->SetSizePixel( aNewSize );
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 24f856f09de0..e8fd30c46d88 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1948,7 +1948,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(pRuler_Imp->lLastLMargin))
                 {
                     long l = pBorders[i].nPos;
                     pBorders[i].nPos += lDiff;
-                    pBorders[i].nPos = Min(pBorders[i].nPos, nRight - pBorders[i].nWidth);
+                    pBorders[i].nPos = std::min(pBorders[i].nPos, nRight - pBorders[i].nWidth);
                     nRight = pBorders[i].nPos - lMinFrame;
                     // RR update the column
                     if(i == GetActRightColumn())
@@ -2172,7 +2172,7 @@ void SvxRuler::ApplyMargins()
         else
             pLRSpaceItem->SetRight(
                 PixelHAdjust(
-                    Max((long)0,pPagePosItem->GetWidth() -
+                    std::max((long)0,pPagePosItem->GetWidth() -
                         pLRSpaceItem->GetLeft() -
                         (ConvertHPosLogic(GetMargin2()) -
                          lAppNullOffset)),pLRSpaceItem->GetRight()));
@@ -2192,7 +2192,7 @@ void SvxRuler::ApplyMargins()
             lAppNullOffset += lLogicNullOffset - lOldNull;
         pULSpaceItem->SetLower(
             PixelVAdjust(
-                Max((long)0, pPagePosItem->GetHeight() -
+                std::max((long)0, pPagePosItem->GetHeight() -
                     pULSpaceItem->GetUpper() -
                     (ConvertVPosLogic(GetMargin2()) -
                      lAppNullOffset)),pULSpaceItem->GetLower()));
@@ -2688,8 +2688,8 @@ void SvxRuler::Click()
         sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
         if( bContentProtected ) return;
         const long lPos = GetClickPos();
-        if((bRTL && lPos < Min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
-            (!bRTL && lPos > Min(GetFirstLineIndent(), GetLeftIndent()) && lPos < GetRightIndent()))
+        if((bRTL && lPos < std::min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
+            (!bRTL && lPos > std::min(GetFirstLineIndent(), GetLeftIndent()) && lPos < GetRightIndent()))
         {
             //convert position in left-to-right text
             long nTabPos;
@@ -2758,13 +2758,13 @@ void SvxRuler::CalcMinMax()
                 if(bRTL)
                 {
                     nMaxRight = lNullPix - GetRightIndent() +
-                        Max(GetFirstLineIndent(), GetLeftIndent()) -
+                        std::max(GetFirstLineIndent(), GetLeftIndent()) -
                         lMinFrame;
                 }
                 else
                 {
                     nMaxRight = lNullPix + GetRightIndent() -
-                        Max(GetFirstLineIndent(), GetLeftIndent()) -
+                        std::max(GetFirstLineIndent(), GetLeftIndent()) -
                         lMinFrame;
                 }
             }
@@ -2806,22 +2806,22 @@ void SvxRuler::CalcMinMax()
                     {
                         if(bRTL)
                         {
-                            nMaxRight += Min(
+                            nMaxRight += std::min(
                                 pBorders[0].nPos,
-                                Max(GetFirstLineIndent(), GetLeftIndent()) - GetRightIndent());
+                                std::max(GetFirstLineIndent(), GetLeftIndent()) - GetRightIndent());
                         }
                         else
                         {
-                            nMaxRight += Min(
+                            nMaxRight += std::min(
                                 pBorders[0].nPos, GetRightIndent() -
-                                Max(GetFirstLineIndent(), GetLeftIndent()));
+                                std::max(GetFirstLineIndent(), GetLeftIndent()));
                         }
                     }
                     else if( pColumnItem->Count() > 1 )
                         nMaxRight += pBorders[0].nPos;
                     else
                         nMaxRight +=GetRightIndent() -
-                            Max(GetFirstLineIndent(), GetLeftIndent());
+                            std::max(GetFirstLineIndent(), GetLeftIndent());
                     // Do not drag the left table edge over the edge of the page
                     if(pLRSpaceItem&&pColumnItem->IsTable())
                     {
@@ -2846,13 +2846,13 @@ void SvxRuler::CalcMinMax()
             if(bRTL)
             {
                 nMaxLeft =  GetMargin2() + GetRightIndent() -
-                    Max(GetFirstLineIndent(),GetLeftIndent())  - GetMargin1()+
+                    std::max(GetFirstLineIndent(),GetLeftIndent())  - GetMargin1()+
                         lMinFrame + lNullPix;
             }
             else
             {
                 nMaxLeft =  GetMargin2() - GetRightIndent() +
-                    Max(GetFirstLineIndent(),GetLeftIndent())  - GetMargin1()+
+                    std::max(GetFirstLineIndent(),GetLeftIndent())  - GetMargin1()+
                         lMinFrame + lNullPix;
             }
         }
@@ -2891,13 +2891,13 @@ void SvxRuler::CalcMinMax()
                 if(bRTL)
                 {
                     nMaxLeft = lMinFrame + lNullPix + GetMargin2() +
-                        GetRightIndent() - Max(GetFirstLineIndent(),
+                        GetRightIndent() - std::max(GetFirstLineIndent(),
                                                GetLeftIndent());
                 }
                 else
                 {
                     nMaxLeft = lMinFrame + lNullPix + GetMargin2() -
-                        GetRightIndent() + Max(GetFirstLineIndent(),
+                        GetRightIndent() + std::max(GetFirstLineIndent(),
                                                GetLeftIndent());
                 }
             }
@@ -2907,7 +2907,7 @@ void SvxRuler::CalcMinMax()
                     lMinFrame + lNullPix +
                     pBorders[pColumnItem->Count()-2].nPos +
                     pBorders[pColumnItem->Count()-2].nWidth;
-                nMaxLeft=Max(nMaxLeft,nNewMaxLeft);
+                nMaxLeft=std::max(nMaxLeft,nNewMaxLeft);
             }
 
         }
@@ -2933,13 +2933,13 @@ void SvxRuler::CalcMinMax()
                     if(bRTL)
                     {
                         nMaxLeft += pBorders[nIdx].nPos +
-                            GetRightIndent() - Max(GetFirstLineIndent(),
+                            GetRightIndent() - std::max(GetFirstLineIndent(),
                                                    GetLeftIndent());
                     }
                     else
                     {
                         nMaxLeft += pBorders[nIdx].nPos -
-                            GetRightIndent() + Max(GetFirstLineIndent(),
+                            GetRightIndent() + std::max(GetFirstLineIndent(),
                                                    GetLeftIndent());
                     }
                     if(0 != nIdx)
@@ -3023,7 +3023,7 @@ void SvxRuler::CalcMinMax()
                             if(bRTL)
                             {
                                 nMaxLeft += pBorders[nIdx].nPos +
-                                    GetRightIndent() - Max(GetFirstLineIndent(),
+                                    GetRightIndent() - std::max(GetFirstLineIndent(),
                                                            GetLeftIndent());
                                 if(nActLeftCol!=USHRT_MAX)
                                     nMaxLeft -= pBorders[nActLeftCol].nPos +
@@ -3032,7 +3032,7 @@ void SvxRuler::CalcMinMax()
                             else
                             {
                                 nMaxLeft += pBorders[nIdx].nPos -
-                                    GetRightIndent() + Max(GetFirstLineIndent(),
+                                    GetRightIndent() + std::max(GetFirstLineIndent(),
                                                            GetLeftIndent());
                                 if(nActLeftCol!=USHRT_MAX)
                                     nMaxLeft -= pBorders[nActLeftCol].nPos +
@@ -3065,14 +3065,14 @@ void SvxRuler::CalcMinMax()
                                     {
                                         nMaxRight -=
                                             GetMargin2() + GetRightIndent() -
-                                                Max(GetFirstLineIndent(),
+                                                std::max(GetFirstLineIndent(),
                                                     GetLeftIndent());
                                     }
                                     else
                                     {
                                         nMaxRight -=
                                             GetMargin2() - GetRightIndent() +
-                                                Max(GetFirstLineIndent(),
+                                                std::max(GetFirstLineIndent(),
                                                     GetLeftIndent());
                                     }
                                     nMaxRight += pBorders[nIdx].nPos +
@@ -3094,13 +3094,13 @@ void SvxRuler::CalcMinMax()
                                     if(bRTL)
                                     {
                                         nMaxRight -= nBorder + GetRightIndent() -
-                                            Max(GetFirstLineIndent(),
+                                            std::max(GetFirstLineIndent(),
                                                 GetLeftIndent());
                                     }
                                     else
                                     {
                                         nMaxRight -= nBorder - GetRightIndent() +
-                                            Max(GetFirstLineIndent(),
+                                            std::max(GetFirstLineIndent(),
                                                 GetLeftIndent());
                                     }
                                     nMaxRight += pBorders[nIdx].nPos +
@@ -3139,7 +3139,7 @@ void SvxRuler::CalcMinMax()
                     if(pColumnItem->IsLastAct()) {
                         nMaxRight -=
                             GetMargin2() - GetRightIndent() +
-                                Max(GetFirstLineIndent(),
+                                std::max(GetFirstLineIndent(),
                                     GetLeftIndent());
                         nMaxRight += pBorders[nIdx].nPos +
                             pBorders[nIdx].nWidth;
@@ -3149,7 +3149,7 @@ void SvxRuler::CalcMinMax()
                     nMaxRight = lNullPix + pBorders[nIdx+1].nPos;
                     if(pColumnItem->GetActColumn()-1 == nIdx) {
                         nMaxRight -= pBorders[nIdx+1].nPos  - GetRightIndent() +
-                            Max(GetFirstLineIndent(),
+                            std::max(GetFirstLineIndent(),
                                 GetLeftIndent());
                         nMaxRight += pBorders[nIdx].nPos +
                             pBorders[nIdx].nWidth;
@@ -3217,7 +3217,7 @@ void SvxRuler::CalcMinMax()
                 if(bRTL)
                 {
                     nMaxLeft = lNullPix;
-                    nMaxRight = lNullPix + Min(GetFirstLineIndent(), GetLeftIndent()) - lMinFrame;
+                    nMaxRight = lNullPix + std::min(GetFirstLineIndent(), GetLeftIndent()) - lMinFrame;
                     if(pColumnItem)
                     {
                         sal_uInt16 nRightCol=GetActRightColumn( sal_True );
@@ -3233,7 +3233,7 @@ void SvxRuler::CalcMinMax()
                 else
                 {
                     nMaxLeft = lNullPix +
-                        Max(GetFirstLineIndent(), GetLeftIndent());
+                        std::max(GetFirstLineIndent(), GetLeftIndent());
                     nMaxRight = lNullPix;
                     if(pColumnItem)
                     {
@@ -3258,7 +3258,7 @@ void SvxRuler::CalcMinMax()
            right = NOf + RAR
            */
         nMaxLeft = bRTL ? lNullPix + GetRightIndent()
-                            : lNullPix + Min(GetFirstLineIndent(), GetLeftIndent());
+                            : lNullPix + std::min(GetFirstLineIndent(), GetLeftIndent());
         pRuler_Imp->lMaxRightLogic=GetLogicRightIndent()+lLogicNullOffset;
         nMaxRight = ConvertSizePixel(pRuler_Imp->lMaxRightLogic);
         break;
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 2dfdebe603a8..740fef4c738e 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -202,15 +202,15 @@ void SvxSwFrameExample::InitAllRects_Impl()
                 aFrmSize = Size(nLBorder - 3, (aTextLine.GetHeight() + 2) * 3);
                 break;
         }
-        aFrmSize.Width() = Max(5L, aFrmSize.Width());
-        aFrmSize.Height() = Max(5L, aFrmSize.Height());
+        aFrmSize.Width() = std::max(5L, aFrmSize.Width());
+        aFrmSize.Height() = std::max(5L, aFrmSize.Height());
     }
     else
     {
         sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(OUString(DEMOTEXT));
 
         aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3);
-        aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L)));
+        aDrawObj.SetSize(Size(std::max(5L, (long)nFreeWidth / 3L), std::max(5L, aFrmSize.Height() * 3L)));
         aDrawObj.SetPos(Point(aParaPrtArea.Right() + 1, aParaPrtArea.Bottom() / 2));
         aParaPrtArea.Right() = aDrawObj.Right();
     }
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index a34d4f3a6c7b..64bf73436454 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1888,7 +1888,7 @@ void DbGridControl::RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_B
     if (nDelta < nLimit && (nDelta > 0
         || (bCacheAligned && m_nTotalCount < 0)) )
         SeekCursor(nNewTopRow + nLinesOnScreen - 1, sal_False);
-    else if (nDelta < 0 && Abs(nDelta) < nLimit)
+    else if (nDelta < 0 && std::abs(nDelta) < nLimit)
         SeekCursor(nNewTopRow, sal_False);
     else if (nDelta != 0 || bUpdateCursor)
         SeekCursor(nNewTopRow, sal_True);
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 8ec224214b92..b523d22f36e7 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2245,8 +2245,8 @@ namespace svxform
         Window::Resize();
 
         Size aOutSz = GetOutputSizePixel();
-        long nWidth = Max( aOutSz.Width(), m_nMinWidth );
-        long nHeight = Max( aOutSz.Height(), m_nMinHeight );
+        long nWidth = std::max( aOutSz.Width(), m_nMinWidth );
+        long nHeight = std::max( aOutSz.Height(), m_nMinHeight );
 
         Size aSz = m_aModelsBox.GetSizePixel();
         aSz.Width() = nWidth - 3*m_a3Size.Width() - m_aModelBtn.GetSizePixel().Width();
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 273aca1f58c1..30b0a238241e 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -753,7 +753,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
                 {
                     const SfxInt32Item* pTypedItem = PTR_CAST( SfxInt32Item, pItem );
                     if ( pTypedItem )
-                        nRecord = Max( pTypedItem->GetValue(), sal_Int32(0) );
+                        nRecord = std::max( pTypedItem->GetValue(), sal_Int32(0) );
                 }
             }
             else
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 3a85aacdb586..e449a02e3e81 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -650,8 +650,8 @@ IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl)
         const Rectangle aThemesRect( mpThemes->GetPosPixel(), mpThemes->GetOutputSizePixel() );
         Point           aSelPos( mpThemes->GetBoundingRectangle( mpThemes->GetSelectEntryPos() ).Center() );
 
-        aSelPos.X() = Max( Min( aSelPos.X(), aThemesRect.Right() ), aThemesRect.Left() );
-        aSelPos.Y() = Max( Min( aSelPos.Y(), aThemesRect.Bottom() ), aThemesRect.Top() );
+        aSelPos.X() = std::max( std::min( aSelPos.X(), aThemesRect.Right() ), aThemesRect.Left() );
+        aSelPos.Y() = std::max( std::min( aSelPos.Y(), aThemesRect.Bottom() ), aThemesRect.Top() );
 
         aMenu.Execute( this, aSelPos );
     }
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 2a5a28416ea0..00b975236a65 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -869,8 +869,8 @@ sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point&
         }
     }
 
-    rSelPos.X() = Max( Min( rSelPos.X(), aOutputSizePixel.Width() - 1L ), 0L );
-    rSelPos.Y() = Max( Min( rSelPos.Y(), aOutputSizePixel.Height() - 1L ), 0L );
+    rSelPos.X() = std::max( std::min( rSelPos.X(), aOutputSizePixel.Width() - 1L ), 0L );
+    rSelPos.Y() = std::max( std::min( rSelPos.Y(), aOutputSizePixel.Height() - 1L ), 0L );
 
     if( nRet && ( !mpCurTheme || ( nRet > mpCurTheme->GetObjectCount() ) ) )
     {
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index c6cc85839a0c..848a230509c4 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -547,8 +547,8 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa
                         }
                     }
 
-                    aSize.Width() = Max( aSize.Width(), 4L );
-                    aSize.Height() = Max( aSize.Height(), 4L );
+                    aSize.Width() = std::max( aSize.Width(), 4L );
+                    aSize.Height() = std::max( aSize.Height(), 4L );
 
                     const Point aPos( ( ( aOutputRect.GetWidth() - aSize.Width() ) >> 1 ) + aOutputRect.Left(),
                                       ( ( aOutputRect.GetHeight() - aSize.Height() ) >> 1 ) + aOutputRect.Top() );
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index b22091e086db..5def7f04a440 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -438,7 +438,7 @@ GalleryProgress::~GalleryProgress()
 void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
 {
     if( mxProgressBar.is() && nMaxVal )
-        mxProgressBar->setValue( Min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
+        mxProgressBar->setValue( std::min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
 }
 
 // -----------------------
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 6ef09c95adbe..763790a15e48 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -98,8 +98,8 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
             else
             {
                 const float fFactor  = (float) aBmpSize.Width() / aBmpSize.Height();
-                const Size  aNewSize( Max( (long) (fFactor < 1. ? S_THUMB * fFactor : S_THUMB), 8L ),
-                                      Max( (long) (fFactor < 1. ? S_THUMB : S_THUMB / fFactor), 8L ) );
+                const Size  aNewSize( std::max( (long) (fFactor < 1. ? S_THUMB * fFactor : S_THUMB), 8L ),
+                                      std::max( (long) (fFactor < 1. ? S_THUMB : S_THUMB / fFactor), 8L ) );
 
                 if( aThumbBmp.Scale( (double) aNewSize.Width() / aBmpSize.Width(),
                                      (double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_BEST ) )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 44188f1f2d18..35bb9218d8fb 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1388,7 +1388,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
     delete pCompat;
 
     // Rest des Puffers auffuellen
-    const long  nRest = Max( 512L - ( (long) rOStm.Tell() - nReservePos ), 0L );
+    const long  nRest = std::max( 512L - ( (long) rOStm.Tell() - nReservePos ), 0L );
 
     if( nRest )
     {
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 0a1082f51fa3..05e709db15ba 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -308,7 +308,7 @@ namespace sdr
             aLocalGrafInfo.SetChannelG(((SdrGrafGreenItem&)rItemSet.Get(SDRATTR_GRAFGREEN)).GetValue());
             aLocalGrafInfo.SetChannelB(((SdrGrafBlueItem&)rItemSet.Get(SDRATTR_GRAFBLUE)).GetValue());
             aLocalGrafInfo.SetGamma(((SdrGrafGamma100Item&)rItemSet.Get(SDRATTR_GRAFGAMMA)).GetValue() * 0.01);
-            aLocalGrafInfo.SetTransparency((sal_uInt8)::basegfx::fround(Min(nTrans, (sal_uInt16)100) * 2.55));
+            aLocalGrafInfo.SetTransparency((sal_uInt8)::basegfx::fround(std::min(nTrans, (sal_uInt16)100) * 2.55));
             aLocalGrafInfo.SetInvert(((SdrGrafInvertItem&)rItemSet.Get(SDRATTR_GRAFINVERT)).GetValue());
             aLocalGrafInfo.SetDrawMode(((SdrGrafModeItem&)rItemSet.Get(SDRATTR_GRAFMODE)).GetValue());
             aLocalGrafInfo.SetCrop(rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom());
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 18c33eaf92fa..94e2777fdf59 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -99,7 +99,7 @@ sal_uInt16 SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
           ++aSnappingPointIter )
     {
         const long nCurrent = *aSnappingPointIter;
-        if ( Abs(nCurrent - nOffset) < nSnappingEpsilon )
+        if ( std::abs(nCurrent - nOffset) < nSnappingEpsilon )
         {
             nOffset = nCurrent;
             nRet = mpImpl->maSnappingPointZooms[ nCount ];
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 8fdc6b8581e3..d79d5f2add25 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1550,7 +1550,7 @@ void SdrDragMove::ImpCheckSnap(const Point& rPt)
     {
         if (bXSnapped)
         {
-            if (Abs(aPt.X())<Abs(nBestXSnap))
+            if (std::abs(aPt.X())<std::abs(nBestXSnap))
             {
                 nBestXSnap=aPt.X();
             }
@@ -1566,7 +1566,7 @@ void SdrDragMove::ImpCheckSnap(const Point& rPt)
     {
         if (bYSnapped)
         {
-            if (Abs(aPt.Y())<Abs(nBestYSnap))
+            if (std::abs(aPt.Y())<std::abs(nBestYSnap))
             {
                 nBestYSnap=aPt.Y();
             }
@@ -1780,8 +1780,8 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const
     if(!nYDiv)
         nYDiv = 1;
 
-    bool bX(aXFact != aFact1 && Abs(nXDiv) > 1);
-    bool bY(aYFact != aFact1 && Abs(nYDiv) > 1);
+    bool bX(aXFact != aFact1 && std::abs(nXDiv) > 1);
+    bool bY(aYFact != aFact1 && std::abs(nYDiv) > 1);
 
     if(bX || bY)
     {
@@ -1961,7 +1961,7 @@ void SdrDragResize::MoveSdrDrag(const Point& rNoSnapPnt)
 
     if (!DragStat().IsHorFixed() && !DragStat().IsVerFixed())
     {
-        if (Abs(nXDiv)<=1 || Abs(nYDiv)<=1)
+        if (std::abs(nXDiv)<=1 || std::abs(nYDiv)<=1)
             bOrtho=false;
 
         if (bOrtho)
@@ -2545,7 +2545,7 @@ void SdrDragMirror::TakeSdrDragComment(XubString& rStr) const
         ImpTakeDescriptionStr(STR_DragMethMirrorHori,rStr);
     else if (aDif.Y()==0)
         ImpTakeDescriptionStr(STR_DragMethMirrorVert,rStr);
-    else if (Abs(aDif.X())==Abs(aDif.Y()))
+    else if (std::abs(aDif.X()) == std::abs(aDif.Y()))
         ImpTakeDescriptionStr(STR_DragMethMirrorDiag,rStr);
     else
         ImpTakeDescriptionStr(STR_DragMethMirrorFree,rStr);
@@ -2567,7 +2567,7 @@ bool SdrDragMirror::BeginSdrDrag()
         Ref2()=pH2->GetPos();
         aDif=pH2->GetPos()-pH1->GetPos();
         bool b90=(aDif.X()==0) || aDif.Y()==0;
-        bool b45=b90 || (Abs(aDif.X())==Abs(aDif.Y()));
+        bool b45=b90 || (std::abs(aDif.X()) == std::abs(aDif.Y()));
         nWink=NormAngle360(GetAngle(aDif));
 
         if (!getSdrDragView().IsMirrorAllowed(false,false) && !b45)
@@ -2842,7 +2842,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const
         if(bAtCenter)
             nVal *= 2;
 
-        nVal = Abs(nVal);
+        nVal = std::abs(nVal);
         OUString aStr;
         getSdrDragView().GetModel()->TakeWinkStr(nVal, aStr);
         rStr.Append(aStr);
@@ -3185,9 +3185,9 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
         if (bValid)
         {
             if (bVertical)
-                bValid=Abs(dx1)*100>Abs(dy1);
+                bValid = std::abs(dx1)*100>std::abs(dy1);
             else
-                bValid=Abs(dy1)*100>Abs(dx1);
+                bValid = std::abs(dy1)*100>std::abs(dx1);
         }
 
         long nNeuRad=0;
@@ -3235,10 +3235,10 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
                 if (nNeuRad<0) nPntWink+=18000;
                 if (bVertical) nPntWink=18000-nPntWink;
                 nPntWink=NormAngle180(nPntWink);
-                nPntWink=Abs(nPntWink);
+                nPntWink = std::abs(nPntWink);
             }
 
-            double nUmfang=2*Abs(nNeuRad)*nPi;
+            double nUmfang = 2 * std::abs(nNeuRad)*nPi;
 
             if (bResize)
             {
@@ -3311,7 +3311,7 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
             if (bAtCenter)
             {
                 nMul*=2;
-                nMul=Abs(nMul);
+                nMul = std::abs(nMul);
             }
 
             aNeuFact=Fraction(nMul,nDiv);
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 9a0528cf9318..fcf7dd7ea49d 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -316,7 +316,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
         Point aDif(rRef2-rRef1);
         if (aDif.X()==0) ImpTakeDescriptionStr(STR_EditMirrorHori,aStr);
         else if (aDif.Y()==0) ImpTakeDescriptionStr(STR_EditMirrorVert,aStr);
-        else if (Abs(aDif.X())==Abs(aDif.Y())) ImpTakeDescriptionStr(STR_EditMirrorDiag,aStr);
+        else if (std::abs(aDif.X()) == std::abs(aDif.Y())) ImpTakeDescriptionStr(STR_EditMirrorDiag,aStr);
         else ImpTakeDescriptionStr(STR_EditMirrorFree,aStr);
         if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
         BegUndo(aStr);
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 67e5914d4829..75a3c79e38a7 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -248,7 +248,7 @@ void _SdrItemBrowserControl::ImpCtor()
     InsertDataColumn(
         ITEMBROWSER_STATECOL_ID,
         String("State", aTextEncoding),
-        Max(GetTextWidth(String(" State ", aTextEncoding)) + 2 ,
+        std::max(GetTextWidth(String(" State ", aTextEncoding)) + 2 ,
             GetTextWidth(String("DontCare", aTextEncoding)) + 2));
     InsertDataColumn(
         ITEMBROWSER_TYPECOL_ID ,
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ab050d847b41..312c9c605fe7 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1738,7 +1738,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
     // get the drawing pages
     if (bInsPages) {
         sal_uInt16 nSourcePos=nFirstPageNum;
-        sal_uInt16 nMergeCount=sal_uInt16(Abs((long)((long)nFirstPageNum-nLastPageNum))+1);
+        sal_uInt16 nMergeCount=sal_uInt16(std::abs((long)((long)nFirstPageNum-nLastPageNum))+1);
         if (nDestPos>GetPageCount()) nDestPos=GetPageCount();
         while (nMergeCount>0) {
             SdrPage* pPg=NULL;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 5a5f53669f4a..8385b07bb70a 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1288,10 +1288,10 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const
         long nYDiv=nHgt0;
         bool bXNeg=(nXMul<0)!=(nXDiv<0);
         bool bYNeg=(nYMul<0)!=(nYDiv<0);
-        nXMul=Abs(nXMul);
-        nYMul=Abs(nYMul);
-        nXDiv=Abs(nXDiv);
-        nYDiv=Abs(nYDiv);
+        nXMul=std::abs(nXMul);
+        nYMul=std::abs(nYMul);
+        nXDiv=std::abs(nXDiv);
+        nYDiv=std::abs(nYDiv);
         Fraction aXFact(nXMul,nXDiv); // fractions for canceling
         Fraction aYFact(nYMul,nYDiv); // and for comparing
         nXMul=aXFact.GetNumerator();
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index fec1d31f55ff..9390388327b8 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -64,7 +64,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink)
         if (nWdt>nHgt) {
             if (nWdt!=0) {
                 // stop possible overruns for very large objects
-                if (Abs(nHgt)>32767 || Abs(aRetval.Y())>32767) {
+                if (std::abs(nHgt)>32767 || std::abs(aRetval.Y())>32767) {
                     aRetval.Y()=BigMulDiv(aRetval.Y(),nHgt,nWdt);
                 } else {
                     aRetval.Y()=aRetval.Y()*nHgt/nWdt;
@@ -73,7 +73,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink)
         } else {
             if (nHgt!=0) {
                 // stop possible overruns for very large objects
-                if (Abs(nWdt)>32767 || Abs(aRetval.X())>32767) {
+                if (std::abs(nWdt)>32767 || std::abs(aRetval.X())>32767) {
                     aRetval.X()=BigMulDiv(aRetval.X(),nWdt,nHgt);
                 } else {
                     aRetval.X()=aRetval.X()*nWdt/nHgt;
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 617ea4361088..c4a176314367 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -589,11 +589,11 @@ sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
     long dyo=rPt.Y()-aR.Top();
     long dxr=aR.Right()-rPt.X();
     long dyu=aR.Bottom()-rPt.Y();
-    bool bxMitt=Abs(dxl-dxr)<2;
-    bool byMitt=Abs(dyo-dyu)<2;
-    long dx=Min(dxl,dxr);
-    long dy=Min(dyo,dyu);
-    bool bDiag=Abs(dx-dy)<2;
+    bool bxMitt=std::abs(dxl-dxr)<2;
+    bool byMitt=std::abs(dyo-dyu)<2;
+    long dx=std::min(dxl,dxr);
+    long dy=std::min(dyo,dyu);
+    bool bDiag=std::abs(dx-dy)<2;
     if (bxMitt && byMitt) return SDRESC_ALL; // in the center
     if (bDiag) {  // diagonally
         sal_uInt16 nRet=0;
@@ -844,7 +844,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         aXP[0]=rPt1;
         aXP[1]=rPt2;
         if (pnQuality!=NULL) {
-            *pnQuality=Abs(rPt1.X()-rPt2.X())+Abs(rPt1.Y()-rPt2.Y());
+            *pnQuality=std::abs(rPt1.X()-rPt2.X())+std::abs(rPt1.Y()-rPt2.Y());
         }
         return aXP;
     } else if (eKind==SDREDGE_THREELINES) {
@@ -862,9 +862,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         if (bLks2) aXP[2].X()=aBewareRect2.Left();   //-=500;
         if (bUnt2) aXP[2].Y()=aBewareRect2.Bottom(); //+=500;
         if (pnQuality!=NULL) {
-            long nQ=Abs(aXP[1].X()-aXP[0].X())+Abs(aXP[1].Y()-aXP[0].Y());
-                nQ+=Abs(aXP[2].X()-aXP[1].X())+Abs(aXP[2].Y()-aXP[1].Y());
-                nQ+=Abs(aXP[3].X()-aXP[2].X())+Abs(aXP[3].Y()-aXP[2].Y());
+            long nQ=std::abs(aXP[1].X()-aXP[0].X())+std::abs(aXP[1].Y()-aXP[0].Y());
+                nQ+=std::abs(aXP[2].X()-aXP[1].X())+std::abs(aXP[2].Y()-aXP[1].Y());
+                nQ+=std::abs(aXP[3].X()-aXP[2].X())+std::abs(aXP[3].Y()-aXP[2].Y());
             *pnQuality=nQ;
         }
         if (bInfo) {
@@ -889,8 +889,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         Point aC2(aBewareRect2.Center());
         if (aBewareRect1.Left()<=aBewareRect2.Right() && aBewareRect1.Right()>=aBewareRect2.Left()) {
             // overlapping on the x axis
-            long n1=Max(aBewareRect1.Left(),aBewareRect2.Left());
-            long n2=Min(aBewareRect1.Right(),aBewareRect2.Right());
+            long n1=std::max(aBewareRect1.Left(),aBewareRect2.Left());
+            long n2=std::min(aBewareRect1.Right(),aBewareRect2.Right());
             aMeeting.X()=(n1+n2+1)/2;
         } else {
             // otherwise the center point of the empty space
@@ -902,8 +902,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         }
         if (aBewareRect1.Top()<=aBewareRect2.Bottom() && aBewareRect1.Bottom()>=aBewareRect2.Top()) {
             // overlapping on the x axis
-            long n1=Max(aBewareRect1.Top(),aBewareRect2.Top());
-            long n2=Min(aBewareRect1.Bottom(),aBewareRect2.Bottom());
+            long n1=std::max(aBewareRect1.Top(),aBewareRect2.Top());
+            long n2=std::min(aBewareRect1.Bottom(),aBewareRect2.Bottom());
             aMeeting.Y()=(n1+n2+1)/2;
         } else {
             // otherwise the center point of the empty space
@@ -917,10 +917,10 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         //   1. both go into the same direction
         //   2. both go into opposite directions
         //   3. one is vertical, the other is horizontal
-        long nXMin=Min(aBewareRect1.Left(),aBewareRect2.Left());
-        long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right());
-        long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top());
-        long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom());
+        long nXMin=std::min(aBewareRect1.Left(),aBewareRect2.Left());
+        long nXMax=std::max(aBewareRect1.Right(),aBewareRect2.Right());
+        long nYMin=std::min(aBewareRect1.Top(),aBewareRect2.Top());
+        long nYMax=std::max(aBewareRect1.Bottom(),aBewareRect2.Bottom());
         bool bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
                             aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom();
         unsigned nMainCase=3;
@@ -1016,7 +1016,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                             }
                         }
                         if (!bCase29Direct) {
-                            bool bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y());
+                            bool bObenLang=std::abs(nYMin-aMeeting.Y())<=std::abs(nYMax-aMeeting.Y());
                             if (bObenLang) {
                                 aMeeting.Y()=nYMin;
                             } else {
@@ -1077,7 +1077,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                             }
                         }
                         if (!bCase29Direct) {
-                            bool bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X());
+                            bool bLinksLang=std::abs(nXMin-aMeeting.X())<=std::abs(nXMax-aMeeting.X());
                             if (bLinksLang) {
                                 aMeeting.X()=nXMin;
                             } else {
@@ -1299,7 +1299,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         Point aPt0(aXP1[0]);
         for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
             Point aPt1b(aXP1[nPntNum]);
-            nQual+=Abs(aPt1b.X()-aPt0.X())+Abs(aPt1b.Y()-aPt0.Y());
+            nQual+=std::abs(aPt1b.X()-aPt0.X())+std::abs(aPt1b.Y()-aPt0.Y());
             if (nQual<nQual0) bOverflow = true;
             nQual0=nQual;
             aPt0=aPt1b;
@@ -1308,9 +1308,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
         sal_uInt16 nTmp=nPntAnz;
         if (cForm=='Z') {
             nTmp=2; // Z shape with good quality (nTmp=2 instead of 4)
-            sal_uIntPtr n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y());
-            sal_uIntPtr n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y());
-            sal_uIntPtr n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y());
+            sal_uIntPtr n1=std::abs(aXP1[1].X()-aXP1[0].X())+std::abs(aXP1[1].Y()-aXP1[0].Y());
+            sal_uIntPtr n2=std::abs(aXP1[2].X()-aXP1[1].X())+std::abs(aXP1[2].Y()-aXP1[1].Y());
+            sal_uIntPtr n3=std::abs(aXP1[3].X()-aXP1[2].X())+std::abs(aXP1[3].Y()-aXP1[2].Y());
             // try to make lines lengths similar
             sal_uIntPtr nBesser=0;
             n1+=n3;
@@ -2163,7 +2163,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
                     if (bOk && aMouseRect.IsInside(aConPos)) {
                         if (bUser) bUserFnd = true;
                         bFnd = true;
-                        sal_uIntPtr nDist=(sal_uIntPtr)Abs(aConPos.X()-rPt.X())+(sal_uIntPtr)Abs(aConPos.Y()-rPt.Y());
+                        sal_uIntPtr nDist=(sal_uIntPtr)std::abs(aConPos.X()-rPt.X())+(sal_uIntPtr)std::abs(aConPos.Y()-rPt.Y());
                         if (nDist<nBestDist) {
                             nBestDist=nDist;
                             aTestCon.pObj=pObj;
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index a0041ee8de1a..46b88dae7de3 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1220,7 +1220,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo()
     aGrafInfo.SetChannelG( ( (SdrGrafGreenItem&) rSet.Get( SDRATTR_GRAFGREEN ) ).GetValue() );
     aGrafInfo.SetChannelB( ( (SdrGrafBlueItem&) rSet.Get( SDRATTR_GRAFBLUE ) ).GetValue() );
     aGrafInfo.SetGamma( ( (SdrGrafGamma100Item&) rSet.Get( SDRATTR_GRAFGAMMA ) ).GetValue() * 0.01 );
-    aGrafInfo.SetTransparency( (sal_uInt8) FRound( Min( nTrans, (sal_uInt16) 100 )  * 2.55 ) );
+    aGrafInfo.SetTransparency( (sal_uInt8) FRound( std::min( nTrans, (sal_uInt16) 100 )  * 2.55 ) );
     aGrafInfo.SetInvert( ( (SdrGrafInvertItem&) rSet.Get( SDRATTR_GRAFINVERT ) ).GetValue() );
     aGrafInfo.SetDrawMode( ( (SdrGrafModeItem&) rSet.Get( SDRATTR_GRAFMODE ) ).GetValue() );
     aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() );
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 3f3288de38fa..f416ceae9311 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -308,7 +308,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi
     if (bRet) {
         double cs=cos(nTmpAngle*nPi180);
         double nR=(double)GetLen(Point(dx,dy))/cs/2;
-        nRad=Abs(Round(nR));
+        nRad=std::abs(Round(nR));
     }
     if (dAngle<18000) {
         nCircStWink=NormAngle360(nTangAngle-9000);
@@ -335,7 +335,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi
         }
     }
     nCircRadius=nRad;
-    if (nRad==0 || Abs(nCircRelWink)<5) bRet=sal_False;
+    if (nRad==0 || std::abs(nCircRelWink)<5) bRet=sal_False;
     bCircle=bRet;
     return bRet;
 }
@@ -376,8 +376,8 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr
     else {
         x1=BigMulDiv(y,nDirX,nDirY);
         y2=BigMulDiv(x,nDirY,nDirX);
-        long l1=Abs(x1)+Abs(y1);
-        long l2=Abs(x2)+Abs(y2);
+        long l1=std::abs(x1)+std::abs(y1);
+        long l2=std::abs(x2)+std::abs(y2);
         if ((l1<=l2) != (pView!=NULL && pView->IsBigOrtho())) {
             x=x1; y=y1;
         } else {
@@ -396,8 +396,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point
     Point aTmpPt(rP2-rP1);
     long nDirX=rDir.X();
     long nDirY=rDir.Y();
-    Point aP1(CalcLine(aTmpPt, nDirX, nDirY,pView)); aP1-=aTmpPt; long nQ1=Abs(aP1.X())+Abs(aP1.Y());
-    Point aP2(CalcLine(aTmpPt, nDirY,-nDirX,pView)); aP2-=aTmpPt; long nQ2=Abs(aP2.X())+Abs(aP2.Y());
+    Point aP1(CalcLine(aTmpPt, nDirX, nDirY,pView)); aP1-=aTmpPt; long nQ1=std::abs(aP1.X())+std::abs(aP1.Y());
+    Point aP2(CalcLine(aTmpPt, nDirY,-nDirX,pView)); aP2-=aTmpPt; long nQ2=std::abs(aP2.X())+std::abs(aP2.Y());
     if (pView!=NULL && pView->IsOrtho()) nQ1=0; // Ortho turns off at right angle
     bLine90=nQ1>2*nQ2;
     if (!bLine90) { // smooth transition
@@ -447,10 +447,10 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point
     aRectP2.X()+=x;
     aRectP2.Y()+=y;
     if (pView!=NULL && pView->IsOrtho()) {
-        long dx1=aRectP2.X()-aRectP1.X(); long dx1a=Abs(dx1);
-        long dy1=aRectP2.Y()-aRectP1.Y(); long dy1a=Abs(dy1);
-        long dx2=aRectP3.X()-aRectP2.X(); long dx2a=Abs(dx2);
-        long dy2=aRectP3.Y()-aRectP2.Y(); long dy2a=Abs(dy2);
+        long dx1=aRectP2.X()-aRectP1.X(); long dx1a=std::abs(dx1);
+        long dy1=aRectP2.Y()-aRectP1.Y(); long dy1a=std::abs(dy1);
+        long dx2=aRectP3.X()-aRectP2.X(); long dx2a=std::abs(dx2);
+        long dy2=aRectP3.Y()-aRectP2.Y(); long dy2a=std::abs(dy2);
         bool b1MoreThan2=dx1a+dy1a>dx2a+dy2a;
         if (b1MoreThan2 != pView->IsBigOrtho()) {
             long xtemp=dy2a-dx1a; if (dx1<0) xtemp=-xtemp;
@@ -741,7 +741,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
             aPt-=mpSdrPathDragData->aXP[nPrevPnt];
             long nWink2=GetAngle(aPt);
             long nDiff=nWink1-nWink2;
-            nDiff=Abs(nDiff);
+            nDiff=std::abs(nDiff);
             mpSdrPathDragData->bEliminate=nDiff<=rDrag.GetView()->GetEliminatePolyPointLimitAngle();
             if (mpSdrPathDragData->bEliminate) { // adapt position, Smooth is true for the ends
                 aPt=mpSdrPathDragData->aXP[nNextPnt];
@@ -938,7 +938,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
 
         if(pU->bCircle)
         {
-            mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr);
+            mrSdrPathObject.GetModel()->TakeWinkStr(std::abs(pU->nCircRelWink), aMetr);
             aStr.Append(aMetr);
             aStr.AppendAscii(" r=");
             mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True);
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 3e2e1d094ecf..da2d9fe77021 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -326,7 +326,7 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const
         case 1:
         {
             long a = GetEckenradius();
-            long b = Max(aRect.GetWidth(),aRect.GetHeight())/2; // rounded up, because GetWidth() adds 1
+            long b = std::max(aRect.GetWidth(),aRect.GetHeight())/2; // rounded up, because GetWidth() adds 1
             if (a>b) a=b;
             if (a<0) a=0;
             aPnt=aRect.TopLeft();
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 1863dd8e8a2e..20551221b7d1 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -945,7 +945,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
             // correct stretching factors
             long nMul=nWantWdt;
             long nDiv=aSiz.Width();
-            if (Abs(nXDiff)<=2*nXKorr) {
+            if (std::abs(nXDiff)<=2*nXKorr) {
                 if (nMul>nDiv) nDiv+=(nMul-nDiv)/2; // but only add half of what we calculated,
                 else nMul+=(nDiv-nMul)/2;           // because the EditEngine calculates wrongly later on
             }
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 1402a426879b..27d033d34750 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -100,10 +100,10 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const
         long nYDiv=nHgt0;
         bool bXNeg=(nXMul<0)!=(nXDiv<0);
         bool bYNeg=(nYMul<0)!=(nYDiv<0);
-        nXMul=Abs(nXMul);
-        nYMul=Abs(nYMul);
-        nXDiv=Abs(nXDiv);
-        nYDiv=Abs(nYDiv);
+        nXMul=std::abs(nXMul);
+        nYMul=std::abs(nYMul);
+        nXDiv=std::abs(nXDiv);
+        nYDiv=std::abs(nYDiv);
         Fraction aXFact(nXMul,nXDiv); // fractions for canceling
         Fraction aYFact(nYMul,nYDiv); // and for comparing
         nXMul=aXFact.GetNumerator();
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 60706a297ec4..b19615434714 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -249,7 +249,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
     bool bRota90Merk = false;
     if (bNoShearMerk &&
         (rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() ||
-         Abs(rRef1.X()-rRef2.X())==Abs(rRef1.Y()-rRef2.Y()))) {
+         std::abs(rRef1.X()-rRef2.X())==std::abs(rRef1.Y()-rRef2.Y()))) {
         bRota90Merk=aGeo.nDrehWink % 9000 ==0;
     }
     Polygon aPol(Rect2Poly(aRect,aGeo));
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 63120c7dc4db..65337d25a116 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -308,18 +308,18 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
             switch (rHL.GetKind()) {
                 case SDRHELPLINE_VERTICAL: {
                     long a=x-rPos.X();
-                    if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; }
+                    if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; }
                 } break;
                 case SDRHELPLINE_HORIZONTAL: {
                     long b=y-rPos.Y();
-                    if (Abs(b)<=my) { dy1=-b; if (Abs(dy1)<Abs(dy)) dy=dy1; }
+                    if (std::abs(b)<=my) { dy1=-b; if (std::abs(dy1)<std::abs(dy)) dy=dy1; }
                 } break;
                 case SDRHELPLINE_POINT: {
                     long a=x-rPos.X();
                     long b=y-rPos.Y();
-                    if (Abs(a)<=mx && Abs(b)<=my) {
+                    if (std::abs(a)<=mx && std::abs(b)<=my) {
                         dx1=-a; dy1=-b;
-                        if (Abs(dx1)<Abs(dx) && Abs(dy1)<Abs(dy)) { dx=dx1; dy=dy1; }
+                        if (std::abs(dx1)<std::abs(dx) && std::abs(dy1)<std::abs(dy)) { dx=dx1; dy=dy1; }
                     }
                 } break;
             } // switch
@@ -334,14 +334,14 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
         long upp=pPage->GetUppBorder();
         long lwr=pPage->GetLwrBorder();
         long a;
-        a=x- lft    ; if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } // left margin
-        a=x-(xs-rgt); if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } // right margin
-        a=x         ; if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } // left edge of paper
-        a=x- xs     ; if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } // right edge of paper
-        a=y- upp    ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // left margin
-        a=y-(ys-lwr); if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // right margin
-        a=y         ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // left edge of paper
-        a=y- ys     ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // right edge of paper
+        a=x- lft    ; if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // left margin
+        a=x-(xs-rgt); if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // right margin
+        a=x         ; if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // left edge of paper
+        a=x- xs     ; if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // right edge of paper
+        a=y- upp    ; if (std::abs(a)<=my) { dy1=-a; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } // left margin
+        a=y-(ys-lwr); if (std::abs(a)<=my) { dy1=-a; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } // right margin
+        a=y         ; if (std::abs(a)<=my) { dy1=-a; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } // left edge of paper
+        a=y- ys     ; if (std::abs(a)<=my) { dy1=-a; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } // right edge of paper
     }
     if (bOFrmSnap || bOPntSnap) {
         sal_uIntPtr nMaxPointSnapCount=200;
@@ -366,7 +366,7 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
                         Point aP(pO->GetSnapPoint(i));
                         dx1=x-aP.X();
                         dy1=y-aP.Y();
-                        if (Abs(dx1)<=mx && Abs(dy1)<=my && Abs(dx1)<Abs(dx) && Abs(dy1)<Abs(dy)) {
+                        if (std::abs(dx1)<=mx && std::abs(dy1)<=my && std::abs(dx1)<std::abs(dx) && std::abs(dy1)<std::abs(dy)) {
                             dx=-dx1;
                             dy=-dy1;
                         }
@@ -381,10 +381,10 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
                     aR1.Top   ()-=my;
                     aR1.Bottom()+=my;
                     if (aR1.IsInside(rPnt)) {
-                        if (Abs(x-aLog.Left  ())<=mx) { dx1=-(x-aLog.Left  ()); if (Abs(dx1)<Abs(dx)) dx=dx1; }
-                        if (Abs(x-aLog.Right ())<=mx) { dx1=-(x-aLog.Right ()); if (Abs(dx1)<Abs(dx)) dx=dx1; }
-                        if (Abs(y-aLog.Top   ())<=my) { dy1=-(y-aLog.Top   ()); if (Abs(dy1)<Abs(dy)) dy=dy1; }
-                        if (Abs(y-aLog.Bottom())<=my) { dy1=-(y-aLog.Bottom()); if (Abs(dy1)<Abs(dy)) dy=dy1; }
+                        if (std::abs(x-aLog.Left  ())<=mx) { dx1=-(x-aLog.Left  ()); if (std::abs(dx1)<std::abs(dx)) dx=dx1; }
+                        if (std::abs(x-aLog.Right ())<=mx) { dx1=-(x-aLog.Right ()); if (std::abs(dx1)<std::abs(dx)) dx=dx1; }
+                        if (std::abs(y-aLog.Top   ())<=my) { dy1=-(y-aLog.Top   ()); if (std::abs(dy1)<std::abs(dy)) dy=dy1; }
+                        if (std::abs(y-aLog.Bottom())<=my) { dy1=-(y-aLog.Bottom()); if (std::abs(dy1)<std::abs(dy)) dy=dy1; }
                     }
                     nMaxFrameSnapCount--;
                 }
@@ -439,7 +439,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
     aPt-=rPt;
     if ((nRet & SDRSNAP_XSNAPPED) !=0) {
         if (bXSnapped) {
-            if (Abs(aPt.X())<Abs(nBestXSnap)) {
+            if (std::abs(aPt.X())<std::abs(nBestXSnap)) {
                 nBestXSnap=aPt.X();
             }
         } else {
@@ -449,7 +449,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
     }
     if ((nRet & SDRSNAP_YSNAPPED) !=0) {
         if (bYSnapped) {
-            if (Abs(aPt.Y())<Abs(nBestYSnap)) {
+            if (std::abs(aPt.Y())<std::abs(nBestYSnap)) {
                 nBestYSnap=aPt.Y();
             }
         } else {
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index eadaa82d9b6d..91e3f77a2f18 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -443,8 +443,8 @@ sal_uInt16 GetAngleSector(long nWink)
 
 long GetLen(const Point& rPnt)
 {
-    long x=Abs(rPnt.X());
-    long y=Abs(rPnt.Y());
+    long x=std::abs(rPnt.X());
+    long y=std::abs(rPnt.Y());
     if (x+y<0x8000) { // because 7FFF * 7FFF * 2 = 7FFE0002
         x*=x;
         y*=y;
@@ -552,8 +552,8 @@ void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho)
 {
     long dx=rPt.X()-rPt0.X();
     long dy=rPt.Y()-rPt0.Y();
-    long dxa=Abs(dx);
-    long dya=Abs(dy);
+    long dxa=std::abs(dx);
+    long dya=std::abs(dy);
     if (dx==0 || dy==0 || dxa==dya) return;
     if (dxa>=dya*2) { rPt.Y()=rPt0.Y(); return; }
     if (dya>=dxa*2) { rPt.X()=rPt0.X(); return; }
@@ -568,8 +568,8 @@ void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho)
 {
     long dx=rPt.X()-rPt0.X();
     long dy=rPt.Y()-rPt0.Y();
-    long dxa=Abs(dx);
-    long dya=Abs(dy);
+    long dxa=std::abs(dx);
+    long dya=std::abs(dy);
     if ((dxa<dya) != bBigOrtho) {
         rPt.Y()=rPt0.Y()+(dxa* (dy>=0 ? 1 : -1) );
     } else {
@@ -617,7 +617,7 @@ void Kuerzen(Fraction& rF, unsigned nDigits)
     // count how many decimal places can be removed
     int nMulWeg=nMulDigits-nDigits; if (nMulWeg<0) nMulWeg=0;
     int nDivWeg=nDivDigits-nDigits; if (nDivWeg<0) nDivWeg=0;
-    int nWeg=Min(nMulWeg,nDivWeg);
+    int nWeg=std::min(nMulWeg,nDivWeg);
     nMul>>=nWeg;
     nDiv>>=nWeg;
     if (nMul==0 || nDiv==0) {
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index c8e7d176fc68..65616bd8d0c0 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1099,7 +1099,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
                     if (pH1!=NULL && pH2!=NULL) {
                         aDif=pH2->GetPos()-pH1->GetPos();
                         b90=(aDif.X()==0) || aDif.Y()==0;
-                        b45=b90 || (Abs(aDif.X())==Abs(aDif.Y()));
+                        b45=b90 || (std::abs(aDif.X())==std::abs(aDif.Y()));
                     }
                     bool bNo=false;
                     if (!IsMirrorAllowed(sal_True,sal_True)) bNo=true; // any mirroring is forbidden
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index ac1fb637b6ac..7dd6574fd01f 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -522,7 +522,7 @@ FillControl::FillControl( Window* pParent, WinBits nStyle ) :
     Point aAttrPnt = pLbFillAttr->GetPosPixel();
     SetSizePixel(
         Size( aAttrPnt.X() + aAttrSize.Width(),
-              Max( aAttrSize.Height(), aTypeSize.Height() ) ) );
+              std::max( aAttrSize.Height(), aTypeSize.Height() ) ) );
 
     pLbFillType->SetSelectHdl( LINK( this, FillControl, SelectFillTypeHdl ) );
     pLbFillAttr->SetSelectHdl( LINK( this, FillControl, SelectFillAttrHdl ) );
@@ -822,7 +822,7 @@ void FillControl::DataChanged( const DataChangedEvent& rDCEvt )
 
         SetSizePixel(
             Size( aAttrPnt.X() + aAttrSize.Width(),
-                Max( aAttrSize.Height(), aTypeSize.Height() ) ) );
+                std::max( aAttrSize.Height(), aTypeSize.Height() ) ) );
     }
     Window::DataChanged( rDCEvt );
 }
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index bd21a7a656bd..58c7dd1cd7ba 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -291,7 +291,7 @@ ImplGrafControl::ImplGrafControl(
     maImage.SetPosPixel( Point( nOffset, nImgY ) );
     maField.SetPosPixel( Point( aImgSize.Width() + SYMBOL_TO_FIELD_OFFSET, nFldY ) );
     SetSizePixel( Size( aImgSize.Width() + aFldSize.Width() + SYMBOL_TO_FIELD_OFFSET + nOffset,
-                  Max( aImgSize.Height(), aFldSize.Height() ) ) );
+                  std::max( aImgSize.Height(), aFldSize.Height() ) ) );
 
     SetBackground( Wallpaper() ); // transparent background
 
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 9ec8f635d928..b5fa71776b22 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -533,7 +533,7 @@ void SvxLineEndWindow::FillValueSet()
             aLineEndSet.InsertItem( (sal_uInt16)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() );
             aLineEndSet.InsertItem( (sal_uInt16)((i+2L)*2L),    aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() );
         }
-        nLines = Min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES );
+        nLines = std::min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES );
         aLineEndSet.SetLineCount( nLines );
 
         SetSize();
@@ -582,14 +582,14 @@ void SvxLineEndWindow::Resizing( Size& rNewSize )
     // Spalten ermitteln
     long nItemW = aItemSize.Width();
     long nW = rNewSize.Width();
-    nCols = (sal_uInt16) Max( ( (sal_uIntPtr)(( nW + nItemW ) / ( nItemW * 2 ) )),
+    nCols = (sal_uInt16) std::max( ( (sal_uIntPtr)(( nW + nItemW ) / ( nItemW * 2 ) )),
                                             (sal_uIntPtr) 1L );
     nCols *= 2;
 
     // Reihen ermitteln
     long nItemH = aItemSize.Height();
     long nH = rNewSize.Height();
-    nLines = (sal_uInt16) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L );
+    nLines = (sal_uInt16) std::max( ( ( nH + nItemH / 2 ) / nItemH ), 1L );
 
     sal_uInt16 nMaxCols  = nItemCount / nLines;
     if( nItemCount % nLines )
@@ -601,7 +601,7 @@ void SvxLineEndWindow::Resizing( Size& rNewSize )
     // Keine ungerade Anzahl von Spalten
     if( nCols % 2 )
         nCols--;
-    nCols = Max( nCols, (sal_uInt16) 2 );
+    nCols = std::max( nCols, (sal_uInt16) 2 );
 
     sal_uInt16 nMaxLines  = nItemCount / nCols;
     if( nItemCount % nCols )
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 658fde0f7f89..b0d4aadc14bb 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2087,7 +2087,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
             pBox->SetUpdateMode( sal_True );
             pBox->SetFamily( eFamily );
 
-            sal_uInt16 nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES );
+            sal_uInt16 nLines = std::min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES );
             pBox->SetDropDownLineCount( nLines );
         }
     }