convert ReadByteString/WriteByteString from ByteString to OString

Nobody ever used the return values anyway, so for reading just
return the string and for writing the number of bytes written

Doesn't need to be members, make standalone functions

Rename  to
read_lenPrefixed_uInt8s_ToO[U]String and
write_lenPrefixed_uInt8s_FromO[U]String, lengthy,
but much less unambiguous, seeing as a lot of users of it don't
seem to be aware that they read/write pascal-style length
prefixed strings, which isn't surprising given the
apparent simplicity of their original name.

added a unit test

6 files changed, 169 insertions, 101 deletions

diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index 610b804e7502..7c88b9c3aa7a 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -51,7 +51,7 @@ class INetMessageHeader
     ByteString m_aValue;
 
 public:
-    INetMessageHeader (void)
+    INetMessageHeader()
     {}
 
     INetMessageHeader (
@@ -64,7 +64,7 @@ public:
         : m_aName (rHdr.m_aName), m_aValue (rHdr.m_aValue)
     {}
 
-    ~INetMessageHeader (void)
+    ~INetMessageHeader()
     {}
 
     INetMessageHeader& operator= (const INetMessageHeader& rHdr)
@@ -74,22 +74,22 @@ public:
         return *this;
     }
 
-    const ByteString& GetName  (void) const { return m_aName; }
-    const ByteString& GetValue (void) const { return m_aValue; }
+    const ByteString& GetName() const { return m_aName; }
+    const ByteString& GetValue() const { return m_aValue; }
 
     friend SvStream& operator<< (
         SvStream& rStrm, const INetMessageHeader& rHdr)
     {
-        rStrm.WriteByteString (rHdr.m_aName);
-        rStrm.WriteByteString (rHdr.m_aValue);
+        write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aName);
+        write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aValue);
         return rStrm;
     }
 
     friend SvStream& operator>> (
         SvStream& rStrm, INetMessageHeader& rHdr)
     {
-        rStrm.ReadByteString (rHdr.m_aName);
-        rStrm.ReadByteString (rHdr.m_aValue);
+        rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString(rStrm);
+        rHdr.m_aValue = read_lenPrefixed_uInt8s_ToOString(rStrm);
         return rStrm;
     }
 };
@@ -108,7 +108,7 @@ class INetMessage
     UniString       m_aDocName;
     SvLockBytesRef  m_xDocLB;
 
-    void ListCleanup_Impl (void);
+    void ListCleanup_Impl();
     void ListCopy (const INetMessage& rMsg);
 
 protected:
@@ -158,8 +158,8 @@ protected:
     virtual SvStream& operator>> (SvStream& rStrm);
 
 public:
-    INetMessage (void) : m_nDocSize(0) {}
-    virtual ~INetMessage (void);
+    INetMessage() : m_nDocSize(0) {}
+    virtual ~INetMessage();
 
     INetMessage (const INetMessage& rMsg)
         : m_nDocSize (rMsg.m_nDocSize),
@@ -178,7 +178,7 @@ public:
         return *this;
     }
 
-    sal_uIntPtr GetHeaderCount (void) const { return m_aHeaderList.size(); }
+    sal_uIntPtr GetHeaderCount() const { return m_aHeaderList.size(); }
 
     UniString GetHeaderName (sal_uIntPtr nIndex) const
     {
@@ -204,13 +204,13 @@ public:
         sal_uIntPtr nIndex = ((sal_uIntPtr)-1)
     );
 
-    sal_uIntPtr GetDocumentSize (void) const { return m_nDocSize; }
+    sal_uIntPtr GetDocumentSize() const { return m_nDocSize; }
     void  SetDocumentSize (sal_uIntPtr nSize) { m_nDocSize = nSize; }
 
-    const UniString& GetDocumentName (void) const { return m_aDocName; }
+    const UniString& GetDocumentName() const { return m_aDocName; }
     void  SetDocumentName (const UniString& rName) { m_aDocName = rName; }
 
