Remove SvStorage alias

Change-Id: Id07ace147ff4fd4a17d05ba3cce6408def05c9c7

9 files changed, 12 insertions, 12 deletions

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 );