summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg
diff options
context:
space:
mode:
authorMarcos Paulo de Souza <marcos.souza.org@gmail.com>2013-04-11 00:21:40 -0300
committerDavid Tardon <dtardon@redhat.com>2013-04-20 11:09:54 +0000
commit0f200cc30ea75fdce59f7bb6ae87ebc85729e2a4 (patch)
tree2e2c28f9500f81825cdadcbabd131da767ddbb49 /sd/source/ui/dlg
parent5414a3eecdb09be928313477792acfe1d3534645 (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/dlg')
-rw-r--r--sd/source/ui/dlg/animobjs.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index e1e46157253a..14c4f0701cf6 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -690,8 +690,8 @@ Fraction AnimationWindow::GetScale()
{
BitmapEx *const pBitmap = m_FrameList[i].first;
Size aTempSize( pBitmap->GetBitmap().GetSizePixel() );
- aBmpSize.Width() = Max( aBmpSize.Width(), aTempSize.Width() );
- aBmpSize.Height() = Max( aBmpSize.Height(), aTempSize.Height() );
+ aBmpSize.Width() = std::max( aBmpSize.Width(), aTempSize.Width() );
+ aBmpSize.Height() = std::max( aBmpSize.Height(), aTempSize.Height() );
}
aBmpSize.Width() += 10;
@@ -1044,11 +1044,11 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
else
aTmpSizeLog = pDefDev->LogicToLogic( aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), aMap100 );
- aMaxSizeLog.Width() = Max( aMaxSizeLog.Width(), aTmpSizeLog.Width() );
- aMaxSizeLog.Height() = Max( aMaxSizeLog.Height(), aTmpSizeLog.Height() );
+ aMaxSizeLog.Width() = std::max( aMaxSizeLog.Width(), aTmpSizeLog.Width() );
+ aMaxSizeLog.Height() = std::max( aMaxSizeLog.Height(), aTmpSizeLog.Height() );
- aMaxSizePix.Width() = Max( aMaxSizePix.Width(), aTmpSizePix.Width() );
- aMaxSizePix.Height() = Max( aMaxSizePix.Height(), aTmpSizePix.Height() );
+ aMaxSizePix.Width() = std::max( aMaxSizePix.Width(), aTmpSizePix.Width() );
+ aMaxSizePix.Height() = std::max( aMaxSizePix.Height(), aTmpSizePix.Height() );
}
SdrPageView* pPV = rView.GetSdrPageView();