-    SvLockBytes* GetDocumentLB (void) const { return m_xDocLB; }
+    SvLockBytes* GetDocumentLB() const { return m_xDocLB; }
     void         SetDocumentLB (SvLockBytes *pDocLB) { m_xDocLB = pDocLB; }
 
     friend SvStream& operator<< (
@@ -260,9 +260,9 @@ protected:
     virtual SvStream& operator>> (SvStream& rStrm);
 
 public:
-    INetRFC822Message (void);
+    INetRFC822Message();
     INetRFC822Message (const INetRFC822Message& rMsg);
-    virtual ~INetRFC822Message (void);
+    virtual ~INetRFC822Message();
 
     INetRFC822Message& operator= (const INetRFC822Message& rMsg);
 
@@ -277,105 +277,105 @@ public:
 
     /** Header fields.
      */
-    UniString GetBCC (void) const
+    UniString GetBCC() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_BCC],
             INetMIME::HEADER_FIELD_ADDRESS);
     }
 
-    UniString GetCC (void) const
+    UniString GetCC() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_CC],
             INetMIME::HEADER_FIELD_ADDRESS);
     }
 
-    UniString GetComments (void) const
+    UniString GetComments() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_COMMENTS],
             INetMIME::HEADER_FIELD_TEXT);
     }
 
-    UniString GetDate (void) const
+    UniString GetDate() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_DATE],
             INetMIME::HEADER_FIELD_STRUCTURED);
     }
 
-    UniString GetFrom (void) const
+    UniString GetFrom() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_FROM],
             INetMIME::HEADER_FIELD_ADDRESS);
     }
 
-    UniString GetInReplyTo (void) const
+    UniString GetInReplyTo() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_IN_REPLY_TO],
             INetMIME::HEADER_FIELD_ADDRESS); // ??? MESSAGE_ID ???
     }
 
-    UniString GetKeywords (void) const
+    UniString GetKeywords() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_KEYWORDS],
             INetMIME::HEADER_FIELD_PHRASE);
     }
 
-    UniString GetMessageID (void) const
+    UniString GetMessageID() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_MESSAGE_ID],
             INetMIME::HEADER_FIELD_MESSAGE_ID);
     }
 
-    UniString GetReferences (void) const
+    UniString GetReferences() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_REFERENCES],
             INetMIME::HEADER_FIELD_ADDRESS);
     }
 
-    UniString GetReplyTo (void) const
+    UniString GetReplyTo() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_REPLY_TO],
             INetMIME::HEADER_FIELD_ADDRESS);
     }
 
-    UniString GetReturnPath (void) const
+    UniString GetReturnPath() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_RETURN_PATH],
             INetMIME::HEADER_FIELD_ADDRESS);
     }
 
-    UniString GetReturnReceiptTo (void) const
+    UniString GetReturnReceiptTo() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_RETURN_RECEIPT_TO],
             INetMIME::HEADER_FIELD_ADDRESS);
     }
 
-    UniString GetSender (void) const
+    UniString GetSender() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_SENDER],
             INetMIME::HEADER_FIELD_ADDRESS);
     }
 
-    UniString GetSubject (void) const
+    UniString GetSubject() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_SUBJECT],
             INetMIME::HEADER_FIELD_TEXT);
     }
 
