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 /cui/source/customize | |
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 'cui/source/customize')
-rw-r--r-- | cui/source/customize/cfg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 5928ee39a735..2adfb0aace50 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3124,7 +3124,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( long nCtrlW = aTopLevelLabel.GetSizePixel().Width(); if ( nTxtW >= nCtrlW ) { - long nDelta = Max( (long)10, nTxtW - nCtrlW ); + long nDelta = std::max( (long)10, nTxtW - nCtrlW ); Size aNewSz = aTopLevelLabel.GetSizePixel(); aNewSz.Width() += nDelta; aTopLevelLabel.SetSizePixel( aNewSz ); |