tools: rename SvStream::Read/Write to ReadBytes/WriteBytes

Change-Id: Ib788a30d413436aa03f813aa2fddcbc4d6cd2f9a
Reviewed-on: https://gerrit.libreoffice.org/25972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

8 files changed, 23 insertions, 23 deletions

diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 868d54caac7d..b126b4803911 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -331,13 +331,13 @@ void LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *pObje
     char * pPointer = pBuf;
     if(pD)
     {
-        pD->Read(pPointer, nDLen);
+        pD->ReadBytes(pPointer, nDLen);
         delete pD;
     }
     pPointer += nDLen;
     if(pS)
     {
-        pS->Read(pPointer, nLen - nDLen);
+        pS->ReadBytes(pPointer, nLen - nDLen);
         delete pS;
     }
 
diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx
index 356cc543fd51..87f40494c006 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -183,7 +183,7 @@ sal_uInt32 Decompression::ReadBits(sal_uInt16 iCount, sal_uInt32 & nBits)
     {
         if (m_nBytesLeft == 0)
         {
-            m_nBytesLeft = m_pInStream->Read(m_Buffer, CHUNK);
+            m_nBytesLeft = m_pInStream->ReadBytes(m_Buffer, CHUNK);
             m_pBuffer = m_Buffer;
             if (m_nBytesLeft == 0)  return 1;
             }
@@ -242,7 +242,7 @@ sal_Int32 Decompression::explode()
             m_Output[m_nOutputBufferPos++] = (sal_uInt8)symbol;
             if (m_nOutputBufferPos == MAXWIN)
             {
-                m_pOutStream->Write(m_Output, m_nOutputBufferPos);
+                m_pOutStream->WriteBytes(m_Output, m_nOutputBufferPos);
                 m_nOutputBufferPos = 0;
             }
             continue;
@@ -299,7 +299,7 @@ sal_Int32 Decompression::explode()
 
             // - now copy LENGTH bytes from (output_ptr-DISTANCE) to output_ptr
             // write current buffer to output
-        m_pOutStream->Write(m_Output, m_nOutputBufferPos);
+        m_pOutStream->WriteBytes(m_Output, m_nOutputBufferPos);
         m_nOutputBufferPos = 0;
 
         // remember current position
@@ -312,7 +312,7 @@ sal_Int32 Decompression::explode()
         m_pOutStream->SeekRel(-(long)distance);
         sal_uInt8 sTemp[MAXWIN];
         sal_uInt32 nRead = distance > Length? Length:distance;
-        m_pOutStream->Read(sTemp, nRead);
+        m_pOutStream->ReadBytes(sTemp, nRead);
         if (nRead != Length)
         {
             // fill the buffer with read content repeatly until full
@@ -326,7 +326,7 @@ sal_Int32 Decompression::explode()
         m_pOutStream->Seek(nOutputPos);
 
            // write current buffer to output
-        m_pOutStream->Write(sTemp, Length);
+        m_pOutStream->WriteBytes(sTemp, Length);
     }
     return 0;
 }
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index cab4dd260125..8361e21cf64c 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -151,7 +151,7 @@ void LwpDrawObj::ReadClosedObjStyle()
 
     // fill style
     m_pStream->ReadUInt16( m_aClosedObjStyleRec.nFillType );
-    m_pStream->Read(m_aClosedObjStyleRec.pFillPattern,
+    m_pStream->ReadBytes(m_aClosedObjStyleRec.pFillPattern,
         sizeof(m_aClosedObjStyleRec.pFillPattern));
 }
 
@@ -1036,7 +1036,7 @@ void LwpDrawTextBox::Read()
         m_aTextRec.nTextWidth = 1;
 
     m_pStream->ReadInt16( m_aTextRec.nTextHeight );
-    m_pStream->Read(m_aTextRec.tmpTextFaceName, DRAW_FACESIZE);
+    m_pStream->ReadBytes(m_aTextRec.tmpTextFaceName, DRAW_FACESIZE);
     m_pStream->SeekRel(1);// PitchAndFamily
 
     m_pStream->ReadInt16( m_aTextRec.nTextSize );
@@ -1062,7 +1062,7 @@ void LwpDrawTextBox::Read()
     sal_Int16 TextLength = m_aObjHeader.nRecLen - 71;
     m_aTextRec.pTextString = new sal_uInt8 [TextLength];
 
-    m_pStream->Read(m_aTextRec.pTextString, TextLength);
+    m_pStream->ReadBytes(m_aTextRec.pTextString, TextLength);
 }
 
 OUString LwpDrawTextBox::RegisterStyle()
@@ -1242,7 +1242,7 @@ void LwpDrawTextArt::Read()
 
     m_pStream->SeekRel(1);
 
-    m_pStream->Read(m_aTextArtRec.tmpTextFaceName, DRAW_FACESIZE);
+    m_pStream->ReadBytes(m_aTextArtRec.tmpTextFaceName, DRAW_FACESIZE);
     m_pStream->SeekRel(1);// PitchAndFamily
 
     m_pStream->ReadInt16( m_aTextArtRec.nTextSize );