-    UniString GetTo (void) const
+    UniString GetTo() const
     {
         return GetHeaderValue_Impl (
             m_nIndex[INETMSG_RFC822_TO],
@@ -430,15 +430,15 @@ class TOOLS_DLLPUBLIC INetMIMEMessage : public INetRFC822Message
 
     INetMIMEMessage*        pParent;
     INetMIMEMessgeList_impl aChildren;
-    ByteString              m_aBoundary;
+    rtl::OString            m_aBoundary;
     sal_Bool                bHeaderParsed;
 
     friend class INetMIMEMessageStream;
 
-    const ByteString& GetMultipartBoundary (void) const { return m_aBoundary; }
-    void SetMultipartBoundary (const ByteString& rBnd) { m_aBoundary = rBnd; }
+    const rtl::OString& GetMultipartBoundary() const { return m_aBoundary; }
+    void SetMultipartBoundary (const rtl::OString& rBnd) { m_aBoundary = rBnd; }
 
-    void CleanupImp (void);
+    void CleanupImp();
     void CopyImp    (const INetMIMEMessage& rMsg);
     void SetHeaderParsed() { bHeaderParsed = sal_True; }
 
@@ -447,9 +447,9 @@ protected:
     virtual SvStream& operator>> (SvStream& rStrm);
 
 public:
-    INetMIMEMessage (void);
+    INetMIMEMessage();
     INetMIMEMessage (const INetMIMEMessage& rMsg);
-    virtual ~INetMIMEMessage (void);
+    virtual ~INetMIMEMessage();
 
     INetMIMEMessage& operator= (const INetMIMEMessage& rMsg);
 
@@ -467,35 +467,35 @@ public:
     /** Header fields.
      */
     void      SetMIMEVersion (const UniString& rVersion);
-    UniString GetMIMEVersion (void) const
+    UniString GetMIMEVersion() const
     {
         return GetHeaderValue (m_nIndex[INETMSG_MIME_VERSION]);
     }
 
-    UniString GetContentDescription (void) const
+    UniString GetContentDescription() const
     {
         return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DESCRIPTION]);
     }
 
     void      SetContentDisposition (const UniString& rDisposition);
-    UniString GetContentDisposition (void) const
+    UniString GetContentDisposition() const
     {
         return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DISPOSITION]);
     }
 
-    UniString GetContentID (void) const
+    UniString GetContentID() const
     {
         return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_ID]);
     }
 
     void      SetContentType (const UniString& rType);
-    UniString GetContentType (void) const
+    UniString GetContentType() const
     {
         return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TYPE]);
     }
 
     void      SetContentTransferEncoding (const UniString& rEncoding);
-    UniString GetContentTransferEncoding (void) const
+    UniString GetContentTransferEncoding() const
     {
         return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TRANSFER_ENCODING]);
     }
@@ -504,16 +504,16 @@ public:
 
     /** Message container methods.
      */
-    sal_Bool IsContainer (void) const
+    sal_Bool IsContainer() const
     {
         return (IsMessage() || IsMultipart());
     }
-    sal_Bool IsMessage (void) const
+    sal_Bool IsMessage() const
     {
         UniString aType (GetContentType());
         return (aType.CompareIgnoreCaseToAscii("message/", 8) == 0);
     }
-    sal_Bool IsMultipart (void) const
+    sal_Bool IsMultipart() const
     {
         UniString aType (GetContentType());
         return (aType.CompareIgnoreCaseToAscii("multipart/", 10) == 0);
@@ -523,7 +523,7 @@ public:
     {
         return ( nIndex < aChildren.size() ) ? aChildren[ nIndex ] : NULL;
     }
-    INetMIMEMessage* GetParent (void) const { return pParent; }
+    INetMIMEMessage* GetParent() const { return pParent; }
 
     sal_Bool EnableAttachChild (
         INetMessageContainerType eType = INETMSG_MULTIPART_MIXED);
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 66312b76faaf..e6e939bbbd1b 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -28,6 +28,7 @@
 #ifndef _STREAM_HXX
 #define _STREAM_HXX
 
+#include <limits>
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
 #include <tools/string.hxx>
@@ -364,10 +365,8 @@ public:
 
     SvStream&       ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet );
     SvStream&       ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); }
-    SvStream&       ReadByteString( ByteString& rStr );
     SvStream&       WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet );
     SvStream&       WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); }
