[Libreoffice-commits] core.git: include/tools tools/source

[Arnaud Versini]

 include/tools/stream.hxx       |    3 --
 tools/source/stream/stream.cxx |   60 +++++++++++++++++++----------------------
 2 files changed, 28 insertions(+), 35 deletions(-)

New commits:
commit face6b697741a94c2f445d745a279f9033c64258
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date:   Sun Aug 7 20:49:19 2016 +0200

    TOOLS: Remove SvStream::ImpInit()
    
    Change-Id: I7a089e77586041bce662c33a5610df122d5a74be
    Reviewed-on: https://gerrit.libreoffice.org/27940
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index d9cf3d2..1268eab 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -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;
 
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index cca67de..d778180 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())