diff options
Diffstat (limited to 'sot/source')
| -rw-r--r-- | sot/source/sdstor/stg.cxx | 5 | ||||
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 26703ff5fd15..fefd677b1bb6 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -601,11 +601,8 @@ BaseStorage* Storage::OpenStorage( const OUString& rName, StreamMode m, bool bDi // Open a stream -BaseStorageStream* Storage::OpenStream( const OUString& rName, StreamMode m, bool, - const OString* pB ) +BaseStorageStream* Storage::OpenStream( const OUString& rName, StreamMode m, bool ) { - DBG_ASSERT(!pB, "Encryption not supported"); - if( !Validate() || !ValidateMode( m ) ) return new StorageStream( pIo, nullptr, m ); StgDirEntry* p = pIo->m_pTOC->Find( *pEntry, rName ); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 7ea86ab09978..1056ce20dcf0 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -2615,7 +2615,7 @@ bool UCBStorage::Revert() return pImp->Revert(); } -BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode nMode, bool bDirect, const OString* pKey ) +BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode nMode, bool bDirect ) { if( rEleName.isEmpty() ) return nullptr; @@ -2631,7 +2631,7 @@ BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode OUString aName( pImp->m_aURL ); aName += "/"; aName += rEleName; - UCBStorageStream* pStream = new UCBStorageStream( aName, nMode, bDirect, pKey, pImp->m_bRepairPackage, pImp->m_xProgressHandler ); + UCBStorageStream* pStream = new UCBStorageStream( aName, nMode, bDirect, nullptr, pImp->m_bRepairPackage, pImp->m_xProgressHandler ); pStream->SetError( GetError() ); pStream->pImp->m_aName = rEleName; return pStream; @@ -2662,8 +2662,6 @@ BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode // check if stream is opened with the same keyword as before // if not, generate a new stream because it could be encrypted vs. decrypted! OString aKey; - if ( pKey ) - aKey = *pKey; if ( pElement->m_xStream->m_aKey == aKey ) { pElement->m_xStream->PrepareCachedForReopen( nMode ); @@ -2674,7 +2672,7 @@ BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode } // stream is opened the first time - pImp->OpenStream( pElement, nMode, bDirect, pKey ); + pImp->OpenStream( pElement, nMode, bDirect, nullptr ); // if name has been changed before creating the stream: set name! pElement->m_xStream->m_aName = rEleName; |