-    SvStream&       WriteByteString( const ByteString& rStr );
 
     SvStream&       WriteNumber( sal_uInt32 nUInt32 );
     SvStream&       WriteNumber( sal_Int32 nInt32 );
@@ -546,22 +545,70 @@ TOOLS_DLLPUBLIC SvStream& endlub( SvStream& rStr );
 
 //Attempt to read nLen 8bit units to an OString, returned rtl::OString's length
 //is number of units successfully read
-TOOLS_DLLPUBLIC rtl::OString read_uInt8s_AsOString(SvStream& rStr, sal_Size nLen);
+TOOLS_DLLPUBLIC rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen);
 
 //Attempt to read nLen little endian 16bit units to an OUString, returned
 //rtl::OUString's length is number of units successfully read
-TOOLS_DLLPUBLIC rtl::OUString read_LEuInt16s_AsOUString(SvStream& rStr, sal_Size nLen);
+TOOLS_DLLPUBLIC rtl::OUString read_LEuInt16s_ToOUString(SvStream& rStrm, sal_Size nLen);
 
 //Attempt to read 8bit units to an OString until a zero terminator is
 //encountered, returned rtl::OString's length is number of units *definitely*
 //successfully read, check SvStream::good() to see if null terminator was
 //sucessfully read
-TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStr);
+TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm);
 
 //Attempt to read 8bit units assuming source encoding eEnc to an OUString until
 //a zero terminator is encountered. Check SvStream::good() to see if null
 //terminator was sucessfully read
-TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStr, rtl_TextEncoding eEnc);
+TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc);
+
+//Attempt to read a pascal-style length (of type prefix) prefixed sequence of
+//8bit units to an OString, returned rtl::OString's length is number of units
+//successfully read.
+template<typename prefix=sal_uInt16> rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm)
+{
+    prefix nLen = 0;
+    rStrm >> nLen;
+    return read_uInt8s_ToOString(rStrm, nLen);
+}
+
+//Attempt to read a pascal-style length (of type prefix) prefixed sequence of
+//8bit units to an OUString
+template<typename prefix=sal_uInt16> rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm,
+    rtl_TextEncoding eEnc)
+{
+    return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString<prefix>(rStrm), eEnc);
+}
+
+//Attempt to write a pascal-style length (of type prefix) prefixed sequence of
+//8bit units from an OString, returned value is number of bytes written (including
+//byte-count of prefix)
+template<typename prefix=sal_uInt16> sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm,
+    const rtl::OString &rStr)
+{
+    SAL_WARN_IF(rStr.getLength() > std::numeric_limits<prefix>::max(),
+        "tools.stream",
+        "string too long for prefix count to fit in output type");
+
+    sal_Size nWritten = 0;
+    prefix nLen = std::min<sal_Size>(rStr.getLength(), std::numeric_limits<prefix>::max());
+    rStrm << nLen;
+    if (rStrm.good())
+    {
+        nWritten += sizeof(prefix);
+        nWritten += rStrm.Write(rStr.getStr(), nLen);
+    }
+    return nWritten;
+}
+
+//Attempt to write a pascal-style length (of type prefix) prefixed sequence of
+//8bit units from an OUString, returned value is number of bytes written (including
+//byte-count of prefix)
+template<typename prefix=sal_uInt16> sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm,
+    const rtl::OUString &rStr, rtl_TextEncoding eEnc)
+{
+    return write_lenPrefixed_uInt8s_FromOString<prefix>(rStrm, rtl::OUStringToOString(rStr, eEnc));
+}
 
 // --------------
 // - FileStream -
diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx
index 77c2b9ed75ae..3e7580f40377 100644
--- a/tools/qa/cppunit/test_stream.cxx
+++ b/tools/qa/cppunit/test_stream.cxx
@@ -47,11 +47,13 @@ namespace
         void test_stdstream();
         void test_fastostring();
         void test_read_cstring();
