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 /uui | |
| 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 'uui')
| -rw-r--r-- | uui/source/secmacrowarnings.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index aeaf423be667..8e98e3cef63c 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -231,7 +231,7 @@ void MacroWarning::InitControls() if ( nTxtW >= nBtnW ) { // broaden the button - long nDelta = Max( nTxtW - nBtnW, nOffset/3 ); + long nDelta = std::max( nTxtW - nBtnW, nOffset/3 ); Size aNewSize = maViewSignsBtn.GetSizePixel(); aNewSize.Width() += nDelta; maViewSignsBtn.SetSizePixel( aNewSize ); @@ -253,7 +253,7 @@ void MacroWarning::InitControls() long nTxtW2 = maDisableBtn.GetTextWidth( sText2 ); if ( sText2.Search( '~' ) == STRING_NOTFOUND ) nTxtW2 += nOffset; - nTxtW = Max( nTxtW1, nTxtW2 ); + nTxtW = std::max( nTxtW1, nTxtW2 ); nBtnW = maEnableBtn.GetSizePixel().Width(); if ( nTxtW > nBtnW ) { @@ -284,10 +284,10 @@ void MacroWarning::FitControls() if ( mbShowSignatures ) { aMinSize = maSignsFI.CalcMinimumSize( maSignsFI.GetSizePixel().Width() ); - nTxtH = Max( aMinSize.Height(), maViewSignsBtn.GetSizePixel().Height() ); + nTxtH = std::max( aMinSize.Height(), maViewSignsBtn.GetSizePixel().Height() ); nTxtH += a3Size.Height() / 2; nCtrlH = maSignsFI.GetSizePixel().Height(); - nDelta = Max( nCtrlH - nTxtH, static_cast< long >( -100 ) ); // not too large + nDelta = std::max( nCtrlH - nTxtH, static_cast< long >( -100 ) ); // not too large aNewSize = maSignsFI.GetSizePixel(); aNewSize.Height() -= nDelta; maSignsFI.SetSizePixel( aNewSize ); |