mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up StorageMode parameter of SotStorage::OpenSotStorage

Browse Source 
...which was only used to transport either STORAGE_TRANSACTED or sal_False
(i.e., 0, meaning "not STORAGE_TRANSACTED").

Change-Id: I25a894262bbefdb6c0634309bccfb1e56dad7d88
This commit is contained in:
Stephan Bergmann
2014-09-15 17:44:24 +02:00
parent ca87db7da4
commit 03043589c3
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
basic/source/basmgr/basmgr.cxx
View File

@@ -635,7 +635,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
mpImpl->mpManagerStream = new SvMemoryStream(); mpImpl->mpManagerStream = new SvMemoryStream();
static_cast<SvStream*>(&xManagerStream)->ReadStream( *mpImpl->mpManagerStream ); static_cast<SvStream*>(&xManagerStream)->ReadStream( *mpImpl->mpManagerStream );
SotStorageRef xBasicStorage = rStorage.OpenSotStorage( OUString(szBasicStorage), eStorageReadMode, sal_False ); SotStorageRef xBasicStorage = rStorage.OpenSotStorage( OUString(szBasicStorage), eStorageReadMode, false );
if( xBasicStorage.Is() && !xBasicStorage->GetError() ) if( xBasicStorage.Is() && !xBasicStorage->GetError() )
{ {
sal_uInt16 nLibs = GetLibCount(); sal_uInt16 nLibs = GetLibCount();
@@ -1065,7 +1065,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
{ {
xStorage = new SotStorage( false, aStorageName, eStorageReadMode ); xStorage = new SotStorage( false, aStorageName, eStorageReadMode );
} }
SotStorageRef xBasicStorage = xStorage->OpenSotStorage( OUString(szBasicStorage), eStorageReadMode, sal_False ); SotStorageRef xBasicStorage = xStorage->OpenSotStorage( OUString(szBasicStorage), eStorageReadMode, false );
if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
{ {
@@ -1330,7 +1330,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
if (xStorage.Is() && xStorage->IsStorage(OUString(szBasicStorage))) if (xStorage.Is() && xStorage->IsStorage(OUString(szBasicStorage)))
{ {
SotStorageRef xBasicStorage = xStorage->OpenSotStorage SotStorageRef xBasicStorage = xStorage->OpenSotStorage
( OUString(szBasicStorage), STREAM_STD_READWRITE, sal_False ); ( OUString(szBasicStorage), STREAM_STD_READWRITE, false );
if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
{ {

2
include/sot/storage.hxx
View File

@@ -196,7 +196,7 @@ public:
StorageMode = 0 ); StorageMode = 0 );
SotStorage * OpenSotStorage( const OUString & rEleName, SotStorage * OpenSotStorage( const OUString & rEleName,
StreamMode = STREAM_STD_READWRITE, StreamMode = STREAM_STD_READWRITE,
StorageMode = STORAGE_TRANSACTED ); bool transacted = true );
// Abfrage auf Storage oder Stream // Abfrage auf Storage oder Stream
virtual bool IsStream( const OUString & rEleName ) const; virtual bool IsStream( const OUString & rEleName ) const;
virtual bool IsStorage( const OUString & rEleName ) const; virtual bool IsStorage( const OUString & rEleName ) const;

5
sot/source/sdstor/storage.cxx
View File

@@ -770,15 +770,14 @@ SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName,
SotStorage * SotStorage::OpenSotStorage( const OUString & rEleName, SotStorage * SotStorage::OpenSotStorage( const OUString & rEleName,
StreamMode nMode, StreamMode nMode,
StorageMode nStorageMode ) bool transacted )
{ {
DBG_ASSERT( Owner(), "must be owner" ); DBG_ASSERT( Owner(), "must be owner" );
if( m_pOwnStg ) if( m_pOwnStg )
{ {
nMode |= STREAM_SHARE_DENYALL; nMode |= STREAM_SHARE_DENYALL;
ErrCode nE = m_pOwnStg->GetError(); ErrCode nE = m_pOwnStg->GetError();
BaseStorage * p = m_pOwnStg->OpenStorage( rEleName, nMode, BaseStorage * p = m_pOwnStg->OpenStorage(rEleName, nMode, !transacted);
(nStorageMode & STORAGE_TRANSACTED) ? false : true );
if( p ) if( p )
{ {
SotStorage * pStor = new SotStorage( p ); SotStorage * pStor = new SotStorage( p );