diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:17:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:17:05 +0100 |
| commit | fe45359ab818659186672a0ca05979b589dedbfc (patch) | |
| tree | 6ba8bba09d5f484194ec487d9a8d1321ef013ce2 /scaddins/source | |
| parent | 02416cc1ce1f5d64265d509a0c1b149d11b5a3cb (diff) | |
More loplugin:cstylecast: scaddins
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: I67dffc144cd2dd8eebf29d3cfc27ef1599f955a4
Diffstat (limited to 'scaddins/source')
| -rw-r--r-- | scaddins/source/analysis/analysishelper.cxx | 10 | ||||
| -rw-r--r-- | scaddins/source/datefunc/datefunc.cxx | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index ee54dac9172a..530097ca278e 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -178,7 +178,7 @@ sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear ) sal_Int32 DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear ) { - sal_Int32 nDays = ((sal_Int32)nYear-1) * 365; + sal_Int32 nDays = (static_cast<sal_Int32>(nYear)-1) * 365; nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400); for( sal_uInt16 i = 1; i < nMonth; i++ ) @@ -211,8 +211,8 @@ void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt do { nTempDays = nDays; - rYear = (sal_uInt16)((nTempDays / 365) - i); - nTempDays -= ((sal_Int32) rYear -1) * 365; + rYear = static_cast<sal_uInt16>((nTempDays / 365) - i); + nTempDays -= (static_cast<sal_Int32>(rYear) -1) * 365; nTempDays -= (( rYear -1) / 4) - (( rYear -1) / 100) + ((rYear -1) / 400); bCalc = false; if ( nTempDays < 1 ) @@ -240,7 +240,7 @@ void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt nTempDays -= DaysInMonth( rMonth, rYear ); rMonth++; } - rDay = (sal_uInt16)nTempDays; + rDay = static_cast<sal_uInt16>(nTempDays); } @@ -541,7 +541,7 @@ double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDat for ( sal_Int16 i = nYear1; i <= nYear2; i++ ) nDayCount += ( IsLeapYear( i ) ? 366 : 365 ); - nDaysInYear = ( double ) nDayCount / ( double ) ( nYear2 - nYear1 + 1 ); + nDaysInYear = static_cast<double>(nDayCount) / static_cast<double>( nYear2 - nYear1 + 1 ); } // we take advantage of the fact that (ODFv1.2 part 2) 4.11.7.7.9 // 4.11.7.7.10 can be permuted without changing the end result diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 5b6c804c54aa..3585cd6487cd 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -384,7 +384,7 @@ sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear ) sal_Int32 DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear ) { - sal_Int32 nDays = ((sal_Int32)nYear-1) * 365; + sal_Int32 nDays = (static_cast<sal_Int32>(nYear)-1) * 365; nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400); for( sal_uInt16 i = 1; i < nMonth; i++ ) @@ -418,8 +418,8 @@ void DaysToDate( sal_Int32 nDays, do { nTempDays = nDays; - rYear = (sal_uInt16)((nTempDays / 365) - i); - nTempDays -= ((sal_Int32) rYear -1) * 365; + rYear = static_cast<sal_uInt16>((nTempDays / 365) - i); + nTempDays -= (static_cast<sal_Int32>(rYear) -1) * 365; nTempDays -= (( rYear -1) / 4) - (( rYear -1) / 100) + ((rYear -1) / 400); bCalc = false; if ( nTempDays < 1 ) @@ -447,7 +447,7 @@ void DaysToDate( sal_Int32 nDays, nTempDays -= DaysInMonth( rMonth, rYear ); rMonth++; } - rDay = (sal_uInt16)nTempDays; + rDay = static_cast<sal_uInt16>(nTempDays); } /** @@ -659,7 +659,7 @@ sal_Int32 SAL_CALL ScaDateAddIn::getIsLeapYear( sal_uInt16 nDay, nMonth, nYear; DaysToDate(nDays,nDay,nMonth,nYear); - return (sal_Int32)IsLeapYear(nYear); + return static_cast<sal_Int32>(IsLeapYear(nYear)); } /** |