diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-15 12:23:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-16 07:26:27 +0100 |
| commit | a2751c0795cdac9d78f8919aab319a418b6e0bbc (patch) | |
| tree | 1396e27bd0e86536b9a29f08192f3d7eaeff2c8a /sot | |
| parent | a04340a08c9f2a0e7208f3109fbcc97ab19fccb3 (diff) | |
loplugin:staticmethods improvement
Change-Id: I8889ce8a7d2309b54454cfe4c6421282e1c6e755
Reviewed-on: https://gerrit.libreoffice.org/63434
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stg.cxx | 14 | ||||
| -rw-r--r-- | sot/source/sdstor/stgdir.hxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 169c7cb84138..435cfa2e80c4 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -554,7 +554,7 @@ BaseStorage* Storage::OpenStorage( const OUString& rName, StreamMode m, bool bDi if( bDirect && !pEntry->m_bDirect ) bDirect = false; - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); if( !p ) { if( !( m & StreamMode::NOCREATE ) ) @@ -605,7 +605,7 @@ BaseStorageStream* Storage::OpenStream( const OUString& rName, StreamMode m, boo { if( !Validate() || !ValidateMode( m ) ) return new StorageStream( pIo, nullptr, m ); - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); bool bTemp = false; if( !p ) { @@ -650,7 +650,7 @@ void Storage::Remove( const OUString& rName ) { if( !Validate( true ) ) return; - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); if( p ) { p->Invalidate( true ); @@ -667,7 +667,7 @@ bool Storage::CopyTo( const OUString& rElem, BaseStorage* pDest, const OUString& { if( !Validate() || !pDest || !pDest->Validate( true ) ) return false; - StgDirEntry* pElem = pIo->m_pTOC->Find( *pEntry, rElem ); + StgDirEntry* pElem = StgDirStrm::Find( *pEntry, rElem ); if( pElem ) { if( pElem->m_aEntry.GetType() == STG_STORAGE ) @@ -755,7 +755,7 @@ bool Storage::IsStorage( const OUString& rName ) const { if( Validate() ) { - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); if( p ) return p->m_aEntry.GetType() == STG_STORAGE; } @@ -766,7 +766,7 @@ bool Storage::IsStream( const OUString& rName ) const { if( Validate() ) { - StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); + StgDirEntry* p = StgDirStrm::Find( *pEntry, rName ); if( p ) return p->m_aEntry.GetType() == STG_STREAM; } @@ -776,7 +776,7 @@ bool Storage::IsStream( const OUString& rName ) const bool Storage::IsContained( const OUString& rName ) const { if( Validate() ) - return pIo->m_pTOC->Find( *pEntry, rName ) != nullptr; + return StgDirStrm::Find( *pEntry, rName ) != nullptr; else return false; } diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx index b4f1035c0078..b0d2c43cf511 100644 --- a/sot/source/sdstor/stgdir.hxx +++ b/sot/source/sdstor/stgdir.hxx @@ -96,7 +96,7 @@ public: bool Store(); void* GetEntry( sal_Int32 n, bool );// get an entry StgDirEntry* GetRoot() { return m_pRoot; } - StgDirEntry* Find( StgDirEntry&, const OUString& ); + static StgDirEntry* Find( StgDirEntry&, const OUString& ); StgDirEntry* Create( StgDirEntry&, const OUString&, StgEntryType ); }; |