Fold INetIStream into INetMessageIStream

Change-Id: I882a8bc2048149307383491cc77c4e10f5e99a52

include/tools/inetstrm.hxx

@@ -35,21 +35,6 @@ enum INetStreamStatus
     INETSTREAM_STATUS_ERROR      = -1
 };
 
-class TOOLS_DLLPUBLIC INetIStream
-{
-    INetIStream (const INetIStream& rStrm) SAL_DELETED_FUNCTION;
-    INetIStream& operator= (const INetIStream& rStrm) SAL_DELETED_FUNCTION;
-
-protected:
-    virtual int GetData (sal_Char *pData, sal_uIntPtr nSize) = 0;
-
-public:
-    INetIStream ();
-    virtual ~INetIStream (void);
-
-    int Read (sal_Char *pData, sal_uIntPtr nSize);
-};
-
 class INetOStream
 {
     INetOStream (const INetOStream& rStrm) SAL_DELETED_FUNCTION;
@@ -78,7 +63,7 @@ enum INetMessageStreamState
 };
 
 /// Message Generator Interface.
-class INetMessageIStream : public INetIStream
+class INetMessageIStream
 {
     INetMIMEMessage *pSourceMsg;
     bool            bHeaderGenerated;
@@ -93,8 +78,6 @@ class INetMessageIStream : public INetIStream
     sal_Char       *pMsgRead;
     sal_Char       *pMsgWrite;
 
-    virtual int GetData (sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE;
-
     INetMessageIStream (const INetMessageIStream& rStrm) SAL_DELETED_FUNCTION;
     INetMessageIStream& operator= (const INetMessageIStream& rStrm) SAL_DELETED_FUNCTION;
 
@@ -105,6 +88,8 @@ public:
     INetMessageIStream (sal_uIntPtr nBufferSize = 2048);
     virtual ~INetMessageIStream (void);
 
+    TOOLS_DLLPUBLIC int Read (sal_Char *pData, sal_uIntPtr nSize);
+
     INetMIMEMessage *GetSourceMessage (void) const { return pSourceMsg; }
     void SetSourceMessage (INetMIMEMessage *pMsg) { pSourceMsg = pMsg; }
 

tools/source/inet/inetstrm.cxx

@@ -112,21 +112,6 @@ public:
     virtual ~INetMessageDecode64Stream_Impl(void);
 };
 
-// INetIStream
-
-INetIStream::INetIStream()
-{
-}
-
-INetIStream::~INetIStream(void)
-{
-}
-
-int INetIStream::Read(sal_Char* pData, sal_uIntPtr nSize)
-{
-    return GetData(pData, nSize);
-}
-
 // INetOStream
 
 INetOStream::INetOStream()
@@ -165,7 +150,7 @@ INetMessageIStream::~INetMessageIStream(void)
     delete pMsgStrm;
 }
 
-int INetMessageIStream::GetData(sal_Char* pData, sal_uIntPtr nSize)
+int INetMessageIStream::Read(sal_Char* pData, sal_uIntPtr nSize)
 {
     if (pSourceMsg == NULL) return INETSTREAM_STATUS_ERROR;