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 /scaddins | |
| 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 'scaddins')
| -rw-r--r-- | scaddins/source/analysis/analysishelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 94e2da88fd4f..9c0095c4498b 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2755,7 +2755,7 @@ void ScaDate::setDay() if( b30Days ) { // 30-days-mode: set nDay to 30 if original was last day in month - nDay = Min( nOrigDay, static_cast< sal_uInt16 >( 30 ) ); + nDay = std::min( nOrigDay, static_cast< sal_uInt16 >( 30 ) ); if( bLastDay || (nDay >= ::DaysInMonth( nMonth, nYear )) ) nDay = 30; } @@ -2763,7 +2763,7 @@ void ScaDate::setDay() { // set nDay to last day in this month if original was last day sal_uInt16 nLastDay = ::DaysInMonth( nMonth, nYear ); - nDay = bLastDay ? nLastDay : Min( nOrigDay, nLastDay ); + nDay = bLastDay ? nLastDay : std::min( nOrigDay, nLastDay ); } } @@ -2821,7 +2821,7 @@ void ScaDate::addMonths( sal_Int32 nMonthCount ) throw( lang::IllegalArgumentExc sal_Int32 ScaDate::getDate( sal_Int32 nNullDate ) const { sal_uInt16 nLastDay = ::DaysInMonth( nMonth, nYear ); - sal_uInt16 nRealDay = (bLastDayMode && bLastDay) ? nLastDay : Min( nLastDay, nOrigDay ); + sal_uInt16 nRealDay = (bLastDayMode && bLastDay) ? nLastDay : std::min( nLastDay, nOrigDay ); return ::DateToDays( nRealDay, nMonth, nYear ) - nNullDate; } |