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 /svtools/source/control/scriptedtext.cxx | |
| 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 'svtools/source/control/scriptedtext.cxx')
| -rw-r--r-- | svtools/source/control/scriptedtext.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 146ceeb37c7b..46f40fc1a1b9 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -170,11 +170,11 @@ void SvtScriptedTextHelper_Impl::CalculateSizes() // calculate maximum font height SetOutDevFont( i18n::ScriptType::LATIN ); - maTextSize.Height() = Max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); + maTextSize.Height() = std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); SetOutDevFont( i18n::ScriptType::ASIAN ); - maTextSize.Height() = Max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); + maTextSize.Height() = std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); SetOutDevFont( i18n::ScriptType::COMPLEX ); - maTextSize.Height() = Max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); + maTextSize.Height() = std::max( maTextSize.Height(), mrOutDevice.GetTextHeight() ); mrOutDevice.SetFont( maDefltFont ); } |