+        void test_read_pstring();
 
         CPPUNIT_TEST_SUITE(Test);
         CPPUNIT_TEST(test_stdstream);
         CPPUNIT_TEST(test_fastostring);
         CPPUNIT_TEST(test_read_cstring);
+        CPPUNIT_TEST(test_read_pstring);
         CPPUNIT_TEST_SUITE_END();
     };
 
@@ -67,7 +69,7 @@ namespace
 
         char tools_a(78);
         aMemStream >> tools_a;
-        CPPUNIT_ASSERT(std_a == 'f');
+        CPPUNIT_ASSERT(tools_a == 'f');
 
         iss.seekg(0, std::ios_base::end);
         //seeking to end doesn't set eof, reading past eof does
@@ -98,7 +100,7 @@ namespace
         //a failed read doesn't change the data, it remains unchanged
         CPPUNIT_ASSERT(tools_a == 78);
         //nothing wrong with the stream, so not bad
-        CPPUNIT_ASSERT(!aMemStream.GetError());
+        CPPUNIT_ASSERT(!aMemStream.bad());
         //yet, the read didn't succeed
         CPPUNIT_ASSERT(!aMemStream.good());
 
@@ -133,18 +135,18 @@ namespace
         char foo[] = "foobar";
         SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ);
 
-        rtl::OString aOne = read_uInt8s_AsOString(aMemStream, 3);
+        rtl::OString aOne = read_uInt8s_ToOString(aMemStream, 3);
         CPPUNIT_ASSERT(aOne.equalsL(RTL_CONSTASCII_STRINGPARAM("foo")));
 
-        rtl::OString aTwo = read_uInt8s_AsOString(aMemStream, 3);
+        rtl::OString aTwo = read_uInt8s_ToOString(aMemStream, 3);
         CPPUNIT_ASSERT(aTwo.equalsL(RTL_CONSTASCII_STRINGPARAM("bar")));
 
-        rtl::OString aThree = read_uInt8s_AsOString(aMemStream, 3);
+        rtl::OString aThree = read_uInt8s_ToOString(aMemStream, 3);
         CPPUNIT_ASSERT(!aThree.getLength());
 
         aMemStream.Seek(0);
 
-        rtl::OString aFour = read_uInt8s_AsOString(aMemStream, 100);
+        rtl::OString aFour = read_uInt8s_ToOString(aMemStream, 100);
         CPPUNIT_ASSERT(aFour.equalsL(RTL_CONSTASCII_STRINGPARAM(foo)));
     }
 
@@ -153,7 +155,7 @@ namespace
         char foo[] = "foobar";
         SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ);
 
-        rtl::OString aOne = read_zeroTerminated_uInt8s_AsOString(aMemStream);
+        rtl::OString aOne = read_zeroTerminated_uInt8s_ToOString(aMemStream);
         CPPUNIT_ASSERT(aOne.equalsL(RTL_CONSTASCII_STRINGPARAM("foobar")));
         CPPUNIT_ASSERT(!aMemStream.good());
         CPPUNIT_ASSERT(!aMemStream.bad());
@@ -161,11 +163,52 @@ namespace
 
         aMemStream.Seek(0);
         foo[3] = 0;
-        rtl::OString aTwo = read_zeroTerminated_uInt8s_AsOString(aMemStream);
+        rtl::OString aTwo = read_zeroTerminated_uInt8s_ToOString(aMemStream);
         CPPUNIT_ASSERT(aTwo.equalsL(RTL_CONSTASCII_STRINGPARAM("foo")));
         CPPUNIT_ASSERT(aMemStream.good());
     }
 
