diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-04-11 00:21:40 -0300 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-04-20 11:09:54 +0000 |
commit | 0f200cc30ea75fdce59f7bb6ae87ebc85729e2a4 (patch) | |
tree | 2e2c28f9500f81825cdadcbabd131da767ddbb49 /sd/source/ui/docshell | |
parent | 5414a3eecdb09be928313477792acfe1d3534645 (diff) |
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>
Diffstat (limited to 'sd/source/ui/docshell')
-rw-r--r-- | sd/source/ui/docshell/docshel2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/docshell/sdclient.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 85c87d593fcb..43e0b747c8b4 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -199,7 +199,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe aVDev.SetMapMode( aMapMode ); const Size aPixSize( aVDev.LogicToPixel( aSize ) ); - const sal_uLong nMaxEdgePix = Max( aPixSize.Width(), aPixSize.Height() ); + const sal_uLong nMaxEdgePix = std::max( aPixSize.Width(), aPixSize.Height() ); Fraction aFrac( nMaxEdgePixel, nMaxEdgePix ); aMapMode.SetScaleX( aFrac ); diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index 192c1cd5d754..abda2f4eb764 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -93,10 +93,10 @@ void Client::RequestNewObjectArea( Rectangle& aObjRect ) Point aWorkAreaTL = aWorkArea.TopLeft(); Point aWorkAreaBR = aWorkArea.BottomRight(); - aPos.X() = Max(aPos.X(), aWorkAreaTL.X()); - aPos.X() = Min(aPos.X(), aWorkAreaBR.X()-aSize.Width()); - aPos.Y() = Max(aPos.Y(), aWorkAreaTL.Y()); - aPos.Y() = Min(aPos.Y(), aWorkAreaBR.Y()-aSize.Height()); + aPos.X() = std::max(aPos.X(), aWorkAreaTL.X()); + aPos.X() = std::min(aPos.X(), aWorkAreaBR.X()-aSize.Width()); + aPos.Y() = std::max(aPos.Y(), aWorkAreaTL.Y()); + aPos.Y() = std::min(aPos.Y(), aWorkAreaBR.Y()-aSize.Height()); aObjRect.SetPos(aPos); } |