strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TOOLS: Remove SvStream::ImpInit()

Browse source 
Change-Id: I7a089e77586041bce662c33a5610df122d5a74be
Reviewed-on: https://gerrit.libreoffice.org/27940
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Arnaud Versini 2016-08-07 20:49:19 +02:00 committed by Noel Grandin
parent 6bca505449
commit face6b6977
2 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/tools/stream.hxx
View file

@ -176,9 +176,6 @@ private:
// Userdata
long m_nVersion; // for external use
// helper methods
TOOLS_DLLPRIVATE void ImpInit();
SvStream ( const SvStream& rStream ) = delete;
SvStream& operator=( const SvStream& rStream ) = delete;

64
tools/source/stream/stream.cxx
View file

@ -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())
, m_nCryptMask(0)
, m_nVersion(0)
, m_nBufFilePos(0)
, m_eStreamMode(StreamMode::NONE)
, m_isWritable(true)
{
SetEndian( SvStreamEndian::LITTLE );
m_nBufFilePos = 0;
m_nBufActualPos = 0;
m_isDirty = false;
m_isConsistent = true;
m_isWritable = true;
m_pRWBuf = nullptr;
m_pBufPos = nullptr;
m_nBufSize = 0;
m_nBufActualLen = 0;
m_isIoRead = false;
m_isIoWrite = false;
m_nBufFree = 0;
m_eStreamMode = StreamMode::NONE;
m_nVersion = 0;
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())