+    void Test::test_read_pstring()
+    {
+        char foo[] = "\3foobar";
+        SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ);
+
+        rtl::OString aFoo = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(aMemStream);
+        CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("foo")));
+        CPPUNIT_ASSERT(aMemStream.good());
+        CPPUNIT_ASSERT(!aMemStream.bad());
+        CPPUNIT_ASSERT(!aMemStream.eof());
+
+        aMemStream.Seek(0);
+        foo[0] = 10;
+        aFoo = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(aMemStream);
+        CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("foobar")));
+        CPPUNIT_ASSERT(!aMemStream.good());
+        CPPUNIT_ASSERT(!aMemStream.bad());
+        CPPUNIT_ASSERT(aMemStream.eof());
+
+        aMemStream.SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN);
+        aMemStream.Seek(0);
+        foo[0] = 0;
+        foo[1] = 3;
+        aFoo = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(aMemStream);
+        CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("oob")));
+        CPPUNIT_ASSERT(aMemStream.good());
+        CPPUNIT_ASSERT(!aMemStream.bad());
+        CPPUNIT_ASSERT(!aMemStream.eof());
+
+        aMemStream.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
+        aMemStream.Seek(0);
+        foo[0] = 3;
+        foo[1] = 0;
+        foo[2] = 0;
+        foo[3] = 0;
+        aFoo = read_lenPrefixed_uInt8s_ToOString<sal_uInt32>(aMemStream);
+        CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("bar")));
+        CPPUNIT_ASSERT(aMemStream.good());
+        CPPUNIT_ASSERT(!aMemStream.bad());
+        CPPUNIT_ASSERT(!aMemStream.eof());
+    }
 
     CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index f5fa071ad15a..f626dcccd508 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -66,7 +66,7 @@ inline sal_Unicode ascii_toLowerCase( sal_Unicode ch )
 /*
  * ~INetMessage.
  */
-INetMessage::~INetMessage (void)
+INetMessage::~INetMessage()
 {
     ListCleanup_Impl();
 }
@@ -74,7 +74,7 @@ INetMessage::~INetMessage (void)
 /*
  * ListCleanup_Impl.
  */
