summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-29 10:40:50 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-08-01 06:05:58 +0000
commit069d71b72566a0b8f234304d3bd4511ee86b6c60 (patch)
treea345f45ff5e987b81fa89a16103a9420a137a238 /sot
parent4475c191de479e7a5ddb20d14bc3aa32b0ab84d3 (diff)
loplugin:countusersofdefaultparams in shell..starmath
Change-Id: I553d1b031b8d261a1caa8b77a8d687af21a6f8d6 Reviewed-on: https://gerrit.libreoffice.org/27672 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sot')
-rw-r--r--sot/source/sdstor/stg.cxx2
-rw-r--r--sot/source/sdstor/stgdir.cxx2
-rw-r--r--sot/source/sdstor/stgdir.hxx6
-rw-r--r--sot/source/sdstor/ucbstorage.cxx4
4 files changed, 7 insertions, 7 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 421626363feb..ab256fd1a628 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -495,7 +495,7 @@ Storage::~Storage()
if( pEntry->m_nRefCnt && pEntry->m_bDirect && (m_nMode & StreamMode::WRITE) )
Commit();
if( pEntry->m_nRefCnt == 1 )
- pEntry->Invalidate();
+ pEntry->Invalidate(false);
}
// close the stream is root storage
if( bIsRoot )
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index dacd8909d586..a4c682df3855 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -760,7 +760,7 @@ StgDirStrm::~StgDirStrm()
void StgDirStrm::SetupEntry( sal_Int32 n, StgDirEntry* pUpper )
{
- void* p = ( n == STG_FREE ) ? nullptr : GetEntry( n );
+ void* p = ( n == STG_FREE ) ? nullptr : GetEntry( n, false );
if( p )
{
SvStream *pUnderlyingStream = m_rIo.GetStrm();
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index cecbba46fa89..794049ffa692 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -67,8 +67,8 @@ public:
explicit StgDirEntry( const StgEntry& );
virtual ~StgDirEntry();
- void Invalidate( bool=false ); // invalidate all open entries
- void Enum( sal_Int32& ); // enumerate entries for iteration
+ void Invalidate( bool ); // invalidate all open entries
+ void Enum( sal_Int32& ); // enumerate entries for iteration
void DelTemp( bool ); // delete temporary entries
bool Store( StgDirStrm& ); // save entry into dir strm
bool IsContained( StgDirEntry* ); // check if subentry
@@ -99,7 +99,7 @@ public:
virtual ~StgDirStrm();
virtual bool SetSize( sal_Int32 ) override; // change the size
bool Store();
- void* GetEntry( sal_Int32 n, bool=false );// get an entry
+ void* GetEntry( sal_Int32 n, bool );// get an entry
StgDirEntry* GetRoot() { return m_pRoot; }
StgDirEntry* Find( StgDirEntry&, const OUString& );
StgDirEntry* Create( StgDirEntry&, const OUString&, StgEntryType );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 0a12fc8a935b..b61053976f73 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -507,7 +507,7 @@ public:
bool Revert();
bool Insert( ::ucbhelper::Content *pContent );
UCBStorage_Impl* OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect );
- void OpenStream( UCBStorageElement_Impl*, StreamMode, bool, const OString* pKey=nullptr );
+ void OpenStream( UCBStorageElement_Impl*, StreamMode, bool, const OString* pKey );
void SetProps( const Sequence < Sequence < PropertyValue > >& rSequence, const OUString& );
void GetProps( sal_Int32&, Sequence < Sequence < PropertyValue > >& rSequence, const OUString& );
sal_Int32 GetObjectCount();
@@ -1815,7 +1815,7 @@ void UCBStorage_Impl::ReadContent()
else if ( aMediaType.isEmpty() )
{
// older files didn't have that special content type, so they must be detected
- OpenStream( pElement, STREAM_STD_READ, m_bDirect );
+ OpenStream( pElement, STREAM_STD_READ, m_bDirect, nullptr );
if ( Storage::IsStorageFile( pElement->m_xStream ) )
pElement->m_bIsStorage = true;
else