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

More loplugin:cstylecast: writerperfect

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: I4698e9413b00e9bfe472393bf368f6aca0fd98c0
This commit is contained in:
Stephan Bergmann
2018-01-12 20:10:13 +01:00
parent dec5264878
commit 115d39a27d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writerperfect/source/common/DocumentHandler.cxx
View File

@@ -154,7 +154,7 @@ void DocumentHandler::startElement(const char *psName, const librevenge::RVNGPro
if (keyLength==listEncodedLength[j] && strncmp(i.key(), listEncoded[j], keyLength)==0)
{
librevenge::RVNGString decodedValue("");
unescapeXML(i()->getStr().cstr(), (unsigned long) strlen(i()->getStr().cstr()), decodedValue);
unescapeXML(i()->getStr().cstr(), static_cast<unsigned long>(strlen(i()->getStr().cstr())), decodedValue);
sValue=OUString(decodedValue.cstr(), strlen(decodedValue.cstr()), RTL_TEXTENCODING_UTF8);
break;
}

16
writerperfect/source/common/WPXSvInputStream.cxx
View File

@@ -513,7 +513,7 @@ long WPXSvInputStreamImpl::tell()
const sal_Int64 tmpPosition = mxSeekable->getPosition();
if ((tmpPosition < 0) || (tmpPosition > LONG_MAX))
return -1;
return (long)tmpPosition;
return static_cast<long>(tmpPosition);
}
}
@@ -732,7 +732,7 @@ void WPXSvInputStreamImpl::invalidateReadBuffer()
{
if (mpReadBuffer)
{
seek(tell() + (long)mnReadBufferPos - (long)mnReadBufferLength);
seek(tell() + static_cast<long>(mnReadBufferPos) - static_cast<long>(mnReadBufferLength));
mpReadBuffer = nullptr;
mnReadBufferPos = 0;
mnReadBufferLength = 0;
@@ -848,12 +848,12 @@ const unsigned char *WPXSvInputStream::read(unsigned long numBytes, unsigned lon
mpImpl->invalidateReadBuffer();
}
unsigned long curpos = (unsigned long) mpImpl->tell();
if (curpos == (unsigned long)-1) // returned ERROR
unsigned long curpos = static_cast<unsigned long>(mpImpl->tell());
if (curpos == static_cast<unsigned long>(-1)) // returned ERROR
return nullptr;
if ((curpos + numBytes < curpos) /*overflow*/ ||
(curpos + numBytes >= (sal_uInt64)mpImpl->mnLength)) /*reading more than available*/
(curpos + numBytes >= static_cast<sal_uInt64>(mpImpl->mnLength))) /*reading more than available*/
{
numBytes = mpImpl->mnLength - curpos;
}
@@ -886,7 +886,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long numBytes, unsigned lon
long WPXSvInputStream::tell()
{
long retVal = mpImpl->tell();
return retVal - (long)mpImpl->mnReadBufferLength + (long)mpImpl->mnReadBufferPos;
return retVal - static_cast<long>(mpImpl->mnReadBufferLength) + static_cast<long>(mpImpl->mnReadBufferPos);
}
int WPXSvInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
@@ -909,9 +909,9 @@ int WPXSvInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
retVal = -1;
}
if (tmpOffset < mpImpl->tell() && (unsigned long)tmpOffset >= (unsigned long)mpImpl->tell() - mpImpl->mnReadBufferLength)
if (tmpOffset < mpImpl->tell() && static_cast<unsigned long>(tmpOffset) >= static_cast<unsigned long>(mpImpl->tell()) - mpImpl->mnReadBufferLength)
{
mpImpl->mnReadBufferPos = (unsigned long)(tmpOffset + (long) mpImpl->mnReadBufferLength - mpImpl->tell());
mpImpl->mnReadBufferPos = static_cast<unsigned long>(tmpOffset + static_cast<long>(mpImpl->mnReadBufferLength) - mpImpl->tell());
return retVal;
}