From face6b697741a94c2f445d745a279f9033c64258 Mon Sep 17 00:00:00 2001 From: Arnaud Versini Date: Sun, 7 Aug 2016 20:49:19 +0200 Subject: TOOLS: Remove SvStream::ImpInit() Change-Id: I7a089e77586041bce662c33a5610df122d5a74be Reviewed-on: https://gerrit.libreoffice.org/27940 Tested-by: Jenkins Reviewed-by: Noel Grandin --- tools/source/stream/stream.cxx | 60 ++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 32 deletions(-) (limited to 'tools') diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index cca67de48127..d778180c4594 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -309,45 +309,46 @@ void SvStream::SetSize(sal_uInt64 const nSize) m_nError = m_xLockBytes->SetSize( nSize ); } -void SvStream::ImpInit() -{ - m_nActPos = 0; - m_nCompressMode = SvStreamCompressFlags::NONE; - m_eStreamCharSet = osl_getThreadTextEncoding(); - m_nCryptMask = 0; - m_isEof = false; +SvStream::SvStream() : + m_nActPos(0) + + , m_pRWBuf(nullptr) + , m_pBufPos(nullptr) + , m_nBufSize(0) + , m_nBufActualLen(0) + , m_nBufActualPos(0) + , m_nBufFree(0) + , m_isIoRead(false) + , m_isIoWrite(false) + + , m_isDirty(false) + , m_isConsistent(true) + , m_isEof(false) + + , m_nCompressMode(SvStreamCompressFlags::NONE) #if defined UNX - m_eLineDelimiter = LINEEND_LF; // UNIX-Format + , m_eLineDelimiter(LINEEND_LF) // UNIX-Format #else - m_eLineDelimiter = LINEEND_CRLF; // DOS-Format + , m_eLineDelimiter(LINEEND_CRLF) // DOS-Format #endif + , m_eStreamCharSet(osl_getThreadTextEncoding()) - SetEndian( SvStreamEndian::LITTLE ); - - m_nBufFilePos = 0; - m_nBufActualPos = 0; - m_isDirty = false; - m_isConsistent = true; - m_isWritable = true; + , m_nCryptMask(0) - m_pRWBuf = nullptr; - m_pBufPos = nullptr; - m_nBufSize = 0; - m_nBufActualLen = 0; - m_isIoRead = false; - m_isIoWrite = false; - m_nBufFree = 0; + , m_nVersion(0) - m_eStreamMode = StreamMode::NONE; + , m_nBufFilePos(0) + , m_eStreamMode(StreamMode::NONE) + , m_isWritable(true) - m_nVersion = 0; +{ + SetEndian( SvStreamEndian::LITTLE ); ClearError(); } -SvStream::SvStream( SvLockBytes* pLockBytesP ) +SvStream::SvStream( SvLockBytes* pLockBytesP ) : SvStream() { - ImpInit(); m_xLockBytes = pLockBytesP; if( pLockBytesP ) { const SvStream* pStrm = pLockBytesP->GetStream(); @@ -358,11 +359,6 @@ SvStream::SvStream( SvLockBytes* pLockBytesP ) SetBufferSize( 256 ); } -SvStream::SvStream() -{ - ImpInit(); -} - SvStream::~SvStream() { if (m_xLockBytes.Is()) -- cgit