-void INetMessage::ListCleanup_Impl (void)
+void INetMessage::ListCleanup_Impl()
 {
     // Cleanup.
     sal_uIntPtr i, n = m_aHeaderList.size();
@@ -243,7 +243,7 @@ enum _ImplINetRFC822MessageHeaderState
 /*
  * INetRFC822Message.
  */
-INetRFC822Message::INetRFC822Message (void)
+INetRFC822Message::INetRFC822Message()
     : INetMessage()
 {
     for (sal_uInt16 i = 0; i < INETMSG_RFC822_NUMHDR; i++)
@@ -275,7 +275,7 @@ INetRFC822Message& INetRFC822Message::operator= (const INetRFC822Message& rMsg)
 /*
  * ~INetRFC822Message.
  */
-INetRFC822Message::~INetRFC822Message (void)
+INetRFC822Message::~INetRFC822Message()
 {
 }
 
@@ -753,7 +753,7 @@ enum _ImplINetMIMEMessageHeaderState
 /*
  * INetMIMEMessage.
  */
-INetMIMEMessage::INetMIMEMessage (void)
+INetMIMEMessage::INetMIMEMessage()
     : INetRFC822Message (),
       pParent       (NULL),
       bHeaderParsed (sal_False)
@@ -792,7 +792,7 @@ INetMIMEMessage& INetMIMEMessage::operator= (
 /*
  * ~INetMIMEMessage.
  */
-INetMIMEMessage::~INetMIMEMessage (void)
+INetMIMEMessage::~INetMIMEMessage()
 {
     // Cleanup.
     CleanupImp();
@@ -801,7 +801,7 @@ INetMIMEMessage::~INetMIMEMessage (void)
 /*
  * CleanupImp.
  */
-void INetMIMEMessage::CleanupImp (void)
+void INetMIMEMessage::CleanupImp()
 {
     for( size_t i = 0, n = aChildren.size(); i < n; ++i ) {
         delete aChildren[ i ];
@@ -1161,7 +1161,7 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const
     for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++)
         rStrm << static_cast<sal_uInt32>(m_nIndex[i]);
 
-    rStrm.WriteByteString (m_aBoundary);
+    write_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary);
     rStrm << static_cast<sal_uInt32>(aChildren.size());
 
     return rStrm;
@@ -1181,7 +1181,7 @@ SvStream& INetMIMEMessage::operator>> (SvStream& rStrm)
         m_nIndex[i] = nTemp;
     }
 
-    rStrm.ReadByteString (m_aBoundary);
+    m_aBoundary = read_lenPrefixed_uInt8s_ToOString(rStrm);
 
     rStrm >> nTemp;
 
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index d70d84d2c30c..5345067aa0f8 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -1608,7 +1608,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize)
 
                 // Multipart message body. Initialize multipart delimiters.
                 // Multipart message.
-                if (pMsg->GetMultipartBoundary().Len() == 0)
+                if (pMsg->GetMultipartBoundary().getLength() == 0)
                 {
                     // Determine boundary.
                     rtl::OString aType(rtl::OUStringToOString(
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 5fa5b0e43380..b70195978008 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -806,7 +806,7 @@ sal_Bool SvStream::ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcC
         return ReadByteStringLine( rStr, eSrcCharSet );
 }
 
-rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStream)
+rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream)
 {
     rtl::OStringBuffer aOutput;
 
@@ -839,10 +839,10 @@ rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStream)
     return aOutput.makeStringAndClear();
 }
 
-rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStream, rtl_TextEncoding eEnc)
+rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStream, rtl_TextEncoding eEnc)
 {
     return rtl::OStringToOUString(
-        read_zeroTerminated_uInt8s_AsOString(rStream), eEnc);
+        read_zeroTerminated_uInt8s_ToOString(rStream), eEnc);
 }
 
 /*************************************************************************
@@ -1517,19 +1517,7 @@ SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSe
         return *this;
     }
 
-    ByteString aStr;
-    ReadByteString( aStr );
-    rStr = UniString( aStr, eSrcCharSet );
-    return *this;
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SvStream::ReadByteString( ByteString& rStr )
-{
-    sal_uInt16 nLen = 0;
-    operator>>( nLen );
-    rStr = read_uInt8s_AsOString(*this, nLen);
+    rStr = read_lenPrefixed_uInt8s_ToOUString(*this, eSrcCharSet);
     return *this;
 }
 
@@ -1563,17 +1551,7 @@ SvStream& SvStream::WriteByteString( const UniString& rStr, rtl_TextEncoding eDe
         return *this;
     }
 
-    return WriteByteString(rtl::OUStringToOString(rStr, eDestCharSet));
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SvStream::WriteByteString( const ByteString& rStr)
-{
-    sal_uInt16 nLen = rStr.Len();
-    operator<< ( nLen );
-    if( nLen != 0 )
-        Write( rStr.GetBuffer(), nLen );
+    write_lenPrefixed_uInt8s_FromOUString(*this, rStr, eDestCharSet);
     return *this;
 }
 
@@ -2454,7 +2432,7 @@ void SvDataCopyStream::Assign( const SvDataCopyStream& )
 }
 
 //Create a OString of nLen bytes from rStream
-rtl::OString read_uInt8s_AsOString(SvStream& rStrm, sal_Size nLen)
+rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen)
 {
     using comphelper::string::rtl_string_alloc;
 
@@ -2481,7 +2459,7 @@ rtl::OString read_uInt8s_AsOString(SvStream& rStrm, sal_Size nLen)
 }
 
 //Create a OUString of nLen little endian sal_Unicodes from rStream
-rtl::OUString read_LEuInt16s_AsOUString(SvStream& rStrm, sal_Size nLen)
+rtl::OUString read_LEuInt16s_ToOUString(SvStream& rStrm, sal_Size nLen)
 {
     using comphelper::string::rtl_uString_alloc;