[Libreoffice-commits] core.git: sot/source

[Jochen Nitschke]

 sot/source/sdstor/stgstrms.cxx |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit ffafd5e4a0c02fdcf47674866a9428a2158c0ae4
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Jan 22 11:06:44 2017 +0100

    cppcheck: useInitializationList
    
    don't initialise the unique_ptr m_pFat twice
    
    Change-Id: Ifa4d9b68756c89c76a1be5803e84526dcfa2c1e7
    Reviewed-on: https://gerrit.libreoffice.org/33390
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 3503421..8f6f584 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -318,14 +318,16 @@ bool StgFAT::FreePages( sal_Int32 nStart, bool bAll )
 // and accessing the data on a physical basis. It uses the built-in
 // FAT class for the page allocations.
 
-StgStrm::StgStrm( StgIo& r ) : m_rIo( r )
+StgStrm::StgStrm( StgIo& r )
+    : m_rIo(r),
+      m_pEntry(nullptr),
+      m_nStart(STG_EOF),
+      m_nSize(0),
+      m_nPos(0),
+      m_nPage(STG_EOF),
+      m_nOffset(0),
+      m_nPageSize(m_rIo.GetPhysPageSize())
 {
-    m_pFat    = nullptr;
-    m_nStart  = m_nPage = STG_EOF;
-    m_nOffset = 0;
-    m_pEntry  = nullptr;
-    m_nPos = m_nSize = 0;
-    m_nPageSize = m_rIo.GetPhysPageSize();
 }
 
 StgStrm::~StgStrm()