Fold INetOStream into INetMessageOStream

Change-Id: I062fa91cc05edae3c2879583cbbf8e8c8acfe482

1 files changed, 3 insertions, 19 deletions

diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index 2676315073f3..c3ada5ccc73c 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -35,22 +35,6 @@ enum INetStreamStatus
     INETSTREAM_STATUS_ERROR      = -1
 };
 
-class INetOStream
-{
-    INetOStream (const INetOStream& rStrm) SAL_DELETED_FUNCTION;
-    INetOStream& operator= (const INetOStream& rStrm) SAL_DELETED_FUNCTION;
-
-protected:
-    virtual int PutData (
-        const sal_Char *pData, sal_uIntPtr nSize) = 0;
-
-public:
-    INetOStream ();
-    virtual ~INetOStream (void);
-
-    int Write (const sal_Char *pData, sal_uIntPtr nSize);
-};
-
 enum INetMessageStreamState
 {
     INETMSG_EOL_BEGIN,
@@ -98,7 +82,7 @@ public:
 };
 
 /// Message Parser Interface.
-class INetMessageOStream : public INetOStream
+class INetMessageOStream
 {
     INetMIMEMessage        *pTargetMsg;
     bool                    bHeaderParsed;
@@ -107,8 +91,6 @@ class INetMessageOStream : public INetOStream
 
     SvMemoryStream         *pMsgBuffer;
 
-    virtual int PutData (const sal_Char *pData, sal_uIntPtr nSize) SAL_OVERRIDE;
-
     INetMessageOStream (const INetMessageOStream& rStrm) SAL_DELETED_FUNCTION;
     INetMessageOStream& operator= (const INetMessageOStream& rStrm) SAL_DELETED_FUNCTION;
 
@@ -119,6 +101,8 @@ public:
     INetMessageOStream (void);
     virtual ~INetMessageOStream (void);
 
+    int Write (const sal_Char *pData, sal_uIntPtr nSize);
+
     INetMIMEMessage *GetTargetMessage (void) const { return pTargetMsg; }
     void SetTargetMessage (INetMIMEMessage *pMsg) { pTargetMsg = pMsg; }