summaryrefslogtreecommitdiff
path: root/writerperfect/source/common/WPXSvInputStream.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'writerperfect/source/common/WPXSvInputStream.cxx')
-rw-r--r--writerperfect/source/common/WPXSvInputStream.cxx42
1 files changed, 21 insertions, 21 deletions
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 99a01069a43e..52d5824530ee 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -254,7 +254,7 @@ tools::SvRef<SotStorageStream> OLEStorageImpl::createStream(const rtl::OUString
const OLEStorageMap_t::const_iterator aIt = maStorageMap.find(aDir);
if (maStorageMap.end() == aIt)
- return 0;
+ return nullptr;
return aIt->second.ref->OpenSotStream(aName, STREAM_STD_READ);
}
@@ -452,7 +452,7 @@ WPXSvInputStreamImpl::WPXSvInputStreamImpl(Reference< XInputStream > xStream) :
mbCheckedOLE(false),
mbCheckedZip(false),
mnLength(0),
- mpReadBuffer(0),
+ mpReadBuffer(nullptr),
mnReadBufferLength(0),
mnReadBufferPos(0)
{
@@ -488,11 +488,11 @@ const unsigned char *WPXSvInputStreamImpl::read(unsigned long numBytes, unsigned
numBytesRead = 0;
if (numBytes == 0 || isEnd())
- return 0;
+ return nullptr;
numBytesRead = mxStream->readSomeBytes(maData, numBytes);
if (numBytesRead == 0)
- return 0;
+ return nullptr;
return reinterpret_cast<const unsigned char *>(maData.getConstArray());
}
@@ -584,7 +584,7 @@ unsigned WPXSvInputStreamImpl::subStreamCount()
const char *WPXSvInputStreamImpl::subStreamName(const unsigned id)
{
if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is())
- return 0;
+ return nullptr;
PositionHolder pos(mxSeekable);
mxSeekable->seek(0);
@@ -594,7 +594,7 @@ const char *WPXSvInputStreamImpl::subStreamName(const unsigned id)
ensureOLEIsInitialized();
if (mpOLEStorage->maStreams.size() <= id)
- return 0;
+ return nullptr;
return mpOLEStorage->maStreams[id].name.getStr();
}
@@ -606,12 +606,12 @@ const char *WPXSvInputStreamImpl::subStreamName(const unsigned id)
ensureZipIsInitialized();
if (mpZipStorage->maStreams.size() <= id)
- return 0;
+ return nullptr;
return mpZipStorage->maStreams[id].aName.getStr();
}
- return 0;
+ return nullptr;
}
bool WPXSvInputStreamImpl::existsSubStream(const char *const name)
@@ -647,10 +647,10 @@ bool WPXSvInputStreamImpl::existsSubStream(const char *const name)
librevenge::RVNGInputStream *WPXSvInputStreamImpl::getSubStreamByName(const char *const name)
{
if (!name)
- return 0;
+ return nullptr;
if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is())
- return 0;
+ return nullptr;
PositionHolder pos(mxSeekable);
mxSeekable->seek(0);
@@ -679,13 +679,13 @@ librevenge::RVNGInputStream *WPXSvInputStreamImpl::getSubStreamByName(const char
}
}
- return 0;
+ return nullptr;
}
librevenge::RVNGInputStream *WPXSvInputStreamImpl::getSubStreamById(const unsigned id)
{
if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is())
- return 0;
+ return nullptr;
PositionHolder pos(mxSeekable);
mxSeekable->seek(0);
@@ -695,7 +695,7 @@ librevenge::RVNGInputStream *WPXSvInputStreamImpl::getSubStreamById(const unsign
ensureOLEIsInitialized();
if (mpOLEStorage->maStreams.size() <= id)
- return 0;
+ return nullptr;
return createWPXStream(mpOLEStorage->getStream(id));
}
@@ -707,7 +707,7 @@ librevenge::RVNGInputStream *WPXSvInputStreamImpl::getSubStreamById(const unsign
ensureZipIsInitialized();
if (mpZipStorage->maStreams.size() <= id)
- return 0;
+ return nullptr;
try
{
@@ -718,7 +718,7 @@ librevenge::RVNGInputStream *WPXSvInputStreamImpl::getSubStreamById(const unsign
// nothing needed
}
}
- return 0;
+ return nullptr;
}
void WPXSvInputStreamImpl::invalidateReadBuffer()
@@ -726,7 +726,7 @@ void WPXSvInputStreamImpl::invalidateReadBuffer()
if (mpReadBuffer)
{
seek((long) tell() + (long)mnReadBufferPos - (long)mnReadBufferLength);
- mpReadBuffer = 0;
+ mpReadBuffer = nullptr;
mnReadBufferPos = 0;
mnReadBufferLength = 0;
}
@@ -739,7 +739,7 @@ librevenge::RVNGInputStream *WPXSvInputStreamImpl::createWPXStream(const tools::
Reference < XInputStream > xContents(new utl::OSeekableInputStreamWrapper(rxStorage));
return new WPXSvInputStream(xContents);
}
- return 0;
+ return nullptr;
}
librevenge::RVNGInputStream *WPXSvInputStreamImpl::createWPXStream(const Reference<XInputStream> &rxStream)
@@ -747,7 +747,7 @@ librevenge::RVNGInputStream *WPXSvInputStreamImpl::createWPXStream(const Referen
if (rxStream.is())
return new WPXSvInputStream(rxStream);
else
- return 0;
+ return nullptr;
}
bool WPXSvInputStreamImpl::isOLE()
@@ -827,7 +827,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long numBytes, unsigned lon
numBytesRead = 0;
if (numBytes == 0 || numBytes > (std::numeric_limits<unsigned long>::max)()/2)
- return 0;
+ return nullptr;
if (mpImpl->mpReadBuffer)
{
@@ -844,7 +844,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long numBytes, unsigned lon
unsigned long curpos = (unsigned long) mpImpl->tell();
if (curpos == (unsigned long)-1) // returned ERROR
- return 0;
+ return nullptr;
if ((curpos + numBytes < curpos) /*overflow*/ ||
(curpos + numBytes >= (sal_uInt64)mpImpl->mnLength)) /*reading more than available*/
@@ -869,7 +869,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long numBytes, unsigned lon
mpImpl->mnReadBufferPos = 0;
if (!mpImpl->mnReadBufferLength)
- return 0;
+ return nullptr;
numBytesRead = numBytes;