@@ -1265,7 +1265,7 @@ void LwpDrawTextArt::Read()
         throw BadRead();
 
     m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen];
-    m_pStream->Read(m_aTextArtRec.pTextString, m_aTextArtRec.nTextLen);
+    m_pStream->ReadBytes(m_aTextArtRec.pTextString, m_aTextArtRec.nTextLen);
     m_aTextArtRec.pTextString[m_aTextArtRec.nTextLen-1] = 0;
 
 }
@@ -1476,7 +1476,7 @@ void LwpDrawBitmap::Read()
         pPicData += 30*sizeof(sal_uInt8);
     }
 
-    m_pStream->Read(pPicData, nDIBRemaining);
+    m_pStream->ReadBytes(pPicData, nDIBRemaining);
 }
 
 OUString LwpDrawBitmap::RegisterStyle()
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 05c8159f753a..0389ee3cbaf9 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -106,8 +106,8 @@ using namespace OpenStormBento;
     pCompressed->Seek(0);
     std::unique_ptr<SvStream> aDecompressed(new SvMemoryStream(4096, 4096));
     unsigned char buffer[512];
-    pCompressed->Read(buffer, 16);
-    aDecompressed->Write(buffer, 16);
+    pCompressed->ReadBytes(buffer, 16);
+    aDecompressed->WriteBytes(buffer, 16);
 
     std::unique_ptr<LwpSvStream> aLwpStream(new LwpSvStream(pCompressed));
     LtcBenContainer* pBentoContainer;
@@ -129,8 +129,8 @@ using namespace OpenStormBento;
     nPos += 0x10;
 
     pCompressed->Seek(nPos);
-    while (sal_uInt32 iRead = pCompressed->Read(buffer, 512))
-        aDecompressed->Write(buffer, iRead);
+    while (sal_uInt32 iRead = pCompressed->ReadBytes(buffer, 512))
+        aDecompressed->WriteBytes(buffer, iRead);
 
     //transfer ownership of aDecompressed's ptr
     pOutDecompressed = aDecompressed.release();
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index bf04563f8732..df843a9f8703 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -367,7 +367,7 @@ sal_uInt32 LwpGraphicObject::GetRawGrafData(sal_uInt8*& pGrafData)
         // read image data
         sal_uInt32 nDataLen = pMemGrafStream->GetEndOfData();
         pGrafData = new sal_uInt8 [nDataLen];
-        pMemGrafStream->Read(pGrafData, nDataLen);
+        pMemGrafStream->ReadBytes(pGrafData, nDataLen);
 
         delete pMemGrafStream;
         pMemGrafStream = nullptr;
@@ -418,7 +418,7 @@ sal_uInt32 LwpGraphicObject::GetGrafData(sal_uInt8*& pGrafData)
         pGrafStream->Seek(nPos);
 
         pGrafData = new sal_uInt8 [nDataLen];
-        pMemGrafStream->Read(pGrafData, nDataLen);
+        pMemGrafStream->ReadBytes(pGrafData, nDataLen);
 
         delete pMemGrafStream;
         pMemGrafStream = nullptr;
diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
index ac2687ad7e9e..5f4cd9660f68 100644
--- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx
+++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx
@@ -79,7 +79,7 @@ LwpSdwFileLoader::~LwpSdwFileLoader()
 void LwpSdwFileLoader::CreateDrawObjects(std::vector< rtl::Reference<XFFrame> >* pDrawObjVector)
 {
     unsigned char BinSignature[2];
-    m_pStream->Read(BinSignature,2);
+    m_pStream->ReadBytes(BinSignature, 2);
 
     if (BinSignature[0] == 'S' && BinSignature[1] == 'M')
     {
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index 6d134a042438..51c8dec34ab2 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -98,7 +98,7 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::Reference<XFFram
 
     //flag
     unsigned char BinSignature[2];
-    m_pStream->Read(BinSignature,2);
+    m_pStream->ReadBytes(BinSignature, 2);
     if (BinSignature[0] != 'S' || BinSignature[1] != 'M')
     {
         assert(false);
@@ -243,7 +243,7 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject()
 {
     //flag
     unsigned char BinSignature[2];
-    m_pStream->Read(BinSignature,2);
+    m_pStream->ReadBytes(BinSignature, 2);
     if (BinSignature[0] != 'S' || BinSignature[1] != 'M')
     {
         assert(false);
diff --git a/lotuswordpro/source/filter/lwpsvstream.cxx b/lotuswordpro/source/filter/lwpsvstream.cxx
index 055b23579220..7ad492e27926 100644
--- a/lotuswordpro/source/filter/lwpsvstream.cxx
+++ b/lotuswordpro/source/filter/lwpsvstream.cxx
@@ -68,7 +68,7 @@ LwpSvStream::LwpSvStream(SvStream* pStream, LwpSvStream * pCompressed)
 */
 sal_Int32 LwpSvStream::Read(void* buf, sal_Int32 nBytesToRead)
 {
-    return m_pStream->Read(buf,nBytesToRead);
+    return m_pStream->ReadBytes(buf, nBytesToRead);
 }
 
 LwpSvStream& LwpSvStream::ReadUInt8( sal_uInt8& rUInt8 )