commit 52117bb8c337c98c200b6846c8d9fa2d1831ac51
author Noel Grandin <noel.grandin@collabora.co.uk> Fri Apr 07 15:09:29 2017 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Mon Apr 10 08:52:26 2017 +0200
tree 9fa9c0d76690e12d633622c4afa7115c5bec1dcf
parent abd8c3646e1295e68fe317bc1a02148a1b5f41a4

loplugin:inlinefields in INetMIMEMessageStream

Change-Id: I675b53a55e02899f0cf325245cedb298f6903281
Reviewed-on: https://gerrit.libreoffice.org/36266
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

include/tools/inetstrm.hxx

diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx
index 8d6353b..d09aa94 100644
--- a/include/tools/inetstrm.hxx
+++ b/include/tools/inetstrm.hxx
@@ -20,10 +20,10 @@
#define INCLUDED_TOOLS_INETSTRM_HXX

#include <tools/toolsdllapi.h>
#include <tools/stream.hxx>
#include <sal/types.h>

class INetMIMEMessage;
class SvMemoryStream;
class SvStream;

class TOOLS_DLLPUBLIC INetMIMEMessageStream
@@ -36,7 +36,7 @@ class TOOLS_DLLPUBLIC INetMIMEMessageStream
    sal_Char       *pWrite;

    SvStream       *pMsgStrm;
    SvMemoryStream *pMsgBuffer;
    SvMemoryStream  maMsgBuffer;
    sal_Char       *pMsgRead;
    sal_Char       *pMsgWrite;

tools/source/inet/inetstrm.cxx

diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index 99716a1..156a245 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -34,7 +34,7 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uIntPtr nSize)

    sal_uIntPtr i, n;

    if (pMsgBuffer->Tell() == 0)
    if (maMsgBuffer.Tell() == 0)
    {
        // Insert formatted header into buffer.
        n = pSourceMsg->GetHeaderCount();
@@ -44,15 +44,15 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uIntPtr nSize)
            if (aHeader.GetValue().getLength())
            {
                // NYI: Folding long lines.
                pMsgBuffer->WriteCharPtr( aHeader.GetName().getStr() );
                pMsgBuffer->WriteCharPtr( ": " );
                pMsgBuffer->WriteCharPtr( aHeader.GetValue().getStr() );
                pMsgBuffer->WriteCharPtr( "\r\n" );
                maMsgBuffer.WriteCharPtr( aHeader.GetName().getStr() );
                maMsgBuffer.WriteCharPtr( ": " );
                maMsgBuffer.WriteCharPtr( aHeader.GetValue().getStr() );
                maMsgBuffer.WriteCharPtr( "\r\n" );
            }
        }

        pMsgWrite = const_cast<char *>(static_cast<sal_Char const *>(pMsgBuffer->GetData()));
        pMsgRead  = pMsgWrite + pMsgBuffer->Tell();
        pMsgWrite = const_cast<char *>(static_cast<sal_Char const *>(maMsgBuffer.GetData()));
        pMsgRead  = pMsgWrite + maMsgBuffer.Tell();
    }

    n = pMsgRead - pMsgWrite;
@@ -65,7 +65,7 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uIntPtr nSize)
    else
    {
        // Reset buffer.
        pMsgBuffer->Seek(STREAM_SEEK_TO_BEGIN);
        maMsgBuffer.Seek(STREAM_SEEK_TO_BEGIN);
    }

    return (pWBuf - pData);
@@ -234,7 +234,6 @@ INetMIMEMessageStream::INetMIMEMessageStream(
    pSourceMsg(pMsg),
    bHeaderGenerated(headerGenerated),
    pMsgStrm(nullptr),
    pMsgBuffer(new SvMemoryStream),
    pMsgRead(nullptr),
    pMsgWrite(nullptr),
    done(false),
@@ -242,7 +241,7 @@ INetMIMEMessageStream::INetMIMEMessageStream(
    pChildStrm(nullptr)
{
    assert(pMsg != nullptr);
    pMsgBuffer->SetStreamCharSet(RTL_TEXTENCODING_ASCII_US);
    maMsgBuffer.SetStreamCharSet(RTL_TEXTENCODING_ASCII_US);
    pBuffer = new sal_Char[BUFFER_SIZE];
    pRead = pWrite = pBuffer;
}
@@ -251,7 +250,6 @@ INetMIMEMessageStream::~INetMIMEMessageStream()
{
    delete pChildStrm;
    delete [] pBuffer;
    delete pMsgBuffer;
    delete pMsgStrm;
}