Clean up StorageMode parameter of SotStorage::OpenSotStorage

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

Change-Id: I25a894262bbefdb6c0634309bccfb1e56dad7d88

3 files changed, 6 insertions, 7 deletions

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 3cbfb1c8d7bb..9563b5761f48 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -635,7 +635,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
         mpImpl->mpManagerStream = new SvMemoryStream();
         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() )
         {
             sal_uInt16 nLibs = GetLibCount();
@@ -1065,7 +1065,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
     {
         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() )
     {
@@ -1330,7 +1330,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
         if (xStorage.Is() && xStorage->IsStorage(OUString(szBasicStorage)))
         {
             SotStorageRef xBasicStorage = xStorage->OpenSotStorage
-                            ( OUString(szBasicStorage), STREAM_STD_READWRITE, sal_False );
+                            ( OUString(szBasicStorage), STREAM_STD_READWRITE, false );
 
             if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
             {
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index d1bdab7d470a..ce8466dd3e7a 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -196,7 +196,7 @@ public:
                                        StorageMode = 0 );
     SotStorage *        OpenSotStorage( const OUString & rEleName,
                                         StreamMode = STREAM_STD_READWRITE,
-                                        StorageMode = STORAGE_TRANSACTED );
+                                        bool transacted = true );
                         // Abfrage auf Storage oder Stream
     virtual bool        IsStream( const OUString & rEleName ) const;
     virtual bool        IsStorage( const OUString & rEleName ) const;
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 9cc42045f21f..0294a6ca4ea4 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -770,15 +770,14 @@ SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName,
 
 SotStorage * SotStorage::OpenSotStorage( const OUString & rEleName,
                                          StreamMode nMode,
-                                         StorageMode nStorageMode )
+                                         bool transacted )
 {
     DBG_ASSERT( Owner(), "must be owner" );
     if( m_pOwnStg )
     {
         nMode |= STREAM_SHARE_DENYALL;
         ErrCode nE = m_pOwnStg->GetError();
-        BaseStorage * p = m_pOwnStg->OpenStorage( rEleName, nMode,
-                        (nStorageMode & STORAGE_TRANSACTED) ? false : true );
+        BaseStorage * p = m_pOwnStg->OpenStorage(rEleName, nMode, !transacted);
         if( p )
         {
             SotStorage * pStor = new SotStorage( p );