Remove SvStorage alias

Change-Id: Id07ace147ff4fd4a17d05ba3cce6408def05c9c7

25 files changed, 40 insertions, 42 deletions

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 456245cb666b..062d9e050026 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2446,7 +2446,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
         sShareAutoCorrFile = sUserAutoCorrFile;
 }
 
-bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
+bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SotStorage& rStg )
 {
     OUString sStrmName( pXMLImplAutocorr_ListStr, strlen(pXMLImplAutocorr_ListStr), RTL_TEXTENCODING_MS_1252 );
     bool bRet = true, bRemove = !pAutocorr_List || pAutocorr_List->empty();
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index c647141d40ec..65f185b7d556 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -117,7 +117,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( const com::sun::star::uno::Referenc
     ExportOLEObject( aObj, rDestStg );
 }
 
-void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvStorage& rDestStg )
+void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotStorage& rDestStg )
 {
     SvGlobalName aOwnGlobalName;
     SvGlobalName aObjName( rObj->getClassID() );
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index dab0f2a07770..de876198ca7e 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -87,7 +87,7 @@ enum SbxDataType {
 
     SbxSV1 = 128,        // first defined data type for StarView
     SbxMEMORYSTREAM,     // SvMemoryStream
-    SbxSTORAGE,          // SvStorage
+    SbxSTORAGE,          // SotStorage
 
     SbxUSER1  = 256,     // first user defined data type
     SbxUSERn  = 2047     // last user defined data type
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 3ce2e978fb6a..3c6f46ed8f5a 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -47,7 +47,7 @@ template<> struct typed_flags<StorageMode>: is_typed_flags<StorageMode, 0xC4>
 
 }
 
-class SvStorage;
+class SotStorage;
 
 enum class SotClipboardFormatId : sal_uLong;
 
@@ -106,7 +106,7 @@ class  UNOStorageHolder;
 class SOT_DLLPUBLIC SotStorage : virtual public SotObject
 {
 friend class SotStorageStream;
-friend class SvStorage;
+friend class SotStorage;
 
     BaseStorage *   m_pOwnStg;   // target storage
     SvStream *      m_pStorStm;  // only for SDSTORAGES
@@ -219,8 +219,6 @@ public:
 typedef tools::SvRef<SotStorage> SotStorageRef;
 #endif
 
-#define SvStorage SotStorage
-
 #endif // _SVSTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx
index 4820bfcb2635..1793a68a7239 100644
--- a/include/sot/storinfo.hxx
+++ b/include/sot/storinfo.hxx
@@ -29,14 +29,14 @@
 class StgDirEntry;
 class SvStorageInfo
 {
-friend class SvStorage;
+friend class SotStorage;
     OUString        aName;
     SvGlobalName    aClassName;
     sal_uLong       nSize;
     bool            bStream;
     bool            bStorage;
 
-                            SvStorageInfo(){}; // Fuer SvStorage
+                            SvStorageInfo(){}; // Fuer SotStorage
 public:
                             SvStorageInfo( const StgDirEntry& );
                             SvStorageInfo( const OUString& rName, sal_uLong nSz, bool bIsStorage )
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 8688b6126531..091d46c2c116 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1278,13 +1278,13 @@ void PPTWriter::ImplWriteOLE( )
                     ::uno::Reference < embed::XEmbeddedObject > xObj( static_cast<SdrOle2Obj*>(pSdrObj)->GetObjRef() );
                     if( xObj.is() )
                     {
-                        SotStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), true ) );
+                        SotStorageRef xTempStorage( new SotStorage( new SvMemoryStream(), true ) );
                         aOleExport.ExportOLEObject( xObj, *xTempStorage );
 
                         //TODO/MBA: testing
                         OUString aPersistStream( SVEXT_PERSIST_STREAM );
                         SvMemoryStream aStream;
-                        SotStorageRef xCleanStorage( new SvStorage( false, aStream ) );
+                        SotStorageRef xCleanStorage( new SotStorage( false, aStream ) );
                         xTempStorage->CopyTo( xCleanStorage );
                         // create a dummy content stream, the dummy content is necessary for ppt, but not for
                         // doc files, so we can't share code.
@@ -1311,7 +1311,7 @@ void PPTWriter::ImplWriteOLE( )
                     OUString aName;
                     //Initialize the graphic size which will be used on export
                     ::com::sun::star::awt::Size  aSize( pPtr->xShape->getSize() );
-                    SotStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) );
+                    SotStorageRef xDest( new SotStorage( new SvMemoryStream(), true ) );
                     bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName );
                     if ( bOk )
                         pStrm = xDest->CreateMemoryStream();
