mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More loplugin:cstylecast: scaddins

Browse Source 
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
This commit is contained in:
Stephan Bergmann
2018-01-12 20:17:05 +01:00
parent 02416cc1ce
commit fe45359ab8
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scaddins/source/analysis/analysishelper.cxx
View File

@@ -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 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); nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400);
for( sal_uInt16 i = 1; i < nMonth; i++ ) 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 do
{ {
nTempDays = nDays; nTempDays = nDays;
rYear = (sal_uInt16)((nTempDays / 365) - i); rYear = static_cast<sal_uInt16>((nTempDays / 365) - i);
nTempDays -= ((sal_Int32) rYear -1) * 365; nTempDays -= (static_cast<sal_Int32>(rYear) -1) * 365;
nTempDays -= (( rYear -1) / 4) - (( rYear -1) / 100) + ((rYear -1) / 400); nTempDays -= (( rYear -1) / 4) - (( rYear -1) / 100) + ((rYear -1) / 400);
bCalc = false; bCalc = false;
if ( nTempDays < 1 ) if ( nTempDays < 1 )
@@ -240,7 +240,7 @@ void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt
nTempDays -= DaysInMonth( rMonth, rYear ); nTempDays -= DaysInMonth( rMonth, rYear );
rMonth++; 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++ ) for ( sal_Int16 i = nYear1; i <= nYear2; i++ )
nDayCount += ( IsLeapYear( i ) ? 366 : 365 ); 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 // 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 // 4.11.7.7.10 can be permuted without changing the end result

10
scaddins/source/datefunc/datefunc.cxx
View File

@@ -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 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); nDays += ((nYear-1) / 4) - ((nYear-1) / 100) + ((nYear-1) / 400);
for( sal_uInt16 i = 1; i < nMonth; i++ ) for( sal_uInt16 i = 1; i < nMonth; i++ )
@@ -418,8 +418,8 @@ void DaysToDate( sal_Int32 nDays,
do do
{ {
nTempDays = nDays; nTempDays = nDays;
rYear = (sal_uInt16)((nTempDays / 365) - i); rYear = static_cast<sal_uInt16>((nTempDays / 365) - i);
nTempDays -= ((sal_Int32) rYear -1) * 365; nTempDays -= (static_cast<sal_Int32>(rYear) -1) * 365;
nTempDays -= (( rYear -1) / 4) - (( rYear -1) / 100) + ((rYear -1) / 400); nTempDays -= (( rYear -1) / 4) - (( rYear -1) / 100) + ((rYear -1) / 400);
bCalc = false; bCalc = false;
if ( nTempDays < 1 ) if ( nTempDays < 1 )
@@ -447,7 +447,7 @@ void DaysToDate( sal_Int32 nDays,
nTempDays -= DaysInMonth( rMonth, rYear ); nTempDays -= DaysInMonth( rMonth, rYear );
rMonth++; 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; sal_uInt16 nDay, nMonth, nYear;
DaysToDate(nDays,nDay,nMonth,nYear); DaysToDate(nDays,nDay,nMonth,nYear);
return (sal_Int32)IsLeapYear(nYear); return static_cast<sal_Int32>(IsLeapYear(nYear));
} }
/** /**