From 60bbbcabed5ddf477a17970af79f464fc5e98753 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 6 May 2015 16:28:57 +0200
Subject: Remove SvStorageStream alias

Change-Id: I9d835e6032e2366e5357240609ff0e60273d475b
---
 include/sot/storage.hxx           | 1 -
 sd/source/filter/ppt/propread.cxx | 2 +-
 sd/source/filter/ppt/propread.hxx | 2 +-
 starmath/source/eqnolefilehdr.cxx | 2 +-
 starmath/source/eqnolefilehdr.hxx | 6 +++---
 starmath/source/mathtype.hxx      | 2 +-
 sw/source/filter/ww8/ww8par4.cxx  | 6 +++---
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index c3ba3b0b191d..f6d29e270479 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -221,7 +221,6 @@ typedef tools::SvRef<SotStorage> SotStorageRef;
 
 #define SvStorage SotStorage
 #define SvStorageRef SotStorageRef
-#define SvStorageStream SotStorageStream
 
 #endif // _SVSTOR_HXX
 
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 18ff39048dc4..1c22e50b713f 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -304,7 +304,7 @@ bool Section::GetDictionary( Dictionary& rDict )
     return bRetValue;
 }
 
-void Section::Read( SvStorageStream *pStrm )
+void Section::Read( SotStorageStream *pStrm )
 {
     sal_uInt32 i, nSecOfs, nSecSize, nPropCount, nPropId, nPropOfs, nPropType, nPropSize, nCurrent, nVectorCount, nTemp, nStrmSize;
     nSecOfs = pStrm->Tell();
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index fbd619d771aa..871118bc731c 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -133,7 +133,7 @@ class Section
         bool                GetProperty( sal_uInt32 nId, PropItem& rPropItem );
         bool                GetDictionary( Dictionary& rDict );
         const sal_uInt8*        GetFMTID() const { return aFMTID; };
-        void                    Read( SvStorageStream* pStrm );
+        void                    Read( SotStorageStream* pStrm );
 };
 
 class PropRead
diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx
index 7f3c2aa99459..ddd6e9593b9e 100644
--- a/starmath/source/eqnolefilehdr.cxx
+++ b/starmath/source/eqnolefilehdr.cxx
@@ -37,7 +37,7 @@ bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion )
         STREAM_STD_READ | StreamMode::NOCREATE);
     if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError()))
         return bSuccess;
-    SvStorageStream *pS = &xSrc;
+    SotStorageStream *pS = &xSrc;
     pS->SetEndian( SvStreamEndian::LITTLE );
 
     EQNOLEFILEHDR aHdr;
diff --git a/starmath/source/eqnolefilehdr.hxx b/starmath/source/eqnolefilehdr.hxx
index 9d1587fcb4bc..2841a2c41218 100644
--- a/starmath/source/eqnolefilehdr.hxx
+++ b/starmath/source/eqnolefilehdr.hxx
@@ -23,7 +23,7 @@
 #include <sal/types.h>
 #include <sot/storage.hxx>
 
-class SvStorageStream;
+class SotStorageStream;
 class SotStorage;
 
 #define EQNOLEFILEHDR_SIZE 28
@@ -47,7 +47,7 @@ public:
     sal_uInt32   nReserved3; // not used
     sal_uInt32   nReserved4; // not used
 
-    inline void Read(SvStorageStream *pS)
+    inline void Read(SotStorageStream *pS)
     {
         pS->ReadUInt16( nCBHdr );
         pS->ReadUInt32( nVersion );
@@ -58,7 +58,7 @@ public:
         pS->ReadUInt32( nReserved3 );
         pS->ReadUInt32( nReserved4 );
     }
-    inline void Write(SvStorageStream *pS)
+    inline void Write(SotStorageStream *pS)
     {
         pS->WriteUInt16( nCBHdr );
         pS->WriteUInt32( nVersion );
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index a5698320e5cb..bccb190b1af0 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -120,7 +120,7 @@ private:
     sal_uInt8 nProdVersion;
     sal_uInt8 nProdSubVersion;
 
-    SvStorageStream *pS;
+    SotStorageStream *pS;
 
     void Init();
 
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 693b8885630e..bb5359aab99b 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -84,7 +84,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
 
     SotStorageStreamRef xSrc3 = rSrc1->OpenSotStream( OUString("\3PIC"),
         STREAM_STD_READ | StreamMode::NOCREATE);
-    SvStorageStream* pS = xSrc3;
+    SotStorageStream* pS = xSrc3;
     pS->SetEndian( SvStreamEndian::LITTLE );
     pS->Seek( STREAM_SEEK_TO_END );
 
@@ -129,7 +129,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
 {
     SotStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"),
         STREAM_STD_READ | StreamMode::NOCREATE);
-    SvStorageStream* pSt = xSrc2;
+    SotStorageStream* pSt = xSrc2;
     pSt->SetEndian( SvStreamEndian::LITTLE );
     sal_uLong nRead = pSt->Read( pMfp, sizeof(*pMfp ) );
                                 // Mini-Placable-Header lesen
@@ -183,7 +183,7 @@ static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1)
 {
     // 03-META-Stream nicht da. Vielleicht ein 03-PICT ?
     SotStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT"));
-    SvStorageStream* pStp = xSrc4;
+    SotStorageStream* pStp = xSrc4;
     pStp->SetEndian( SvStreamEndian::LITTLE );
     sal_uInt8 aTestA[10];        // Ist der 01Ole-Stream ueberhaupt vorhanden
     sal_uLong nReadTst = pStp->Read( aTestA, sizeof( aTestA ) );
-- 
cgit