From 0f200cc30ea75fdce59f7bb6ae87ebc85729e2a4 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Thu, 11 Apr 2013 00:21:40 -0300 Subject: 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 Tested-by: David Tardon --- UnoControls/source/controls/progressmonitor.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'UnoControls') diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index ef4d53f01797..dad73a85cc75 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -754,14 +754,14 @@ void ProgressMonitor::impl_recalcLayout () // But "Width" is oriented on left column below progressbar to!!! "max(...)" nX_Topic_Top = PROGRESSMONITOR_FREEBORDER ; nY_Topic_Top = PROGRESSMONITOR_FREEBORDER ; - nWidth_Topic_Top = Max ( aTopicSize_Top.Width, aTopicSize_Bottom.Width ) ; + nWidth_Topic_Top = std::max( aTopicSize_Top.Width, aTopicSize_Bottom.Width ) ; nHeight_Topic_Top = aTopicSize_Top.Height ; // Right column before progressbar has relativ position to left column ... // ... and a size as rest of dialog size! nX_Text_Top = nX_Topic_Top+nWidth_Topic_Top+PROGRESSMONITOR_FREEBORDER; nY_Text_Top = nY_Topic_Top ; - nWidth_Text_Top = Max ( aTextSize_Top.Width, aTextSize_Bottom.Width ) ; + nWidth_Text_Top = std::max ( aTextSize_Top.Width, aTextSize_Bottom.Width ) ; // Fix size of this column to minimum! sal_Int32 nSummaryWidth = nWidth_Text_Top+nWidth_Topic_Top+(3*PROGRESSMONITOR_FREEBORDER) ; if ( nSummaryWidth < PROGRESSMONITOR_DEFAULT_WIDTH ) -- cgit v1.2.3