@@ -1462,7 +1462,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector<
 
 extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
 {
-    SotStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) );
+    SotStorageRef xDest( new SotStorage( new SvMemoryStream(), true ) );
     SvxImportMSVBasic aMSVBas( rDocShell, *xDest );
     aMSVBas.SaveOrDelMSVBAStorage( true, OUString( "_MS_VBA_Overhead" ) );
 
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 248a2f314be5..7e0ba731b1d8 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2505,7 +2505,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
 
                 ::com::sun::star::awt::Size     aSize;
                 OUString          aControlName;
-                SotStorageRef    xTemp( new SvStorage( new SvMemoryStream(), true ) );
+                SotStorageRef    xTemp( new SotStorage( new SvMemoryStream(), true ) );
                 if ( oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xTemp, aXControlModel, aSize, aControlName ) )
                 {
                     OUString aUserName( xTemp->GetUserName() );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 09dacec14653..f563563bd8be 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -96,7 +96,7 @@
 
 using namespace ::com::sun::star;
 
-SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium )
+SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SotStorage& rStorage, SfxMedium& rMedium )
 {
 
     sal_uInt32 nImportFlags = 0;
@@ -165,7 +165,7 @@ SdPPTImport::~SdPPTImport()
     delete pFilter;
 }
 
-ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage_, SfxMedium& rMedium, PowerPointImportParam& rParam )
+ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SotStorage& rStorage_, SfxMedium& rMedium, PowerPointImportParam& rParam )
     : SdrPowerPointImport(rParam, rMedium.GetBaseURL())
     , mrMed(rMedium)
     , mrStorage(rStorage_)
@@ -2678,7 +2678,7 @@ ImplSdPPTImport::ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Ref
 
 // exported function
 extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT(
-        SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium )
+        SdDrawDocument* pDocument, SvStream& rDocStream, SotStorage& rStorage, SfxMedium& rMedium )
 {
     SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage, rMedium );
     bool bRet = pImport->Import();
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index d9c0382b19b3..4c90a682c7f3 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -48,7 +48,7 @@ typedef std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > tAnimationVect
 class ImplSdPPTImport : public SdrPowerPointImport
 {
     SfxMedium&      mrMed;
-    SvStorage&      mrStorage;
+    SotStorage&      mrStorage;
 //  SvStream*       mpPicStream;
     DffRecordHeader maDocHd;
     std::vector<OUString> maSlideNameList;
@@ -74,7 +74,7 @@ public:
     OUString        ReadSound( sal_uInt32 nSoundRef ) const;
     OUString        ReadMedia( sal_uInt32 nMediaRef ) const;
 
-    ImplSdPPTImport( SdDrawDocument* pDoc, SvStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& );
+    ImplSdPPTImport( SdDrawDocument* pDoc, SotStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& );
     virtual ~ImplSdPPTImport();
 
     bool         Import();
@@ -87,7 +87,7 @@ class SdPPTImport
 
     public:
 
-        SdPPTImport( SdDrawDocument* pDoc, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMed );
+        SdPPTImport( SdDrawDocument* pDoc, SvStream& rDocStream, SotStorage& rStorage, SfxMedium& rMed );
         ~SdPPTImport();
 
         bool Import();
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 1c22e50b713f..e2864220ca63 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -500,7 +500,7 @@ Section& Section::operator=( const Section& rSection )
     return *this;
 }
 
-PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) :
+PropRead::PropRead( SotStorage& rStorage, const OUString& rName ) :
         mbStatus            ( false ),
         mnByteOrder         ( 0xfffe ),
         mnFormat            ( 0 ),
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index 871118bc731c..29c71816627b 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -151,7 +151,7 @@ class PropRead
         void                    AddSection( Section& rSection );
 
     public:
-                                PropRead( SvStorage& rSvStorage, const OUString& rName );
+                                PropRead( SotStorage& rSvStorage, const OUString& rName );
 
         PropRead&               operator=( const PropRead& rPropRead );
         const Section*          GetSection( const sal_uInt8* pFMTID );
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index a4da29346f4e..85a2bf46d1f4 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -44,7 +44,7 @@ typedef sal_Bool ( SAL_CALL *ExportPPTPointer )( const std::vector< com::sun::st
                                              Reference< XStatusIndicator > &,
                                              SvMemoryStream*, sal_uInt32 nCnvrtFlags );
 
