summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sot/storage.hxx3
-rw-r--r--sot/source/sdstor/storage.cxx7
2 files changed, 3 insertions, 7 deletions
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 23ae8d0c7b00..1c6e4912d4e3 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -184,8 +184,7 @@ public:
// create stream with connection to Storage,
// more or less a Parent-Child relationship
SotStorageStream * OpenSotStream( const OUString & rEleName,
- StreamMode = STREAM_STD_READWRITE,
- StorageMode = StorageMode::Default );
+ StreamMode = STREAM_STD_READWRITE );
SotStorage * OpenSotStorage( const OUString & rEleName,
StreamMode = STREAM_STD_READWRITE,
bool transacted = true );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 8a540237d9ab..4c819a754a21 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -681,10 +681,8 @@ bool SotStorage::Commit()
}
SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName,
- StreamMode nMode,
- StorageMode nStorageMode )
+ StreamMode nMode )
{
- DBG_ASSERT( nStorageMode == StorageMode::Default, "StorageModes ignored" );
SotStorageStream * pStm = NULL;
DBG_ASSERT( Owner(), "must be owner" );
if( m_pOwnStg )
@@ -693,8 +691,7 @@ SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName,
// egal was kommt, nur exclusiv gestattet
nMode |= StreamMode::SHARE_DENYALL;
ErrCode nE = m_pOwnStg->GetError();
- BaseStorageStream * p = m_pOwnStg->OpenStream( rEleName, nMode,
- !(nStorageMode & StorageMode::Transacted) );
+ BaseStorageStream * p = m_pOwnStg->OpenStream( rEleName, nMode, true );
pStm = new SotStorageStream( p );
if( !nE )