Unwind SotStorageRef typedef

Change-Id: I8d5363bb2ad813ef29b4078848914f4b0989b9f1

3 files changed, 9 insertions, 9 deletions

diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 9da674b4c603..fce1ee00030d 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -427,7 +427,7 @@ namespace basic
             OUString aAppBasicDir = SvtPathOptions().GetBasicPath();
 
             // Storage and BaseURL are only needed by binary documents!
-            SotStorageRef xDummyStor = new SotStorage( OUString() );
+            tools::SvRef<SotStorage> xDummyStor = new SotStorage( OUString() );
             _out_rpBasicManager = new BasicManager( *xDummyStor, OUString() /* TODO/LATER: xStorage */,
                                                                 pAppBasic,
                                                                 &aAppBasicDir, true );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index a01d2e09f3d6..bd8c61c81783 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -550,7 +550,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, false );
+        tools::SvRef<SotStorage> xBasicStorage = rStorage.OpenSotStorage( OUString(szBasicStorage), eStorageReadMode, false );
         if( xBasicStorage.Is() && !xBasicStorage->GetError() )
         {
             sal_uInt16 nLibs = GetLibCount();
@@ -877,7 +877,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
             aLibRelStorage = aLibRelStorage.smartRel2Abs( aLibRelStorageName, bWasAbsolute);
             DBG_ASSERT(!bWasAbsolute, "RelStorageName was absolute!" );
 
-            SotStorageRef xStorageRef;
+            tools::SvRef<SotStorage> xStorageRef;
             if ( aLibAbsStorage == aCurStorage || aLibRelStorageName == szImbedded )
             {
                 xStorageRef = &rStorage;
@@ -960,7 +960,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
     {
         aStorageName = GetStorageName();
     }
-    SotStorageRef xStorage;
+    tools::SvRef<SotStorage> xStorage;
     // The current must not be opened again...
     if ( pCurStorage )
     {
@@ -983,7 +983,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
     {
         xStorage = new SotStorage( false, aStorageName, eStorageReadMode );
     }
-    SotStorageRef xBasicStorage = xStorage->OpenSotStorage( OUString(szBasicStorage), eStorageReadMode, false );
+    tools::SvRef<SotStorage> xBasicStorage = xStorage->OpenSotStorage( OUString(szBasicStorage), eStorageReadMode, false );
 
     if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
     {
@@ -1228,7 +1228,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
     if ( bDelBasicFromStorage && !itLibInfo->IsReference() &&
             ( !itLibInfo->IsExtern() || SotStorage::IsStorageFile( itLibInfo->GetStorageName() ) ) )
     {
-        SotStorageRef xStorage;
+        tools::SvRef<SotStorage> xStorage;
         try
         {
             if (!itLibInfo->IsExtern())
@@ -1247,7 +1247,7 @@ bool BasicManager::RemoveLib( sal_uInt16 nLib, bool bDelBasicFromStorage )
 
         if (xStorage.Is() && xStorage->IsStorage(OUString(szBasicStorage)))
         {
-            SotStorageRef xBasicStorage = xStorage->OpenSotStorage
+            tools::SvRef<SotStorage> xBasicStorage = xStorage->OpenSotStorage
                             ( OUString(szBasicStorage), STREAM_STD_READWRITE, false );
 
             if ( !xBasicStorage.Is() || xBasicStorage->GetError() )
@@ -1421,7 +1421,7 @@ StarBASIC* BasicManager::CreateLib( const OUString& rLibName, const OUString& Pa
         {
             try
             {
-                SotStorageRef xStorage = new SotStorage(false, LinkTargetURL, StreamMode::READ | StreamMode::SHARE_DENYWRITE);
+                tools::SvRef<SotStorage> xStorage = new SotStorage(false, LinkTargetURL, StreamMode::READ | StreamMode::SHARE_DENYWRITE);
                 if (!xStorage->GetError())
                 {
                     pLib = AddLib(*xStorage, rLibName, true);
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index cedd2e553eeb..ae1b9bf4e78e 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -362,7 +362,7 @@ SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl()
 void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const OUString& aFile )
 {
     // TODO: move loading from old storage to binary filters?
-    SotStorageRef xStorage = new SotStorage( false, aFile );
+    tools::SvRef<SotStorage> xStorage = new SotStorage( false, aFile );
     if( xStorage.Is() && xStorage->GetError() == ERRCODE_NONE )
     {
         BasicManager* pBasicManager = new BasicManager( *(SotStorage*)xStorage, aFile );