-typedef sal_Bool ( SAL_CALL *ImportPPTPointer )( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
+typedef sal_Bool ( SAL_CALL *ImportPPTPointer )( SdDrawDocument*, SvStream&, SotStorage&, SfxMedium& );
 
 typedef sal_Bool ( SAL_CALL *SaveVBAPointer )( SfxObjectShell&, SvMemoryStream*& );
 
@@ -55,7 +55,7 @@ extern "C" sal_Bool ExportPPT( const std::vector< com::sun::star::beans::Propert
                                Reference< XStatusIndicator > &,
                                SvMemoryStream*, sal_uInt32 nCnvrtFlags );
 
-extern "C" sal_Bool ImportPPT( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
+extern "C" sal_Bool ImportPPT( SdDrawDocument*, SvStream&, SotStorage&, SfxMedium& );
 
 extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& );
 
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index d4177d68925c..14ed722069ed 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -191,7 +191,7 @@ SotStorageStreamRef SdModule::GetOptionStream( const OUString& rOptionName,
             SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE );
 
             if( pStm )
-                xOptionStorage = new SvStorage( pStm, true );
+                xOptionStorage = new SotStorage( pStm, true );
         }
 
         OUString        aStmName;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index afd3de2eb42d..319a91e36079 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -495,7 +495,7 @@ bool SfxObjectShell::DoInitNew( SfxMedium* pMed )
     InitNew(SvStorate *) from the SfxObjectShell-Subclass is implemented.
 
     For pStore == 0 the SfxObjectShell-instance is connected to an empty
