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 --- svtools/source/control/scriptedtext.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svtools/source/control/scriptedtext.cxx') 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 ); } -- cgit