summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-01-12 20:14:44 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-01-12 20:14:44 +0100
commitdead6b3a944d0100ef833bb5d7f92bcd2563ada4 (patch)
tree3353ff138015cf48c38db8abaa9bc3478271b2cd
parent43b137e1404acbd16649813e9d493ba97b8f509c (diff)
More loplugin:cstylecast: svl
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: I71e3b2c9b4c68183288f43999d242e95ae13584d
-rw-r--r--include/svl/srchitem.hxx6
-rw-r--r--include/svl/zforlist.hxx2
-rw-r--r--svl/qa/unit/notify/test_SfxBroadcaster.cxx16
-rw-r--r--svl/qa/unit/svl.cxx2
-rw-r--r--svl/source/config/ctloptions.cxx4
-rw-r--r--svl/source/crypto/cryptosign.cxx14
-rw-r--r--svl/source/items/srchitem.cxx8
-rw-r--r--svl/source/items/style.cxx2
-rw-r--r--svl/source/misc/inethist.cxx2
-rw-r--r--svl/source/misc/lockfilecommon.cxx4
-rw-r--r--svl/source/misc/sharecontrolfile.cxx10
-rw-r--r--svl/source/numbers/numfmuno.cxx8
-rw-r--r--svl/source/numbers/zforfind.cxx22
-rw-r--r--svl/source/numbers/zforlist.cxx8
-rw-r--r--svl/source/numbers/zformat.cxx56
-rw-r--r--svl/source/numbers/zforscan.cxx10
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx10
-rw-r--r--svl/source/undo/undo.cxx4
18 files changed, 94 insertions, 94 deletions
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 343433dd8808..a449f250ca39 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -262,7 +262,7 @@ bool SvxSearchItem::IsLEVRelaxed() const
sal_uInt16 SvxSearchItem::GetLEVOther() const
{
- return (sal_Int16) m_aSearchOpt.changedChars;
+ return static_cast<sal_Int16>(m_aSearchOpt.changedChars);
}
void SvxSearchItem::SetLEVOther( sal_uInt16 nVal )
@@ -272,7 +272,7 @@ void SvxSearchItem::SetLEVOther( sal_uInt16 nVal )
sal_uInt16 SvxSearchItem::GetLEVShorter() const
{
- return (sal_Int16) m_aSearchOpt.insertedChars;
+ return static_cast<sal_Int16>(m_aSearchOpt.insertedChars);
}
void SvxSearchItem::SetLEVShorter( sal_uInt16 nVal )
@@ -282,7 +282,7 @@ void SvxSearchItem::SetLEVShorter( sal_uInt16 nVal )
sal_uInt16 SvxSearchItem::GetLEVLonger() const
{
- return (sal_Int16) m_aSearchOpt.deletedChars;
+ return static_cast<sal_Int16>(m_aSearchOpt.deletedChars);
}
void SvxSearchItem::SetLEVLonger( sal_uInt16 nVal )
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index e82d68072c75..838f69508338 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -60,7 +60,7 @@ namespace com { namespace sun { namespace star {
/// number formatter was constructed with.
constexpr sal_uInt32 NF_STANDARD_FORMAT_TEXT = SV_MAX_COUNT_STANDARD_FORMATS;
-#define NUMBERFORMAT_ENTRY_NOT_FOUND (sal_uInt32)(0xffffffff) /// MAX_ULONG
+#define NUMBERFORMAT_ENTRY_NOT_FOUND sal_uInt32(0xffffffff) /// MAX_ULONG
enum class SvNumFormatType : sal_Int16
{
diff --git a/svl/qa/unit/notify/test_SfxBroadcaster.cxx b/svl/qa/unit/notify/test_SfxBroadcaster.cxx
index 58c8df532590..d7b127c4c1ef 100644
--- a/svl/qa/unit/notify/test_SfxBroadcaster.cxx
+++ b/svl/qa/unit/notify/test_SfxBroadcaster.cxx
@@ -60,10 +60,10 @@ SfxBroadcasterTest::AddingListenersIncreasesCount()
SfxBroadcaster sb;
MockedSfxListener sl;
- CPPUNIT_ASSERT_EQUAL((size_t)0, sb.GetListenerCount());
+ CPPUNIT_ASSERT_EQUAL(size_t(0), sb.GetListenerCount());
sl.StartListening(sb, true);
- CPPUNIT_ASSERT_EQUAL((size_t)1, sb.GetListenerCount());
+ CPPUNIT_ASSERT_EQUAL(size_t(1), sb.GetListenerCount());
}
void
@@ -72,11 +72,11 @@ SfxBroadcasterTest::RemovingListenersDecreasesCount()
SfxBroadcaster sb;
MockedSfxListener sl;
- CPPUNIT_ASSERT_EQUAL((size_t)0, sb.GetListenerCount());
+ CPPUNIT_ASSERT_EQUAL(size_t(0), sb.GetListenerCount());
sl.StartListening(sb, true);
- CPPUNIT_ASSERT_EQUAL((size_t)1, sb.GetListenerCount());
+ CPPUNIT_ASSERT_EQUAL(size_t(1), sb.GetListenerCount());
sl.EndListening(sb, true);
- CPPUNIT_ASSERT_EQUAL((size_t)0, sb.GetListenerCount());
+ CPPUNIT_ASSERT_EQUAL(size_t(0), sb.GetListenerCount());
}
void
@@ -89,7 +89,7 @@ SfxBroadcasterTest::HintsAreNotForwardedToRemovedListeners()
sl1.StartListening(sb, true);
sl2.StartListening(sb, true);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("All listeners were added.", (size_t)2, sb.GetListenerCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("All listeners were added.", size_t(2), sb.GetListenerCount());
sl1.EndListening(sb, true);
sb.Forward(sb, hint);
CPPUNIT_ASSERT_EQUAL(true, sl2.NotifyWasCalled());
@@ -103,7 +103,7 @@ SfxBroadcasterTest::SameListenerCanBeAddedMoreThanOnce()
SfxBroadcaster sb;
sb.AddListener(sl);
sb.AddListener(sl);
- CPPUNIT_ASSERT_EQUAL((size_t)2, sb.GetListenerCount());
+ CPPUNIT_ASSERT_EQUAL(size_t(2), sb.GetListenerCount());
}
void
@@ -114,7 +114,7 @@ SfxBroadcasterTest::StoppingListeningAffectsOnlyFirstOfIdenticalListeners()
sb.AddListener(sl);
sb.AddListener(sl);
sb.RemoveListener(sl);
- CPPUNIT_ASSERT_EQUAL((size_t)1, sb.GetListenerCount());
+ CPPUNIT_ASSERT_EQUAL(size_t(1), sb.GetListenerCount());
}
CPPUNIT_TEST_SUITE_REGISTRATION(SfxBroadcasterTest);
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 74e37de42d6e..3c5cc3af7532 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -412,7 +412,7 @@ void Test::checkPreviewString(SvNumberFormatter& aFormatter,
aMessage += "\", ";
aMessage += rtl::OString::number( fPreviewNumber );
aMessage += ", sStr, ppColor, ";
- aMessage += rtl::OString::number( (sal_uInt16)eLang );
+ aMessage += rtl::OString::number( static_cast<sal_uInt16>(eLang) );
aMessage += " ) failed";
CPPUNIT_FAIL( aMessage.getStr() );
}
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index c4fffc504560..63ecb6d656db 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -181,7 +181,7 @@ void SvtCTLOptions_Impl::ImplCommit()
if (!m_bROCTLCursorMovement)
{
pNames[nRealCount] = pOrgNames[nProp];
- pValues[nRealCount] <<= (sal_Int32)m_eCTLCursorMovement;
+ pValues[nRealCount] <<= static_cast<sal_Int32>(m_eCTLCursorMovement);
++nRealCount;
}
}
@@ -192,7 +192,7 @@ void SvtCTLOptions_Impl::ImplCommit()
if (!m_bROCTLTextNumerals)
{
pNames[nRealCount] = pOrgNames[nProp];
- pValues[nRealCount] <<= (sal_Int32)m_eCTLTextNumerals;
+ pValues[nRealCount] <<= static_cast<sal_Int32>(m_eCTLTextNumerals);
++nRealCount;
}
}
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index d363542bae57..e4c9337c2a6a 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -456,10 +456,10 @@ bad_data:
goto bad_data;
tmp = num_bytes;
rp = result + result_bytes - 1;
- rp[tmp] = (PRUint8)(decimal & 0x7f);
+ rp[tmp] = static_cast<PRUint8>(decimal & 0x7f);
decimal >>= 7;
while (--tmp > 0) {
- rp[tmp] = (PRUint8)(decimal | 0x80);
+ rp[tmp] = static_cast<PRUint8>(decimal | 0x80);
decimal >>= 7;
}
result_bytes += num_bytes;
@@ -1831,11 +1831,11 @@ bad_data:
goto bad_data;
tmp = num_bytes;
rp = result + result_bytes - 1;
- rp[tmp] = (PRUint8)(decimal & 0x7f);
+ rp[tmp] = static_cast<PRUint8>(decimal & 0x7f);
decimal >>= 7;
while (--tmp > 0)
{
- rp[tmp] = (PRUint8)(decimal | 0x80);
+ rp[tmp] = static_cast<PRUint8>(decimal | 0x80);
decimal >>= 7;
}
result_bytes += num_bytes;
@@ -2097,15 +2097,15 @@ bool Signing::Verify(const std::vector<unsigned char>& aData,
if (rInformation.ouDateTime.isEmpty())
{
OUStringBuffer rBuffer;
- rBuffer.append((sal_Int32) aDateTime.GetYear());
+ rBuffer.append(static_cast<sal_Int32>(aDateTime.GetYear()));
rBuffer.append('-');
if (aDateTime.GetMonth() < 10)
rBuffer.append('0');
- rBuffer.append((sal_Int32) aDateTime.GetMonth());
+ rBuffer.append(static_cast<sal_Int32>(aDateTime.GetMonth()));
rBuffer.append('-');
if (aDateTime.GetDay() < 10)
rBuffer.append('0');
- rBuffer.append((sal_Int32) aDateTime.GetDay());
+ rBuffer.append(static_cast<sal_Int32>(aDateTime.GetDay()));
rInformation.ouDateTime = rBuffer.makeStringAndClear();
}
}
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 0bfa0a9eea71..2c7798e4807b 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -486,7 +486,7 @@ bool SvxSearchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
nLocale = LanguageTag::convertToLanguageType( m_aSearchOpt.Locale );
else
nLocale = LANGUAGE_NONE;
- rVal <<= (sal_Int16)(sal_uInt16)nLocale;
+ rVal <<= static_cast<sal_Int16>(static_cast<sal_uInt16>(nLocale));
break;
}
@@ -608,7 +608,7 @@ bool SvxSearchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
case MID_SEARCH_COMMAND:
bRet = (rVal >>= nInt); m_nCommand = static_cast<SvxSearchCmd>(nInt); break;
case MID_SEARCH_STYLEFAMILY:
- bRet = (rVal >>= nInt); m_eFamily = (SfxStyleFamily) (sal_Int16) nInt; break;
+ bRet = (rVal >>= nInt); m_eFamily = (SfxStyleFamily) static_cast<sal_Int16>(nInt); break;
case MID_SEARCH_CELLTYPE:
bRet = (rVal >>= nInt); m_nCellType = static_cast<SvxSearchCellType>(nInt); break;
case MID_SEARCH_ROWDIRECTION:
@@ -628,9 +628,9 @@ bool SvxSearchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
case MID_SEARCH_ASIANOPTIONS:
bRet = (rVal >>= m_bAsianOptions); break;
case MID_SEARCH_ALGORITHMTYPE:
- bRet = (rVal >>= nInt); m_aSearchOpt.algorithmType = (SearchAlgorithms)(sal_Int16)nInt; break;
+ bRet = (rVal >>= nInt); m_aSearchOpt.algorithmType = (SearchAlgorithms)static_cast<sal_Int16>(nInt); break;
case MID_SEARCH_ALGORITHMTYPE2:
- bRet = (rVal >>= nInt); m_aSearchOpt.AlgorithmType2 = (sal_Int16)nInt; break;
+ bRet = (rVal >>= nInt); m_aSearchOpt.AlgorithmType2 = static_cast<sal_Int16>(nInt); break;
case MID_SEARCH_FLAGS:
bRet = (rVal >>= m_aSearchOpt.searchFlag); break;
case MID_SEARCH_SEARCHSTRING:
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 673874496093..9d3692b9b987 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -419,7 +419,7 @@ sal_uInt16 SfxStyleSheetIterator::Count()
sal_uInt16 n = 0;
if( IsTrivialSearch())
{
- n = (sal_uInt16) pBasePool->pImpl->mxIndexedStyleSheets->GetNumberOfStyleSheets();
+ n = static_cast<sal_uInt16>(pBasePool->pImpl->mxIndexedStyleSheets->GetNumberOfStyleSheets());
}
else if(nMask == SFXSTYLEBIT_ALL)
{
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 03f886f39da4..46d298acf310 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -114,7 +114,7 @@ class INetURLHistory_Impl
static sal_uInt16 capacity()
{
- return (sal_uInt16)(INETHIST_SIZE_LIMIT);
+ return sal_uInt16(INETHIST_SIZE_LIMIT);
}
static sal_uInt32 crc32 (OUString const & rData)
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index 6768b7b07f87..cd2658ee5afd 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -140,7 +140,7 @@ OUString LockFileCommon::ParseName( const uno::Sequence< sal_Int8 >& aBuffer, sa
if ( aBuffer[io_nCurPos] != ',' && aBuffer[io_nCurPos] != ';' && aBuffer[io_nCurPos] != '\\' )
throw io::WrongFormatException();
- aResult.append( (sal_Char)aBuffer[io_nCurPos] );
+ aResult.append( static_cast<sal_Char>(aBuffer[io_nCurPos]) );
bEscape = false;
io_nCurPos++;
@@ -152,7 +152,7 @@ OUString LockFileCommon::ParseName( const uno::Sequence< sal_Int8 >& aBuffer, sa
if ( aBuffer[io_nCurPos] == '\\' )
bEscape = true;
else
- aResult.append( (sal_Char)aBuffer[io_nCurPos] );
+ aResult.append( static_cast<sal_Char>(aBuffer[io_nCurPos]) );
io_nCurPos++;
}
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index 61a561a82c3d..fbae7224497a 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -158,20 +158,20 @@ std::vector< o3tl::enumarray< LockFileComponent, OUString > > ShareControlFile::
if ( nLength > SAL_MAX_INT32 )
throw uno::RuntimeException();
- uno::Sequence< sal_Int8 > aBuffer( (sal_Int32)nLength );
+ uno::Sequence< sal_Int8 > aBuffer( static_cast<sal_Int32>(nLength) );
m_xSeekable->seek( 0 );
- sal_Int32 nRead = m_xInputStream->readBytes( aBuffer, (sal_Int32)nLength );
+ sal_Int32 nRead = m_xInputStream->readBytes( aBuffer, static_cast<sal_Int32>(nLength) );
nLength -= nRead;
while ( nLength > 0 )
{
- uno::Sequence< sal_Int8 > aTmpBuf( (sal_Int32)nLength );
- nRead = m_xInputStream->readBytes( aTmpBuf, (sal_Int32)nLength );
+ uno::Sequence< sal_Int8 > aTmpBuf( static_cast<sal_Int32>(nLength) );
+ nRead = m_xInputStream->readBytes( aTmpBuf, static_cast<sal_Int32>(nLength) );
if ( nRead > nLength )
throw uno::RuntimeException();
for ( sal_Int32 nInd = 0; nInd < nRead; nInd++ )
- aBuffer[aBuffer.getLength() - (sal_Int32)nLength + nInd] = aTmpBuf[nInd];
+ aBuffer[aBuffer.getLength() - static_cast<sal_Int32>(nLength) + nInd] = aTmpBuf[nInd];
nLength -= nRead;
}
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index bf2c13d82e29..acca48bbf6d4 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -650,12 +650,12 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty
else if (aPropertyName == PROPERTYNAME_DECIMALS)
{
pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
- aRet <<= (sal_Int16) nDecimals;
+ aRet <<= static_cast<sal_Int16>(nDecimals);
}
else if (aPropertyName == PROPERTYNAME_LEADING)
{
pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
- aRet <<= (sal_Int16) nLeading;
+ aRet <<= static_cast<sal_Int16>(nLeading);
}
else if (aPropertyName == PROPERTYNAME_NEGRED)
{
@@ -869,9 +869,9 @@ uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& a
aRet <<= rDate.GetUNODate();
}
else if (aPropertyName == PROPERTYNAME_STDDEC)
- aRet <<= (sal_Int16)( pFormatter->GetStandardPrec() );
+ aRet <<= static_cast<sal_Int16>( pFormatter->GetStandardPrec() );
else if (aPropertyName == PROPERTYNAME_TWODIGIT)
- aRet <<= (sal_Int16)( pFormatter->GetYear2000() );
+ aRet <<= static_cast<sal_Int16>( pFormatter->GetYear2000() );
else
throw beans::UnknownPropertyException();
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 6a2a4d9aa7e9..241bfc76e4be 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -172,11 +172,11 @@ double ImpSvNumberInputScan::StringToDouble( const OUString& rStr, bool bForceFr
}
else if (bPreSep)
{
- fNum = fNum * 10.0 + (double) (rStr[nPos] - '0');
+ fNum = fNum * 10.0 + static_cast<double>(rStr[nPos] - '0');
}
else
{
- fFrac = fFrac * 10.0 + (double) (rStr[nPos] - '0');
+ fFrac = fFrac * 10.0 + static_cast<double>(rStr[nPos] - '0');
--nExp;
}
nPos++;
@@ -921,7 +921,7 @@ bool ImpSvNumberInputScan::GetTimeRef( double& fOutNumber,
}
else if (nIndex - nStartIndex < nCnt)
{
- nHour = (sal_uInt16) sStrArray[nNums[nIndex++]].toInt32();
+ nHour = static_cast<sal_uInt16>(sStrArray[nNums[nIndex++]].toInt32());
}
else
{
@@ -935,11 +935,11 @@ bool ImpSvNumberInputScan::GetTimeRef( double& fOutNumber,
}
else if (nIndex - nStartIndex < nCnt)
{
- nMinute = (sal_uInt16) sStrArray[nNums[nIndex++]].toInt32();
+ nMinute = static_cast<sal_uInt16>(sStrArray[nNums[nIndex++]].toInt32());
}
if (nIndex - nStartIndex < nCnt)
{
- nSecond = (sal_uInt16) sStrArray[nNums[nIndex++]].toInt32();
+ nSecond = static_cast<sal_uInt16>(sStrArray[nNums[nIndex++]].toInt32());
}
if (nIndex - nStartIndex < nCnt)
{
@@ -957,9 +957,9 @@ bool ImpSvNumberInputScan::GetTimeRef( double& fOutNumber,
{
nHour = 0;
}
- fOutNumber = ((double)nHour*3600 +
- (double)nMinute*60 +
- (double)nSecond +
+ fOutNumber = (static_cast<double>(nHour)*3600 +
+ static_cast<double>(nMinute)*60 +
+ static_cast<double>(nSecond) +
fSecond100)/86400.0;
return bRet;
}
@@ -971,7 +971,7 @@ sal_uInt16 ImpSvNumberInputScan::ImplGetDay( sal_uInt16 nIndex ) const
if (sStrArray[nNums[nIndex]].getLength() <= 2)
{
- sal_uInt16 nNum = (sal_uInt16) sStrArray[nNums[nIndex]].toInt32();
+ sal_uInt16 nNum = static_cast<sal_uInt16>(sStrArray[nNums[nIndex]].toInt32());
if (nNum <= 31)
{
nRes = nNum;
@@ -989,7 +989,7 @@ sal_uInt16 ImpSvNumberInputScan::ImplGetMonth( sal_uInt16 nIndex ) const
if (sStrArray[nNums[nIndex]].getLength() <= 2)
{
- sal_uInt16 nNum = (sal_uInt16) sStrArray[nNums[nIndex]].toInt32();
+ sal_uInt16 nNum = static_cast<sal_uInt16>(sStrArray[nNums[nIndex]].toInt32());
if ( 0 < nNum && nNum <= nRes )
{
nRes = nNum - 1; // zero based for CalendarFieldIndex::MONTH
@@ -1012,7 +1012,7 @@ sal_uInt16 ImpSvNumberInputScan::ImplGetYear( sal_uInt16 nIndex )
// leading zero as convention.
if (nLen <= 6)
{
- nYear = (sal_uInt16) sStrArray[nNums[nIndex]].toInt32();
+ nYear = static_cast<sal_uInt16>(sStrArray[nNums[nIndex]].toInt32());
// A year in another, not Gregorian CE era is never expanded.
// A year < 100 entered with at least 3 digits with leading 0 is taken
// as is without expansion.
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index e8f030d6c194..64bd9ad7e742 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -615,7 +615,7 @@ bool SvNumberFormatter::PutEntry(OUString& rString,
{
bCheck = true;
nKey = nPos+1;
- pStdFormat->SetLastInsertKey((sal_uInt16) (nKey-CLOffset), SvNumberformat::FormatterPrivateAccess());
+ pStdFormat->SetLastInsertKey(static_cast<sal_uInt16>(nKey-CLOffset), SvNumberformat::FormatterPrivateAccess());
}
}
}
@@ -2797,7 +2797,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset,
}
}
- pStdFormat->SetLastInsertKey( (sal_uInt16)(nPos - CLOffset), SvNumberformat::FormatterPrivateAccess() );
+ pStdFormat->SetLastInsertKey( static_cast<sal_uInt16>(nPos - CLOffset), SvNumberformat::FormatterPrivateAccess() );
}
@@ -3167,7 +3167,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
}
else
{
- pStdFormat->SetLastInsertKey((sal_uInt16) (nNewKey - nCLOffset),
+ pStdFormat->SetLastInsertKey(static_cast<sal_uInt16>(nNewKey - nCLOffset),
SvNumberformat::FormatterPrivateAccess());
}
}
@@ -3297,7 +3297,7 @@ sal_uInt16 SvNumberFormatter::ExpandTwoDigitYear( sal_uInt16 nYear ) const
sal_uInt16 SvNumberFormatter::GetYear2000Default()
{
if (!utl::ConfigManager::IsFuzzing())
- return (sal_uInt16) ::utl::MiscCfg().GetYear2000();
+ return static_cast<sal_uInt16>(::utl::MiscCfg().GetYear2000());
return 1930;
}
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index de4dd24398b3..753ee5bd8472 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -60,7 +60,7 @@ const double EXP_ABS_UPPER_BOUND = 1.0E15; // use exponential notation above th
} // namespace
-const double D_MAX_U_INT32 = (double) 0xffffffff; // 4294967295.0
+const double D_MAX_U_INT32 = double(0xffffffff); // 4294967295.0
const double D_MAX_D_BY_100 = 1.7E306;
const double D_MIN_M_BY_1000 = 2.3E-305;
@@ -82,7 +82,7 @@ sal_Int32 SvNumberformat::InsertBlanks( OUStringBuffer& r, sal_Int32 nPos, sal_U
int n = 2; // Default for chars > 128 (HACK!)
if( c <= 127 )
{
- n = (int)cCharWidths[ c - 32 ];
+ n = static_cast<int>(cCharWidths[ c - 32 ]);
}
while( n-- )
{
@@ -98,7 +98,7 @@ static long GetPrecExp( double fAbsVal )
if ( fAbsVal < 1e-7 || fAbsVal > 1e7 )
{
// Shear: whether it's faster or not, falls in between 1e6 and 1e7
- return (long) floor( log10( fAbsVal ) ) + 1;
+ return static_cast<long>(floor( log10( fAbsVal ) )) + 1;
}
else
{
@@ -928,7 +928,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
{
sStr = "NatNum";
//! eSymbolType is negative
- sal_uInt8 nNum = (sal_uInt8)(0 - (eSymbolType - BRACKET_SYMBOLTYPE_NATNUM0));
+ sal_uInt8 nNum = static_cast<sal_uInt8>(0 - (eSymbolType - BRACKET_SYMBOLTYPE_NATNUM0));
sStr += OUString::number( nNum );
NumFor[nIndex].SetNatNumNum( nNum, false );
}
@@ -950,7 +950,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
else
{
//! eSymbolType is negative
- sal_uInt8 nNum = (sal_uInt8)(1 - (eSymbolType - BRACKET_SYMBOLTYPE_DBNUM1));
+ sal_uInt8 nNum = static_cast<sal_uInt8>(1 - (eSymbolType - BRACKET_SYMBOLTYPE_DBNUM1));
sStr = "DBNum" + OUStringLiteral1('0' + nNum);
NumFor[nIndex].SetNatNumNum( nNum, true );
}
@@ -1680,7 +1680,7 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString,
sBuffSymbol.append( aBufStr.copy( --nPos, aNatNum.getLength()+1 ));
nPos += aNatNum.getLength()+1;
//! SymbolType is negative
- eSymbolType = (short) (BRACKET_SYMBOLTYPE_NATNUM0 - nNatNumNum);
+ eSymbolType = static_cast<short>(BRACKET_SYMBOLTYPE_NATNUM0 - nNatNumNum);
eState = SsGetPrefix;
}
else if ( lcl_matchKeywordAndGetNumber( aBufStr, nPos-1, aDBNum, nDBNum) &&
@@ -2042,17 +2042,17 @@ short SvNumberformat::ImpCheckCondition(double fNumber,
case NUMBERFORMAT_OP_NO:
return -1;
case NUMBERFORMAT_OP_EQ:
- return (short) (fNumber == fLimit);
+ return static_cast<short>(fNumber == fLimit);
case NUMBERFORMAT_OP_NE:
- return (short) (fNumber != fLimit);
+ return static_cast<short>(fNumber != fLimit);
case NUMBERFORMAT_OP_LT:
- return (short) (fNumber < fLimit);
+ return static_cast<short>(fNumber < fLimit);
case NUMBERFORMAT_OP_LE:
- return (short) (fNumber <= fLimit);
+ return static_cast<short>(fNumber <= fLimit);
case NUMBERFORMAT_OP_GT:
- return (short) (fNumber > fLimit);
+ return static_cast<short>(fNumber > fLimit);
case NUMBERFORMAT_OP_GE:
- return (short) (fNumber >= fLimit);
+ return static_cast<short>(fNumber >= fLimit);
default:
return -1;
}
@@ -2544,9 +2544,9 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber,
if ( rInfo.nCntPre != 1 ) // rescale Exp
{
sal_Int32 nExp = ExpStr.toString().toInt32() * nExpSign;
- sal_Int32 nRescale = (rInfo.nCntPre != 0) ? nExp % (sal_Int32)rInfo.nCntPre : -1;
+ sal_Int32 nRescale = (rInfo.nCntPre != 0) ? nExp % static_cast<sal_Int32>(rInfo.nCntPre) : -1;
if( nRescale < 0 && rInfo.nCntPre != 0 )
- nRescale += (sal_Int32)rInfo.nCntPre;
+ nRescale += static_cast<sal_Int32>(rInfo.nCntPre);
nExp -= nRescale;
if ( nExp < 0 )
{
@@ -2651,7 +2651,7 @@ double SvNumberformat::GetRoundFractionValue ( double fNumber ) const
// fNumber is modified in ImpGetFractionElements to absolute fractional part
ImpGetFractionElements ( fNumber, nIx, fIntPart, nFrac, nDiv );
if ( nDiv > 0 )
- return fSign * ( fIntPart + (double)nFrac / (double)nDiv );
+ return fSign * ( fIntPart + static_cast<double>(nFrac) / static_cast<double>(nDiv) );
else
return fSign * fIntPart;
}
@@ -2667,9 +2667,9 @@ void SvNumberformat::ImpGetFractionElements ( double& fNumber, sal_uInt16 nIx,
nDiv = lcl_GetDenominatorString( rInfo, NumFor[nIx].GetCount() ).toInt32();
if( nDiv > 0 )
{ // Forced Denominator
- nFrac = (sal_uInt64)floor ( fNumber * nDiv );
- double fFracNew = (double)nFrac / (double)nDiv;
- double fFracNew1 = (double)(nFrac + 1) / (double)nDiv;
+ nFrac = static_cast<sal_uInt64>(floor ( fNumber * nDiv ));
+ double fFracNew = static_cast<double>(nFrac) / static_cast<double>(nDiv);
+ double fFracNew1 = static_cast<double>(nFrac + 1) / static_cast<double>(nDiv);
double fDiff = fNumber - fFracNew;
if( fDiff > ( fFracNew1 - fNumber ) )
{
@@ -2679,7 +2679,7 @@ void SvNumberformat::ImpGetFractionElements ( double& fNumber, sal_uInt16 nIx,
else // Calculated Denominator
{
nDiv = 1;
- sal_uInt64 nBasis = ((sal_uInt64)floor( pow(10.0,rInfo.nCntExp))) - 1; // 9, 99, 999 ,...
+ sal_uInt64 nBasis = static_cast<sal_uInt64>(floor( pow(10.0,rInfo.nCntExp))) - 1; // 9, 99, 999 ,...
sal_uInt64 nFracPrev = 1, nDivPrev = 0, nFracNext, nDivNext, nPartialDenom;
double fRemainder = fNumber;
@@ -2688,8 +2688,8 @@ void SvNumberformat::ImpGetFractionElements ( double& fNumber, sal_uInt16 nIx,
while ( fRemainder > 0.0 )
{
double fTemp = 1.0 / fRemainder; // 64bits precision required when fRemainder is very weak
- nPartialDenom = (sal_uInt64) floor(fTemp); // due to floating point notation with double precision
- fRemainder = fTemp - (double)nPartialDenom;
+ nPartialDenom = static_cast<sal_uInt64>(floor(fTemp)); // due to floating point notation with double precision
+ fRemainder = fTemp - static_cast<double>(nPartialDenom);
nDivNext = nPartialDenom * nDiv + nDivPrev;
if ( nDivNext <= nBasis ) // continue loop
{
@@ -2706,7 +2706,7 @@ void SvNumberformat::ImpGetFractionElements ( double& fNumber, sal_uInt16 nIx,
{
sal_uInt64 nFracTest = nCollat * nFrac + nFracPrev;
sal_uInt64 nDivTest = nCollat * nDiv + nDivPrev;
- double fSign = ((double)nFrac > fNumber * (double)nDiv)?1.0:-1.0;
+ double fSign = (static_cast<double>(nFrac) > fNumber * static_cast<double>(nDiv))?1.0:-1.0;
if ( fSign * ( double(nFrac * nDivTest + nDiv * nFracTest) - 2.0 * double(nDiv * nDivTest) * fNumber ) > 0.0 )
{
nFrac = nFracTest;
@@ -2756,14 +2756,14 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
if (rInfo.nCntPre == 0) // Improper fraction
{
- double fNum1 = fNum * (double)nDiv + (double)nFrac;
+ double fNum1 = fNum * static_cast<double>(nDiv) + static_cast<double>(nFrac);
if (fNum1 > D_MAX_U_INT32)
{
sBuff = ImpSvNumberformatScan::GetErrorString();
return false;
}
- nFrac = (sal_uInt64) floor(fNum1);
+ nFrac = static_cast<sal_uInt64>(floor(fNum1));
}
else if (fNum == 0.0 && nFrac != 0)
{
@@ -2939,7 +2939,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
sBuff = ImpSvNumberformatScan::GetErrorString();
return false;
}
- sal_uInt32 nSeconds = (sal_uInt32)floor( fTime );
+ sal_uInt32 nSeconds = static_cast<sal_uInt32>(floor( fTime ));
OUStringBuffer sSecStr( ::rtl::math::doubleToUString( fTime-nSeconds,
rtl_math_StringFormat_F, int(nCntPost), '.'));
@@ -3758,7 +3758,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
}
sal_Int16 nNatNum = NumFor[nIx].GetNatNum().GetNatNum();
- sal_uInt32 nSeconds = (sal_uInt32)floor( fTime );
+ sal_uInt32 nSeconds = static_cast<sal_uInt32>(floor( fTime ));
OUStringBuffer sSecStr( ::rtl::math::doubleToUString( fTime-nSeconds,
rtl_math_StringFormat_F, int(nCntPost), '.'));
sSecStr.stripStart('0');
@@ -4134,7 +4134,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
if ((rInfo.nCntPost + nPrecExp) > 15 && nPrecExp < 15)
{
sStr = ::rtl::math::doubleToUString( fNumber, rtl_math_StringFormat_F, 15-nPrecExp, '.');
- for (long l = 15-nPrecExp; l < (long) rInfo.nCntPost; l++)
+ for (long l = 15-nPrecExp; l < static_cast<long>(rInfo.nCntPost); l++)
{
sStr.append('0');
}
@@ -5269,7 +5269,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
if ( nLanguageID == LANGUAGE_SYSTEM && nOriginalLang != LANGUAGE_DONTKNOW )
nLanguageID = nOriginalLang;
}
- lcl_insertLCID( aStr, nAlphabetID + nCalendarID + (sal_uInt16)nLanguageID, nPosInsertLCID );
+ lcl_insertLCID( aStr, nAlphabetID + nCalendarID + static_cast<sal_uInt16>(nLanguageID), nPosInsertLCID );
}
for ( ; nSub<4 && bDefault[nSub]; ++nSub )
{ // append empty subformats
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index e47623228814..e2b121059496 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -630,7 +630,7 @@ Color* ImpSvNumberformatScan::GetColor(OUString& sStr)
sal_Int32 nIndex = sString.toInt32();
if (nIndex > 0 && nIndex <= 64)
{
- pResult = pFormatter->GetUserDefColor((sal_uInt16)nIndex-1);
+ pResult = pFormatter->GetUserDefColor(static_cast<sal_uInt16>(nIndex)-1);
}
}
}
@@ -1243,9 +1243,9 @@ void ImpSvNumberformatScan::Reset()
bThousand = false;
nThousand = 0;
bDecSep = false;
- nDecPos = (sal_uInt16)-1;
- nExpPos = (sal_uInt16)-1;
- nBlankPos = (sal_uInt16)-1;
+ nDecPos = sal_uInt16(-1);
+ nExpPos = sal_uInt16(-1);
+ nBlankPos = sal_uInt16(-1);
nCntPre = 0;
nCntPost = 0;
nCntExp = 0;
@@ -1634,7 +1634,7 @@ bool ImpSvNumberformatScan::InsertSymbol( sal_uInt16 & nPos, svt::NfSymbolType e
}
else
{
- if ((size_t) (nStringsCnt + 1) >= NF_MAX_FORMAT_SYMBOLS)
+ if (static_cast<size_t>(nStringsCnt + 1) >= NF_MAX_FORMAT_SYMBOLS)
{
return false;
}
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 90b66090ce48..6b8401fd5093 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -150,8 +150,8 @@ static OUString getAsciiLine( const ::rtl::ByteSequence& buf )
for( int ind = 0; ind < buf.getLength(); ind++ )
{
- outbuf[ind*2] = ( ((sal_uInt8)buf[ind]) >> 4 ) + 'a';
- outbuf[ind*2+1] = ( ((sal_uInt8)buf[ind]) & 0x0f ) + 'a';
+ outbuf[ind*2] = ( static_cast<sal_uInt8>(buf[ind]) >> 4 ) + 'a';
+ outbuf[ind*2+1] = ( static_cast<sal_uInt8>(buf[ind]) & 0x0f ) + 'a';
}
outbuf[buf.getLength()*2] = '\0';
@@ -169,7 +169,7 @@ static ::rtl::ByteSequence getBufFromAsciiLine( const OUString& line )
for( int ind = 0; ind < tmpLine.getLength()/2; ind++ )
{
- aResult[ind] = ( (sal_uInt8)( tmpLine[ind*2] - 'a' ) << 4 ) | (sal_uInt8)( tmpLine[ind*2+1] - 'a' );
+ aResult[ind] = ( static_cast<sal_uInt8>( tmpLine[ind*2] - 'a' ) << 4 ) | static_cast<sal_uInt8>( tmpLine[ind*2+1] - 'a' );
}
return aResult;
@@ -430,7 +430,7 @@ std::vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLin
unsigned char code[RTL_DIGEST_LENGTH_MD5];
for( int ind = 0; ind < RTL_DIGEST_LENGTH_MD5; ind++ )
- code[ ind ] = (char)(aMasterPasswd.copy( ind*2, 2 ).toUInt32(16));
+ code[ ind ] = static_cast<char>(aMasterPasswd.copy( ind*2, 2 ).toUInt32(16));
rtlCipherError result = rtl_cipher_init (
aDecoder, rtl_Cipher_DirectionDecode,
@@ -481,7 +481,7 @@ OUString PasswordContainer::EncodePasswords(const std::vector< OUString >& lines
unsigned char code[RTL_DIGEST_LENGTH_MD5];
for( int ind = 0; ind < RTL_DIGEST_LENGTH_MD5; ind++ )
- code[ ind ] = (char)(aMasterPasswd.copy( ind*2, 2 ).toUInt32(16));
+ code[ ind ] = static_cast<char>(aMasterPasswd.copy( ind*2, 2 ).toUInt32(16));
rtlCipherError result = rtl_cipher_init (
aEncoder, rtl_Cipher_DirectionEncode,
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index e0974e4e661f..81ac12bca7c3 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -131,7 +131,7 @@ void SfxUndoAction::dumpAsXml(xmlTextWriterPtr pWriter) const
xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("symbol"), BAD_CAST(typeid(*this).name()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("comment"), BAD_CAST(GetComment().toUtf8().getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("viewShellId"), BAD_CAST(OString::number((sal_Int32)GetViewShellId()).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("viewShellId"), BAD_CAST(OString::number(static_cast<sal_Int32>(GetViewShellId())).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("dateTime"), BAD_CAST(utl::toISO8601(m_aDateTime.GetUNODateTime()).toUtf8().getStr()));
xmlTextWriterEndElement(pWriter);
}
@@ -1289,7 +1289,7 @@ boost::property_tree::ptree lcl_ActionToJson(size_t nIndex, SfxUndoAction const
boost::property_tree::ptree aRet;
aRet.put("index", nIndex);
aRet.put("comment", pAction->GetComment().toUtf8().getStr());
- aRet.put("viewId", (sal_Int32)pAction->GetViewShellId());
+ aRet.put("viewId", static_cast<sal_Int32>(pAction->GetViewShellId()));
aRet.put("dateTime", utl::toISO8601(pAction->GetDateTime().GetUNODateTime()).toUtf8().getStr());
return aRet;
}