-    SfxMedium, otherwise a SfxMedium, which refers to the SvStorage
+    SfxMedium, otherwise a SfxMedium, which refers to the SotStorage
     passed as a parameter.
 
     The object is only initialized correctly after InitNew() or Load().
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index e07efdb5903d..66fdb01712c6 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -95,10 +95,10 @@ void GalleryTheme::ImplCreateSvDrawStorage()
 {
     try
     {
-        aSvDrawStorageRef = new SvStorage( false, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? StreamMode::READ : STREAM_STD_READWRITE );
+        aSvDrawStorageRef = new SotStorage( false, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? StreamMode::READ : STREAM_STD_READWRITE );
         // #i50423# ReadOnly may not been set though the file can't be written (because of security reasons)
         if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() )
-            aSvDrawStorageRef = new SvStorage( false, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ );
+            aSvDrawStorageRef = new SotStorage( false, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ );
     }
     catch (const css::ucb::ContentCreationException& e)
     {
@@ -663,7 +663,7 @@ void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pPr
 
         try
         {
-            SotStorageRef aTempStorageRef( new SvStorage( false, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
+            SotStorageRef aTempStorageRef( new SotStorage( false, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
             aSvDrawStorageRef->CopyTo( aTempStorageRef );
             nStorErr = aSvDrawStorageRef->GetError();
         }
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 2ec771555ef3..bdf9e77961f3 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -30,7 +30,7 @@ class SwAsyncRetrieveInputStreamThreadConsumer;
 class SwGrfFmtColl;
 class SwDoc;
 class GraphicAttr;
-class SvStorage;
+class SotStorage;
 
 // SwGrfNode
 class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index b920c89bc4be..f678f7a55234 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -80,7 +80,7 @@ short SwImpBlocks::GetFileType( const OUString& rFile )
         return SWBLK_NO_FILE;
     if( SwXMLTextBlocks::IsFileUCBStorage( rFile ) )
         return SWBLK_XML;
-    if( SvStorage::IsStorageFile( rFile ) )
+    if( SotStorage::IsStorageFile( rFile ) )
         return SWBLK_SW3;
     //otherwise return NONE
     return SWBLK_NONE;
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index b9dbcc060fa6..0c820b369c9b 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -429,7 +429,7 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext)
     case ND_OLENODE:
         {
             // StarView does not yet provide an option to copy a StarOBJ
-            SotStorageRef aRef = new SvStorage( OUString() );
+            SotStorageRef aRef = new SotStorage( OUString() );
             SwOLEObj& rSwOLE = (SwOLEObj&)static_cast<SwOLENode*>(pCNd)->GetOLEObj();
 
             // temporary storage until object is inserted
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 3937d95af300..36de9c85b4d6 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -288,7 +288,7 @@ sal_uLong Writer::Write( SwPaM& rPam, SfxMedium& rMedium, const OUString* pFileN
     return Write( rPam, *rMedium.GetOutStream(), pFileName );
 }
 
-sal_uLong Writer::Write( SwPaM& /*rPam*/, SvStorage&, const OUString* )
+sal_uLong Writer::Write( SwPaM& /*rPam*/, SotStorage&, const OUString* )
 {
     OSL_ENSURE( false, "Write in Storages on a stream?" );
     return ERR_SWG_WRITE_ERROR;
@@ -445,7 +445,7 @@ sal_uLong StgWriter::WriteStream()
     return ERR_SWG_WRITE_ERROR;
 }
 
-sal_uLong StgWriter::Write( SwPaM& rPaM, SvStorage& rStg, const OUString* pFName )
+sal_uLong StgWriter::Write( SwPaM& rPaM, SotStorage& rStg, const OUString* pFName )
 {
     SetStream(0);
     pStg = &rStg;
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index f93ab799de8f..586e1b494dff 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -34,7 +34,7 @@
 #include "ww8par.hxx"
 
 WW8Glossary::WW8Glossary(SotStorageStreamRef &refStrm, sal_uInt8 nVersion,
-    SvStorage *pStg)
+    SotStorage *pStg)
     : pGlossary(0), rStrm(refStrm), xStg(pStg), nStrings(0)
 {
     refStrm->SetEndian(SvStreamEndian::LITTLE);
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index dd4dd376c68c..833c4e79595c 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -57,7 +57,7 @@ private:
 class WW8Glossary
 {
 public:
-    WW8Glossary( SotStorageStreamRef &refStrm, sal_uInt8 nVersion, SvStorage *pStg=0);
+    WW8Glossary( SotStorageStreamRef &refStrm, sal_uInt8 nVersion, SotStorage *pStg=0);
     bool Load( SwTextBlocks &rBlocks, bool bSaveRelFile );
     ~WW8Glossary()                  { delete pGlossary; }
     WW8GlossaryFib *GetFib()        { return pGlossary; }
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c70366319822..694ff0f76539 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4109,7 +4109,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
     return bJoined;
 }
 
-SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
+SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SotStorage* pStorage,
     SvStream* pSt, SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool bSkipImages)
     : m_pDocShell(rD.GetDocShell())
     , m_pStg(pStorage)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 66ae20fb98d3..08b04410b500 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -97,7 +97,7 @@ class WW8ReaderSave;
 struct WW8PicDesc;
 class Graphic;
 class SwFieldType;
-class SvStorage;
+class SotStorage;
 class SwAttrSet;
 class GDIMetaFile;
 struct ESelection;
@@ -1087,7 +1087,7 @@ friend class wwSectionManager;
 
 private:
 
-    SvStorage* m_pStg;                // Input-Storage
+    SotStorage* m_pStg;                // Input-Storage
     SvStream* m_pStrm;                // Input-(Storage)Stream
     SvStream* m_pTableStream;         // Input-(Storage)Stream
     SvStream* m_pDataStream;          // Input-(Storage)Stream
@@ -1893,7 +1893,7 @@ public:     // eigentlich private, geht aber leider nur public
         long &rX, long &rY);
     static ColorData GetCol(sal_uInt8 nIco);
 
-    SwWW8ImplReader( sal_uInt8 nVersionPara, SvStorage* pStorage, SvStream* pSt,
+    SwWW8ImplReader( sal_uInt8 nVersionPara, SotStorage* pStorage, SvStream* pSt,
         SwDoc& rD, const OUString& rBaseURL, bool bNewDoc, bool bSkipImages );
 
     const OUString& GetBaseURL() const { return m_sBaseURL; }
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 1da2d5c2416e..5aa42e783e9f 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -182,7 +182,7 @@ public:
     virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName,
                     const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) SAL_OVERRIDE;
 
-    SvStorage *GetPackage() { return &xPackage; }
+    SotStorage *GetPackage() { return &xPackage; }
 
     void SetProgressValue( sal_Int32 nValue );
 
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 1225097da3fe..ac75ea87747d 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -458,7 +458,7 @@ cssu::Reference< com::sun::star::io::XInputStream >
 /****** XSecController/getObjectInputStream ************************************
  *
  *   NAME
- *  getObjectInputStream -- get a XInputStream interface from a SvStorage
+ *  getObjectInputStream -- get a XInputStream interface from a SotStorage
  *
  *   SYNOPSIS
  *  xInputStream = getObjectInputStream( objectURL );