summaryrefslogtreecommitdiff
path: root/sot/source/sdstor/stgdir.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-17 13:14:50 +0200
committerNoel Grandin <noel@peralex.com>2016-02-23 08:08:56 +0200
commitc45d3badc96481db093560b94d8bf51ead6bd17c (patch)
tree4bb6c9220678a12b327e46ca2acd01e77fc8e2c4 /sot/source/sdstor/stgdir.cxx
parent003d0ccf902d2449320dd24119564565a384f365 (diff)
new loplugin: commaoperator
Change-Id: I03f24e61f696b7619855e3c7010aa0d874e5a4ff
Diffstat (limited to 'sot/source/sdstor/stgdir.cxx')
-rw-r--r--sot/source/sdstor/stgdir.cxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 7436764c00bd..8e8eaa08edd1 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -200,7 +200,8 @@ bool StgDirEntry::StoreStream( StgIo& rIo )
if( !m_pStgStrm )
{
OpenStream( rIo );
- delete m_pStgStrm, m_pStgStrm = nullptr;
+ delete m_pStgStrm;
+ m_pStgStrm = nullptr;
}
else
m_pStgStrm->SetSize( 0 );
@@ -532,7 +533,11 @@ bool StgDirEntry::Commit()
if( m_aEntry.GetType() == STG_STREAM )
{
if( m_pTmpStrm )
- delete m_pCurStrm, m_pCurStrm = m_pTmpStrm, m_pTmpStrm = nullptr;
+ {
+ delete m_pCurStrm;
+ m_pCurStrm = m_pTmpStrm;
+ m_pTmpStrm = nullptr;
+ }
if( m_bRemoved )
// Delete the stream if needed
if( m_pStgStrm )
@@ -616,7 +621,10 @@ bool StgDirEntry::Tmp2Strm()
{
// We did commit once, but have not written since then
if( !m_pTmpStrm )
- m_pTmpStrm = m_pCurStrm, m_pCurStrm = nullptr;
+ {
+ m_pTmpStrm = m_pCurStrm;
+ m_pCurStrm = nullptr;
+ }
if( m_pTmpStrm )
{
OSL_ENSURE( m_pStgStrm, "The pointer may not be NULL!" );