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>

30 files changed, 134 insertions, 128 deletions

diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index cb016c3306a3..98aef88379e4 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -36,7 +36,7 @@ void BitmapTools::loadFromSvg(SvStream& rStream, const OUString& sPath, BitmapEx
 
     sal_Size nSize = rStream.remainingSize();
     std::vector<sal_Int8> aBuffer(nSize + 1);
-    rStream.Read(aBuffer.data(), nSize);
+    rStream.ReadBytes(aBuffer.data(), nSize);
     aBuffer[nSize] = 0;
 
     uno::Sequence<sal_Int8> aData(aBuffer.data(), nSize + 1);
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index aa24bfb50113..fc6143296072 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -152,7 +152,7 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation)
         GfxLink aLink = mrGraphic.GetLink();
 
         SvMemoryStream aSourceStream;
-        aSourceStream.Write(aLink.GetData(), aLink.GetDataSize());
+        aSourceStream.WriteBytes(aLink.GetData(), aLink.GetDataSize());
         aSourceStream.Seek( STREAM_SEEK_TO_BEGIN );
 
         Orientation aOrientation = TOP_LEFT;
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index a690faf222c7..2fab78563a68 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -90,7 +90,7 @@ protected:
 
     virtual void SAL_CALL   writeBytes( const css::uno::Sequence< sal_Int8 >& rData )
         throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
-        { mrStm.Write( rData.getConstArray(), rData.getLength() ); }
+        { mrStm.WriteBytes(rData.getConstArray(), rData.getLength()); }
     virtual void SAL_CALL   flush()
         throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override
         { mrStm.Flush(); }
@@ -206,7 +206,7 @@ bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen)
           bdBoxOk = false;
 
         // read version op
-        rStream.Read( sBuf,3 );
+        rStream.ReadBytes(sBuf, 3);
         // see http://developer.apple.com/legacy/mac/library/documentation/mac/pdf/Imaging_With_QuickDraw/Appendix_A.pdf
         // normal version 2 - page A23 and A24
         if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && sBuf[ 2 ] == 0x02)
@@ -273,13 +273,13 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
     else if (nStreamLen >= 256)
     {
         // load first 256 bytes into a buffer
-        sal_uLong nRead = rStream.Read(sFirstBytes, 256);
+        sal_uLong nRead = rStream.ReadBytes(sFirstBytes, 256);
         if (nRead < 256)
             nStreamLen = nRead;
     }
     else
     {
-        nStreamLen = rStream.Read(sFirstBytes, nStreamLen);
+        nStreamLen = rStream.ReadBytes(sFirstBytes, nStreamLen);
     }
 
 
@@ -477,7 +477,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
         {
             char sBuf[8];
             rStream.Seek( nStreamPos + 2048 );
-            rStream.Read( sBuf, 7 );
+            rStream.ReadBytes( sBuf, 7 );
 
             if( strncmp( sBuf, "PCD_IPI", 7 ) == 0 )
             {
@@ -618,7 +618,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
         std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8 [ nSize ]);
 
         rStream.Seek( nStreamPos );
-        rStream.Read( pBuf.get(), nSize );
+        rStream.ReadBytes( pBuf.get(), nSize );
         sal_uInt8* pPtr = ImplSearchEntry( pBuf.get(), reinterpret_cast<sal_uInt8 const *>("#define"), nSize, 7 );
 
         if( pPtr )
@@ -700,7 +700,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
             {
                 nCheckSize = nStreamLen < 2048 ? nStreamLen : 2048;
                 rStream.Seek(nStreamPos);
-                nCheckSize = rStream.Read(sExtendedOrDecompressedFirstBytes, nCheckSize);
+                nCheckSize = rStream.ReadBytes(sExtendedOrDecompressedFirstBytes, nCheckSize);
             }
 
             if(ImplSearchEntry(pCheckArray, reinterpret_cast<sal_uInt8 const *>("<svg"), nCheckSize, 4)) // '<svg'
@@ -1461,7 +1461,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
                             SvMemoryStream aIStrm(const_cast<sal_uInt8*>(&rData[11]), nGraphicContentSize, StreamMode::READ);
                             pGraphicContent = new sal_uInt8[nGraphicContentSize];
                             sal_uInt64 aCurrentPosition = aIStrm.Tell();
-                            aIStrm.Read(pGraphicContent, nGraphicContentSize);
+                            aIStrm.ReadBytes(pGraphicContent, nGraphicContentSize);
                             aIStrm.Seek(aCurrentPosition);
                             ImportGIF(aIStrm, rGraphic);
                             eLinkType = GfxLinkType::NativeGif;
@@ -1513,7 +1513,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
             {
                 std::vector<sal_uInt8> aTwoBytes(2);
                 rIStream.Seek(nStreamPosition);
-                rIStream.Read(&aTwoBytes[0], 2);
+                rIStream.ReadBytes(&aTwoBytes[0], 2);
                 rIStream.Seek(nStreamPosition);
 
                 if(aTwoBytes[0] == 0x1F && aTwoBytes[1] == 0x8B)
@@ -1530,7 +1530,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
                     {
                         SvgDataArray aNewData(nMemoryLength);
                         aMemStream.Seek(STREAM_SEEK_TO_BEGIN);
-                        aMemStream.Read(aNewData.begin(), nMemoryLength);
+                        aMemStream.ReadBytes(aNewData.begin(), nMemoryLength);
 
                         // Make a uncompressed copy for GfxLink
                         nGraphicContentSize = nMemoryLength;
@@ -1549,7 +1549,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
                 {
                     SvgDataArray aNewData(nStreamLength);
                     rIStream.Seek(nStreamPosition);
-                    rIStream.Read(aNewData.begin(), nStreamLength);
+                    rIStream.ReadBytes(aNewData.begin(), nStreamLength);
 
                     if(!rIStream.GetError())
                     {
@@ -1758,7 +1758,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
                 if( nStatus == GRFILTER_OK )
                 {
                     rIStream.Seek(nStreamBegin);
-                    rIStream.Read(pGraphicContent, nGraphicContentSize);
+                    rIStream.ReadBytes(pGraphicContent, nGraphicContentSize);
                 }
             }
         }
@@ -2043,7 +2043,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
 
                 if (aSvgDataPtr.get() && aSvgDataPtr->getSvgDataArrayLength())
                 {
-                    rOStm.Write(aSvgDataPtr->getSvgDataArray().getConstArray(), aSvgDataPtr->getSvgDataArrayLength());
+                    rOStm.WriteBytes(aSvgDataPtr->getSvgDataArray().getConstArray(), aSvgDataPtr->getSvgDataArrayLength());
 
                     if( rOStm.GetError() )
                     {
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index a2eee2cce4fa..b31c0cb58fc0 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -910,7 +910,7 @@ bool GraphicDescriptor::ImpDetectEPS( SvStream& rStm, bool )
     rStm.SetEndian( SvStreamEndian::BIG );
     rStm.ReadUInt32( nFirstLong );
     rStm.SeekRel( -4 );
-    rStm.Read( &nFirstBytes, 20 );
+    rStm.ReadBytes( &nFirstBytes, 20 );
 
     if ( ( nFirstLong == 0xC5D0D3C6 ) || aPathExt.startsWith( "eps" ) ||
         ( ImplSearchEntry( nFirstBytes, reinterpret_cast<sal_uInt8 const *>("%!PS-Adobe"), 10, 10 )
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index f008b1bd9125..0609314924c7 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -227,13 +227,13 @@ bool GIFReader::ReadGlobalHeader()
     sal_uInt8   nAspect;
     bool    bRet = false;
 
-    rIStm.Read( pBuf, 6 );
+    rIStm.ReadBytes( pBuf, 6 );
     if( NO_PENDING( rIStm ) )
     {
         pBuf[ 6 ] = 0;
         if( !strcmp( pBuf, "GIF87a" ) || !strcmp( pBuf, "GIF89a" ) )
         {
-            rIStm.Read( pBuf, 7 );
+            rIStm.ReadBytes( pBuf, 7 );
             if( NO_PENDING( rIStm ) )
             {
                 SvMemoryStream aMemStm;
@@ -270,7 +270,7 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount )
     if (nLen > nMaxPossible)
         nLen = nMaxPossible;
     std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[ nLen ]);
-    sal_Size nRead = rIStm.Read(pBuf.get(), nLen);
+    sal_Size nRead = rIStm.ReadBytes(pBuf.get(), nLen);
     nCount = nRead/3UL;
     if( NO_PENDING( rIStm ) )
     {
@@ -417,7 +417,7 @@ bool GIFReader::ReadExtension()
                 std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[nCount]);
 
                 bRet = false;
-                sal_Size nRead = rIStm.Read(pBuffer.get(), nCount);
+                sal_Size nRead = rIStm.ReadBytes(pBuffer.get(), nCount);
                 if (NO_PENDING(rIStm) && cSize < nRead)
                 {
                     cSize = pBuffer[cSize];
@@ -437,7 +437,7 @@ bool GIFReader::ReadLocalHeader()
     sal_uInt8   pBuf[ 9 ];
     bool    bRet = false;
 
-    sal_Size nRead = rIStm.Read(pBuf, 9);
+    sal_Size nRead = rIStm.ReadBytes(pBuf, 9);
     if (NO_PENDING(rIStm) && nRead == 9)
     {
         SvMemoryStream  aMemStm;
@@ -493,7 +493,7 @@ sal_uLong GIFReader::ReadNextBlock()
             nRet = 2UL;
         else
         {
-            rIStm.Read( pSrcBuf, cBlockSize );
+            rIStm.ReadBytes( pSrcBuf, cBlockSize );
 
             if( NO_PENDING( rIStm ) )
             {
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index b757709be118..ef4ef3d1d953 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -638,7 +638,7 @@ bool XPMReader::ImplGetString()
     {
         if ( mnTempAvail == 0 )
         {
-            mnTempAvail = mrIStm.Read( mpTempBuf, XPMTEMPBUFSIZE );
+            mnTempAvail = mrIStm.ReadBytes( mpTempBuf, XPMTEMPBUFSIZE );
             if ( mnTempAvail == 0 )
                 break;
 
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index d585329609eb..c695a3a92983 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -208,7 +208,7 @@ bool Exif::processExif(SvStream& rStream, sal_uInt16 aSectionLength, bool bSetVa
     std::unique_ptr<sal_uInt8[]> aExifData(new sal_uInt8[aLength]);
     sal_uInt32 aExifDataBeginPosition = rStream.Tell();
 
-    rStream.Read(aExifData.get(), aLength);
+    rStream.ReadBytes(aExifData.get(), aLength);
 
     // Exif detected
     mbExifPresent = true;
@@ -257,7 +257,7 @@ bool Exif::processExif(SvStream& rStream, sal_uInt16 aSectionLength, bool bSetVa
     if (bSetValue)
     {
         rStream.Seek(aExifDataBeginPosition);
-        rStream.Write(aExifData.get(), aLength);
+        rStream.WriteBytes(aExifData.get(), aLength);
     }
 
     return true;
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 3f3487633c4f..8959e4e8bd99 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -72,7 +72,7 @@ long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize )
     {
         long nInitialPosition = pStream->Tell();
 
-        nRead = (long) pStream->Read( pBuffer, nBufferSize );
+        nRead = static_cast<long>(pStream->ReadBytes(pBuffer, nBufferSize));
 
         if( pStream->GetError() == ERRCODE_IO_PENDING )
         {
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 27fd6f23a96c..d25bf89406d6 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -53,7 +53,7 @@ extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
 {
     DestinationManagerStruct * destination = reinterpret_cast<DestinationManagerStruct *>(cinfo->dest);
 
-    if (destination->stream->Write(destination->buffer, BUFFER_SIZE) != (size_t) BUFFER_SIZE)
+    if (destination->stream->WriteBytes(destination->buffer, BUFFER_SIZE) != BUFFER_SIZE)
     {
         ERREXIT(cinfo, JERR_FILE_WRITE);
     }
@@ -72,7 +72,7 @@ extern "C" void term_destination (j_compress_ptr cinfo)
     /* Write any data remaining in the buffer */
     if (datacount > 0)
     {
-        if (destination->stream->Write(destination->buffer, datacount) != datacount)
+        if (destination->stream->WriteBytes(destination->buffer, datacount) != datacount)
         {
             ERREXIT(cinfo, JERR_FILE_WRITE);
         }
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index b7825d99c4e7..a2a51200a543 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -47,8 +47,8 @@ SvStream& ReadSgfHeader(SvStream& rIStream, SgfHeader& rHead)
     rIStream.ReadInt16(rHead.Yoffs);
     rIStream.ReadUInt16(rHead.Planes);
     rIStream.ReadUInt16(rHead.SwGrCol);
-    rIStream.Read(&rHead.Autor, 10);
-    rIStream.Read(&rHead.Programm, 10);
+    rIStream.ReadBytes(&rHead.Autor, 10);
+    rIStream.ReadBytes(&rHead.Programm, 10);
     rIStream.ReadUInt16(rHead.OfsLo);
     rIStream.ReadUInt16(rHead.OfsHi);
     assert(rIStream.GetError() || rIStream.Tell() == nOldPos + SgfHeaderSize);
@@ -75,7 +75,7 @@ SvStream& ReadSgfEntry(SvStream& rIStream, SgfEntry& rEntr)
     rIStream.ReadUInt16(rEntr.iFrei);
     rIStream.ReadUInt16(rEntr.lFreiLo);
     rIStream.ReadUInt16(rEntr.lFreiHi);
-    rIStream.Read(&rEntr.cFrei, 10);
+    rIStream.ReadBytes(&rEntr.cFrei, 10);
     rIStream.ReadUInt16(rEntr.OfsLo);
     rIStream.ReadUInt16(rEntr.OfsHi);
     assert(rIStream.GetError() || rIStream.Tell() == nOldPos + SgfEntrySize);
@@ -154,7 +154,7 @@ SvStream& WriteBmpInfoHeader(SvStream& rOStream, BmpInfoHeader& rInfo)
 
 SvStream& WriteRGBQuad(SvStream& rOStream, const RGBQuad& rQuad)
 {
-    rOStream.Write(&rQuad, sizeof(rQuad));
+    rOStream.WriteBytes(&rQuad, sizeof(rQuad));
     return rOStream;
 }
 
@@ -176,10 +176,10 @@ sal_uInt8 PcxExpand::GetByte(SvStream& rInp)
     if (Count>0) {
         Count--;
     } else {
-        rInp.Read(&Data, 1);
+        rInp.ReadBytes(&Data, 1);
         if ((Data & 0xC0) == 0xC0) {
             Count=(Data & 0x3F) -1;
-            rInp.Read(&Data, 1);
+            rInp.ReadBytes(&Data, 1);
         }
     }
     return Data;
@@ -233,14 +233,14 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
         WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0xFF) ); // white
         nOfs=rOut.Tell();
         for (j=0;j<rHead.Ysize;j++)
-            rOut.Write(pBuf.get(), nWdtOut); // fill file with zeroes
+            rOut.WriteBytes(pBuf.get(), nWdtOut); // fill file with zeroes
         for (j=0;j<rHead.Ysize;j++) {
             for(i=0;i<nWdtInp;i++) {
                 pBuf[i]=aPcx.GetByte(rInp);
             }
             for(i=nWdtInp;i<nWdtOut;i++) pBuf[i]=0;     // up to 3 bytes
             rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
-            rOut.Write(pBuf.get(), nWdtOut);
+            rOut.WriteBytes(pBuf.get(), nWdtOut);
         }
     } else if (nColors==16) {
         sal_uInt8 pl2= 0;     // planes' masks
@@ -264,7 +264,7 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
 
         nOfs=rOut.Tell();
         for (j=0;j<rHead.Ysize;j++)
-            rOut.Write(pBuf.get(), nWdtOut); // fill file with zeroes
+            rOut.WriteBytes(pBuf.get(), nWdtOut); // fill file with zeroes
         for (j=0;j<rHead.Ysize;j++) {
             memset(pBuf.get(),0,nWdtOut);
             for(k=0;k<4;k++) {
@@ -288,27 +288,27 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
             }
             for(i=nWdtInp*4;i<nWdtOut;i++) pBuf[i]=0;            // up to 3 bytes
             rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
-            rOut.Write(pBuf.get(), nWdtOut);
+            rOut.WriteBytes(pBuf.get(), nWdtOut);
         }
     } else if (nColors==256) {
         cRGB[3]=0;                      // fourth palette entry for BMP
         for (i=0;i<256;i++) {           // copy palette
-            rInp.Read(cRGB, 3);
+            rInp.ReadBytes(cRGB, 3);
             pl1=cRGB[0];                // switch red and blue
             cRGB[0]=cRGB[2];
             cRGB[2]=pl1;
-            rOut.Write(cRGB, 4);
+            rOut.WriteBytes(cRGB, 4);
         }
 
         nOfs=rOut.Tell();
         for (j=0;j<rHead.Ysize;j++)
-            rOut.Write(pBuf.get(), nWdtOut); // fill file with zeroes
+            rOut.WriteBytes(pBuf.get(), nWdtOut); // fill file with zeroes
         for (j=0;j<rHead.Ysize;j++) {
             for(i=0;i<rHead.Xsize;i++)
                 pBuf[i]=aPcx.GetByte(rInp);
             for(i=rHead.Xsize;i<nWdtOut;i++) pBuf[i]=0;          // up to 3 bytes
             rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
-            rOut.Write(pBuf.get(), nWdtOut);
+            rOut.WriteBytes(pBuf.get(), nWdtOut);
         }
     }
     return true;
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 1d85a9808209..c4f474f043b5 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -777,7 +777,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
                     ReadTextType( rInp, aText );
                     if (!rInp.GetError()) {
                         aText.Buffer=new UCHAR[aText.BufSize+1]; // add one for LookAhead at CK-separation
-                        rInp.Read(aText.Buffer, aText.BufSize);
+                        rInp.ReadBytes(aText.Buffer, aText.BufSize);
                         if (!rInp.GetError()) aText.Draw(rOut);
                         delete[] aText.Buffer;
                     }
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 98a1f957b2a7..8c352fa37f49 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -872,7 +872,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
 
         sal_uInt32 nPalSize = nPalCount * 4;
 
-        m_rStm.Write( aMemStm.GetData(), nDIBSize );
+        m_rStm.WriteBytes( aMemStm.GetData(), nDIBSize );
 
         const sal_uLong nEndPos = m_rStm.Tell();
         m_rStm.Seek( nOffPos );
@@ -1504,7 +1504,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
                 if (pCommentAction->GetComment() == "EMF_PLUS")
                 {
                     ImplBeginCommentRecord(WIN_EMR_COMMENT_EMFPLUS);
-                    m_rStm.Write(pCommentAction->GetData(),
+                    m_rStm.WriteBytes(pCommentAction->GetData(),
                                  pCommentAction->GetDataSize());
                     ImplEndCommentRecord();
                 }
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f4e7d45b9a4a..d7b7fe293b6d 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -434,7 +434,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, bool& bHaveDC)
 
     sal_Size pos = pWMF->Tell();
     void *buffer = malloc( length );
-    pOut->PassEMFPlus( buffer, pWMF->Read( buffer, length ) );
+    pOut->PassEMFPlus( buffer, pWMF->ReadBytes(buffer, length) );
     free( buffer );
     pWMF->Seek( pos );
 
@@ -1275,7 +1275,7 @@ bool EnhWMFReader::ReadEnhWMF()
 
                             // copy DIBInfoHeader from source (cbBmiSrc bytes)
                             pWMF->Seek( nStart + offBmiSrc );
-                            pWMF->Read( pBuf + 14, cbBmiSrc );
+                            pWMF->ReadBytes(pBuf + 14, cbBmiSrc);
 
                             if(bReadAlpha)
                             {
@@ -1287,7 +1287,7 @@ bool EnhWMFReader::ReadEnhWMF()
 
                             // copy bitmap data from source (offBitsSrc bytes)
                             pWMF->Seek( nStart + offBitsSrc );
-                            pWMF->Read( pBuf + 14 + nDeltaToDIB5HeaderSize + cbBmiSrc, cbBitsSrc );
+                            pWMF->ReadBytes(pBuf + 14 + nDeltaToDIB5HeaderSize + cbBmiSrc, cbBitsSrc);
                             aTmp.Seek( 0 );
 
                             // prepare to read and fill BitmapEx
@@ -1394,9 +1394,9 @@ bool EnhWMFReader::ReadEnhWMF()
                                 .WriteUInt16( 0 )
                                 .WriteUInt32( cbBmiSrc + 14 );
                             pWMF->Seek( nStart + offBmiSrc );
-                            pWMF->Read( pBuf + 14, cbBmiSrc );
+                            pWMF->ReadBytes(pBuf + 14, cbBmiSrc);
                             pWMF->Seek( nStart + offBitsSrc );
-                            pWMF->Read( pBuf + 14 + cbBmiSrc, cbBitsSrc );
+                            pWMF->ReadBytes(pBuf + 14 + cbBmiSrc, cbBitsSrc);
                             aTmp.Seek( 0 );
                             ReadDIB(aBitmap, aTmp, true);
 
@@ -1461,9 +1461,9 @@ bool EnhWMFReader::ReadEnhWMF()
                                .WriteUInt16( 0 )
                                .WriteUInt32( cbBmiSrc + 14 );
                             pWMF->Seek( nStart + offBmiSrc );
-                            pWMF->Read( pBuf + 14, cbBmiSrc );
+                            pWMF->ReadBytes(pBuf + 14, cbBmiSrc);
                             pWMF->Seek( nStart + offBitsSrc );
-                            pWMF->Read( pBuf + 14 + cbBmiSrc, cbBitsSrc );
+                            pWMF->ReadBytes(pBuf + 14 + cbBmiSrc, cbBitsSrc);
                             aTmp.Seek( 0 );
                             ReadDIB(aBitmap, aTmp, true);
 
@@ -1580,7 +1580,7 @@ bool EnhWMFReader::ReadEnhWMF()
                             if ( nLen <= static_cast<sal_Int32>( nEndPos - pWMF->Tell() ) )
                             {
                                 std::unique_ptr<sal_Char[]> pBuf(new sal_Char[ nLen ]);
-                                pWMF->Read( pBuf.get(), nLen );
+                                pWMF->ReadBytes(pBuf.get(), nLen);
                                 aText = OUString(pBuf.get(), nLen, pOut->GetCharSet());
                                 pBuf.reset();
 
@@ -1605,7 +1605,7 @@ bool EnhWMFReader::ReadEnhWMF()
                             if ( ( nLen * sizeof(sal_Unicode) ) <= ( nEndPos - pWMF->Tell() ) )
                             {
                                 std::unique_ptr<sal_Unicode[]> pBuf(new sal_Unicode[ nLen ]);
-                                pWMF->Read( pBuf.get(), nLen << 1 );
+                                pWMF->ReadBytes(pBuf.get(), nLen << 1);
 #ifdef OSL_BIGENDIAN
                                 sal_Char nTmp, *pTmp = (sal_Char*)( pBuf.get() + nLen );
                                 while ( pTmp-- != (sal_Char*)pBuf.get() )
@@ -1708,9 +1708,9 @@ bool EnhWMFReader::ReadEnhWMF()
                                     .WriteUInt16( 0 )
                                     .WriteUInt32( cbBmi + 14 );
                                 pWMF->Seek( nStart + offBmi );
-                                pWMF->Read( pBuf + 14, cbBmi );
+                                pWMF->ReadBytes(pBuf + 14, cbBmi);
                                 pWMF->Seek( nStart + offBits );
-                                pWMF->Read( pBuf + 14 + cbBmi, cbBits );
+                                pWMF->ReadBytes(pBuf + 14 + cbBmi, cbBits);
                                 aTmp.Seek( 0 );
                                 ReadDIB(aBitmap, aTmp, true);
                             }
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 12fef7f872a8..5c3ccd825d9e 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -508,7 +508,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
             if ( nLength )
             {
                 std::unique_ptr<char[]> pChar(new char[ ( nLength + 1 ) &~ 1 ]);
-                pWMF->Read( pChar.get(), ( nLength + 1 ) &~ 1 );
+                pWMF->ReadBytes(pChar.get(), (nLength + 1) &~ 1);
                 OUString aText( pChar.get(), nLength, pOut->GetCharSet() );
                 pChar.reset();
                 Point aPosition( ReadYX() );
@@ -550,7 +550,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
                     aRect = Rectangle( aPt1, aPt2 );
                 }
                 std::unique_ptr<char[]> pChar(new char[ ( nOriginalTextLen + 1 ) &~ 1 ]);
-                pWMF->Read( pChar.get(), ( nOriginalTextLen + 1 ) &~ 1 );
+                pWMF->ReadBytes(pChar.get(), (nOriginalTextLen + 1) &~ 1);
                 OUString aText( pChar.get(), (sal_uInt16)nOriginalTextLen, pOut->GetCharSet() );// after this conversion the text may contain
                 nNewTextLen = aText.getLength();                                          // less character (japanese version), so the
                 pChar.reset();                                                         // dxAry will not fit
@@ -903,7 +903,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
             pWMF->ReadUChar( aLogFont.lfClipPrecision );
             pWMF->ReadUChar( aLogFont.lfQuality );
             pWMF->ReadUChar( aLogFont.lfPitchAndFamily );
-            pWMF->Read( lfFaceName, LF_FACESIZE );
+            pWMF->ReadBytes( lfFaceName, LF_FACESIZE );
             aLogFont.lfWidth = aFontSize.Width();
             aLogFont.lfHeight = aFontSize.Height();
             aLogFont.lfEscapement = lfEscapement;
@@ -1024,7 +1024,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
                                 if ( nEscLen > 0 )
                                 {
                                     pData.reset(new sal_Int8[ nEscLen ]);
-                                    pWMF->Read( pData.get(), nEscLen );
+                                    pWMF->ReadBytes(pData.get(), nEscLen);
                                     nCheckSum = rtl_crc32( nCheckSum, pData.get(), nEscLen );
                                 }
                                 if ( nCheck == nCheckSum )
@@ -1041,7 +1041,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
                                                 sal_uInt32  nStringLen, nDXCount;
                                                 std::unique_ptr<long[]> pDXAry;
                                                 SvMemoryStream aMemoryStream( nEscLen );
-                                                aMemoryStream.Write( pData.get(), nEscLen );
+                                                aMemoryStream.WriteBytes(pData.get(), nEscLen);
                                                 aMemoryStream.Seek( STREAM_SEEK_TO_BEGIN );
                                                 sal_Int32 nTmpX(0), nTmpY(0);
                                                 aMemoryStream.ReadInt32( nTmpX )
@@ -1112,9 +1112,9 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
                             if( pEMFStream )
                             {
                                 std::unique_ptr<sal_Int8[]> pBuf(new sal_Int8[ nCurRecSize ]);
-                                sal_uInt32 nCount = pWMF->Read( pBuf.get(), nCurRecSize );
+                                sal_uInt32 nCount = pWMF->ReadBytes(pBuf.get(), nCurRecSize);
                                 if( nCount == nCurRecSize )
-                                    pEMFStream->Write( pBuf.get(), nCount );
+                                    pEMFStream->WriteBytes(pBuf.get(), nCount);
                             }
                         }
                     }
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 9fa5bb3eb3db..8b96fdf848cf 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -435,7 +435,7 @@ void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_In
          .WriteUInt32( 0xa2c2a )        // evil magic number
          .WriteUInt32( nCheckSum )      // crc32 checksum about nEsc & pData
          .WriteUInt32( nEsc );          // escape number
-    pWMF->Write( pData, nLen );
+    pWMF->WriteBytes( pData, nLen );
     if ( nLen & 1 )
         pWMF->WriteUChar( 0 );          // pad byte
 }
@@ -1922,7 +1922,7 @@ void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sa
          .WriteUInt32( nRemainingSize )                 // remaining size of data in following records, missing in MSDN documentation
          .WriteUInt32( nTotalSize );                    // total size of EMF stream
 
-   pWMF->Write( static_cast< const sal_Char* >( rStream.GetData() ) + rStream.Tell(), nCurSize );
+   pWMF->WriteBytes(static_cast<const sal_Char*>(rStream.GetData()) + rStream.Tell(), nCurSize);
    rStream.SeekRel( nCurSize );
    UpdateRecordHeader();
 }
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 2b4992d90412..4e2dd868d1f0 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -310,7 +310,7 @@ bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, bool bQuad )
     BitmapColor     aPalColor;
 
     std::unique_ptr<sal_uInt8[]> pEntries(new sal_uInt8[ nPalSize ]);
-    if (rIStm.Read( pEntries.get(), nPalSize ) != nPalSize)
+    if (rIStm.ReadBytes(pEntries.get(), nPalSize) != nPalSize)
     {
         return false;
     }
@@ -504,7 +504,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
             return false;
         }
         sal_Size n = nAlignedWidth * rHeader.nHeight;
-        if (rIStm.Read(rAcc.GetBuffer(), n) != n)
+        if (rIStm.ReadBytes(rAcc.GetBuffer(), n) != n)
         {
             return false;
         }
@@ -529,7 +529,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
 
             std::unique_ptr<sal_uInt8[]> pBuffer(
                 new sal_uInt8[rHeader.nSizeImage]);
-            if (rIStm.Read(pBuffer.get(), rHeader.nSizeImage)
+            if (rIStm.ReadBytes(pBuffer.get(), rHeader.nSizeImage)
                 != rHeader.nSizeImage)
             {
                 return false;
@@ -552,8 +552,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
                 {
                     for( ; nCount--; nY += nI )
                     {
-                        sal_uInt8*  pTmp;
-                        if (rIStm.Read( pTmp = pBuf.get(), nAlignedWidth )
+                        sal_uInt8 * pTmp = pBuf.get();
+                        if (rIStm.ReadBytes(pTmp, nAlignedWidth)
                             != nAlignedWidth)
                         {
                             return false;
@@ -578,8 +578,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
                 {
                     for( ; nCount--; nY += nI )
                     {
-                        sal_uInt8*  pTmp;
-                        if (rIStm.Read( pTmp = pBuf.get(), nAlignedWidth )
+                        sal_uInt8 * pTmp = pBuf.get();
+                        if (rIStm.ReadBytes(pTmp, nAlignedWidth)
                             != nAlignedWidth)
                         {
                             return false;
@@ -604,8 +604,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
                 {
                     for( ; nCount--; nY += nI )
                     {
-                        sal_uInt8*  pTmp;
-                        if (rIStm.Read( pTmp = pBuf.get(), nAlignedWidth )
+                        sal_uInt8 * pTmp = pBuf.get();
+                        if (rIStm.ReadBytes(pTmp, nAlignedWidth)
                             != nAlignedWidth)
                         {
                             return false;
@@ -634,8 +634,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
 
                     for( ; nCount--; nY += nI )
                     {
-                        sal_uInt16*     pTmp16;
-                        if (rIStm.Read( ( pTmp16 = reinterpret_cast<sal_uInt16*>(pBuf.get()) ), nAlignedWidth )
+                        sal_uInt16 * pTmp16 = reinterpret_cast<sal_uInt16*>(pBuf.get());
+                        if (rIStm.ReadBytes(pTmp16, nAlignedWidth)
                             != nAlignedWidth)
                         {
                             return false;
@@ -656,8 +656,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
 
                     for( ; nCount--; nY += nI )
                     {
-                        sal_uInt8* pTmp;
-                        if (rIStm.Read( pTmp = pBuf.get(), nAlignedWidth )
+                        sal_uInt8* pTmp = pBuf.get();
+                        if (rIStm.ReadBytes(pTmp, nAlignedWidth)
                             != nAlignedWidth)
                         {
                             return false;
@@ -696,7 +696,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
 
                         for( ; nCount--; nY += nI )
                         {
-                            if (rIStm.Read( ( pTmp32 = reinterpret_cast<sal_uInt32*>(pBuf.get()) ), nAlignedWidth )
+                            pTmp32 = reinterpret_cast<sal_uInt32*>(pBuf.get());
+                            if (rIStm.ReadBytes(pTmp32, nAlignedWidth)
                                 != nAlignedWidth)
                             {
                                 return false;
@@ -715,7 +716,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
                     {
                         for( ; nCount--; nY += nI )
                         {
-                            if (rIStm.Read( ( pTmp32 = reinterpret_cast<sal_uInt32*>(pBuf.get()) ), nAlignedWidth )
+                            pTmp32 = reinterpret_cast<sal_uInt32*>(pBuf.get());
+                            if (rIStm.ReadBytes(pTmp32, nAlignedWidth)
                                 != nAlignedWidth)
                             {
                                 return false;
@@ -1015,7 +1017,7 @@ bool ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc )
         *pTmpEntry++ = 0;
     }
 
-    rOStm.Write( pEntries.get(), nPalSize );
+    rOStm.WriteBytes( pEntries.get(), nPalSize );
 
     return( rOStm.GetError() == 0UL );
 }
@@ -1124,7 +1126,7 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, bool bRLE4 )
         pBuf[ nBufCount++ ] = 0;
         pBuf[ nBufCount++ ] = 0;
 
-        rOStm.Write( pBuf.get(), nBufCount );
+        rOStm.WriteBytes( pBuf.get(), nBufCount );
     }
 
     rOStm.WriteUChar( 0 );
@@ -1141,22 +1143,22 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
         SVBT32              aVal32;
 
         UInt32ToSVBT32( rMask.GetRedMask(), aVal32 );
-        rOStm.Write( aVal32, 4UL );
+        rOStm.WriteBytes( aVal32, 4UL );
 
         UInt32ToSVBT32( rMask.GetGreenMask(), aVal32 );
-        rOStm.Write( aVal32, 4UL );
+        rOStm.WriteBytes( aVal32, 4UL );
 
         UInt32ToSVBT32( rMask.GetBlueMask(), aVal32 );
-        rOStm.Write( aVal32, 4UL );
+        rOStm.WriteBytes( aVal32, 4UL );
 
         rImageSize = rOStm.Tell();
 
         if( rAcc.IsBottomUp() )
-            rOStm.Write( rAcc.GetBuffer(), rAcc.Height() * rAcc.GetScanlineSize() );
+            rOStm.WriteBytes(rAcc.GetBuffer(), rAcc.Height() * rAcc.GetScanlineSize());
         else
         {
             for( long nY = rAcc.Height() - 1, nScanlineSize = rAcc.GetScanlineSize(); nY >= 0L; nY-- )
-                rOStm.Write( rAcc.GetScanline( nY ), nScanlineSize );
+                rOStm.WriteBytes( rAcc.GetScanline(nY), nScanlineSize );
         }
     }
     else if(!pAccAlpha && ((RLE_4 == nCompression) || (RLE_8 == nCompression)))
@@ -1203,7 +1205,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
 
         if(bNative)
         {
-            rOStm.Write(rAcc.GetBuffer(), nAlignedWidth * rAcc.Height());
+            rOStm.WriteBytes(rAcc.GetBuffer(), nAlignedWidth * rAcc.Height());
         }
         else
         {
@@ -1236,7 +1238,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
                         }
 
                         *pTmp = cTmp;
-                        rOStm.Write( pBuf.get(), nAlignedWidth );
+                        rOStm.WriteBytes( pBuf.get(), nAlignedWidth );
                     }
                 }
                 break;
@@ -1264,7 +1266,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
                             cTmp |= rAcc.GetPixelIndex( nY, nX ) << ( --nShift << 2L );
                         }
                         *pTmp = cTmp;
-                        rOStm.Write( pBuf.get(), nAlignedWidth );
+                        rOStm.WriteBytes( pBuf.get(), nAlignedWidth );
                     }
                 }
                 break;
@@ -1278,7 +1280,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
                         for( long nX = 0L; nX < nWidth; nX++ )
                             *pTmp++ = rAcc.GetPixelIndex( nY, nX );
 
-                        rOStm.Write( pBuf.get(), nAlignedWidth );
+                        rOStm.WriteBytes( pBuf.get(), nAlignedWidth );
                     }
                 }
                 break;
@@ -1311,7 +1313,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
                             }
                         }
 
-                        rOStm.Write( pBuf.get(), nAlignedWidth );
+                        rOStm.WriteBytes( pBuf.get(), nAlignedWidth );
                     }
                 }
                 break;
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index afbce6be2e87..64811b3769e7 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2758,7 +2758,7 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
 
         aId[ 0 ] = 0;
         aId[ 6 ] = 0;
-        rIStm.Read( aId, 6 );
+        rIStm.ReadBytes( aId, 6 );
 
         if ( !strcmp( aId, "VCLMTF" ) )
         {
@@ -2861,7 +2861,7 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm )
     SvStreamEndian   nOldFormat = rOStm.GetEndian();
 
     rOStm.SetEndian( SvStreamEndian::LITTLE );
-    rOStm.Write( "VCLMTF", 6 );
+    rOStm.WriteBytes( "VCLMTF", 6 );
 
     pCompat = new VersionCompat( rOStm, StreamMode::WRITE, 1 );
 
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index fed0321f3ed8..c6db9866c3ef 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -234,7 +234,7 @@ bool GfxLink::ExportNative( SvStream& rOStream ) const
         if( IsSwappedOut() )
             mpSwap->WriteTo( rOStream );
         else if( GetData() )
-            rOStream.Write( GetData(), GetDataSize() );
+            rOStream.WriteBytes( GetData(), GetDataSize() );
     }
 
     return ( rOStream.GetError() == ERRCODE_NONE );
@@ -258,7 +258,7 @@ SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink )
         if( rGfxLink.IsSwappedOut() )
             rGfxLink.mpSwap->WriteTo( rOStream );
         else if( rGfxLink.GetData() )
-            rOStream.Write( rGfxLink.GetData(), rGfxLink.GetDataSize() );
+            rOStream.WriteBytes( rGfxLink.GetData(), rGfxLink.GetDataSize() );
     }
 
     return rOStream;
@@ -288,7 +288,7 @@ SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink)
     pCompat.reset(); // destructor writes stuff into the header
 
     pBuf = new sal_uInt8[ nSize ];
-    rIStream.Read( pBuf, nSize );
+    rIStream.ReadBytes( pBuf, nSize );
 
     rGfxLink = GfxLink( pBuf, nSize, (GfxLinkType) nType );
     rGfxLink.SetUserId( nUserId );
@@ -316,7 +316,7 @@ ImpSwap::ImpSwap( sal_uInt8* pData, sal_uLong nDataSize ) :
             std::unique_ptr<SvStream> xOStm(::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE ));
             if( xOStm )
             {
-                xOStm->Write( pData, mnDataSize );
+                xOStm->WriteBytes( pData, mnDataSize );
                 bool bError = ( ERRCODE_NONE != xOStm->GetError() );
                 xOStm.reset();
 
@@ -346,7 +346,7 @@ sal_uInt8* ImpSwap::GetData() const
         if( xIStm )
         {
             pData = new sal_uInt8[ mnDataSize ];
-            xIStm->Read( pData, mnDataSize );
+            xIStm->ReadBytes( pData, mnDataSize );
             bool bError = ( ERRCODE_NONE != xIStm->GetError() );
             sal_Size nActReadSize = xIStm->Tell();
             if (nActReadSize != mnDataSize)
@@ -376,7 +376,7 @@ void ImpSwap::WriteTo( SvStream& rOStm ) const
 
     if( pData )
     {
-        rOStm.Write( pData, mnDataSize );
+        rOStm.WriteBytes( pData, mnDataSize );
         delete[] pData;
     }
 }
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index d2ce7646075f..371350bfdc1e 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1553,7 +1553,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
                             {
                                 SvgDataArray aNewData(nSvgDataArrayLength);
 
-                                rIStm.Read(aNewData.getArray(), nSvgDataArrayLength);
+                                rIStm.ReadBytes(aNewData.getArray(), nSvgDataArrayLength);
                                 OUString aPath = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet());
 
                                 if (!rIStm.GetError())
@@ -1625,7 +1625,8 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
 
                             rOStm.WriteUInt32( nSvgMagic );
                             rOStm.WriteUInt32( rImpGraphic.getSvgData()->getSvgDataArrayLength() );
-                            rOStm.Write(rImpGraphic.getSvgData()->getSvgDataArray().getConstArray(), rImpGraphic.getSvgData()->getSvgDataArrayLength());
+                            rOStm.WriteBytes(rImpGraphic.getSvgData()->getSvgDataArray().getConstArray(),
+                                rImpGraphic.getSvgData()->getSvgDataArrayLength());
                             rOStm.WriteUniOrByteString(rImpGraphic.getSvgData()->getPath(),
                                                        rOStm.GetStreamCharSet());
                         }
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index b5627eecda64..00362bb9740e 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -235,7 +235,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
         }
         sal_Size nFirstPos = rIStream.Tell();
         std::unique_ptr<char[]> pTempBuf(new char[nRead]);
-        rIStream.Read(pTempBuf.get(), nRead);
+        rIStream.ReadBytes(pTempBuf.get(), nRead);
         if (nRead >= sizeof(ImplOldJobSetupData))
         {
             ImplOldJobSetupData* pData = reinterpret_cast<ImplOldJobSetupData*>(pTempBuf.get());
@@ -341,9 +341,9 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
             int nPos = rOStream.Tell();
             rOStream.WriteUInt16( nLen );
             rOStream.WriteUInt16( nSystem );
-            rOStream.Write( &aOldData, sizeof( aOldData ) );
-            rOStream.Write( &aOldJobData, nOldJobDataSize );
-            rOStream.Write( pJobData->mpDriverData, pJobData->mnDriverDataLen );
+            rOStream.WriteBytes( &aOldData, sizeof( aOldData ) );
+            rOStream.WriteBytes( &aOldJobData, nOldJobDataSize );
+            rOStream.WriteBytes( pJobData->mpDriverData, pJobData->mnDriverDataLen );
             std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
             for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it )
             {
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 869758780613..059b62e91788 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -3349,7 +3349,7 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteInt32( mnValue ).WriteUInt32( mnDataSize );
 
     if ( mnDataSize )
-        rOStm.Write( mpData, mnDataSize );
+        rOStm.WriteBytes( mpData, mnDataSize );
 }
 
 void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )
@@ -3365,7 +3365,7 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )
     if( mnDataSize )
     {
         mpData = new sal_uInt8[ mnDataSize ];
-        rIStm.Read( mpData, mnDataSize );
+        rIStm.ReadBytes(mpData, mnDataSize);
     }
     else
         mpData = nullptr;
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index ca25461b3693..2647047f8502 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -469,7 +469,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc
                         sal_uInt32 nBytes = aGfxLink.GetDataSize();
                         if( pData && nBytes )
                         {
-                            aTmp.Write( pData, nBytes );
+                            aTmp.WriteBytes( pData, nBytes );
                             rWriter.DrawJPGBitmap( aTmp, aGraphic.GetBitmap().GetBitCount() > 8, aGraphic.GetSizePixel(), aOutputRect, aMask );
                         }
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 26df395f92d3..b2edf76c5729 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2110,7 +2110,7 @@ bool PDFWriterImpl::compressStream( SvMemoryStream* pStream )
     pStream->Seek( STREAM_SEEK_TO_BEGIN );
     aStream.Seek( STREAM_SEEK_TO_BEGIN );
     pStream->SetStreamSize( nEndPos );
-    pStream->Write( aStream.GetData(), nEndPos );
+    pStream->WriteBytes( aStream.GetData(), nEndPos );
     return true;
 #else
     (void)pStream;
@@ -2155,7 +2155,8 @@ bool PDFWriterImpl::writeBuffer( const void* pBuffer, sal_uInt64 nBytes )
     if( !m_aOutputStreams.empty() )
     {
         m_aOutputStreams.front().m_pStream->Seek( STREAM_SEEK_TO_END );
-        m_aOutputStreams.front().m_pStream->Write( pBuffer, sal::static_int_cast<sal_Size>(nBytes) );
+        m_aOutputStreams.front().m_pStream->WriteBytes(
+                pBuffer, sal::static_int_cast<sal_Size>(nBytes));
         return true;
     }
 
@@ -9997,7 +9998,8 @@ void PDFWriterImpl::drawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uI
         aContent.append( " S\n" );
     else
         aContent.append( " f*\n" );
-    m_aTransparentObjects.back().m_pContentStream->Write( aContent.getStr(), aContent.getLength() );
+    m_aTransparentObjects.back().m_pContentStream->WriteBytes(
+        aContent.getStr(), aContent.getLength() );
 
     OStringBuffer aObjName( 16 );
     aObjName.append( "Tr" );
@@ -11808,7 +11810,8 @@ void PDFWriterImpl::drawWallpaper( const Rectangle& rRect, const Wallpaper& rWal
                 m_aTilings.back().m_nObject         = createObject();
                 m_aTilings.back().m_aRectangle      = Rectangle( Point( 0, 0 ), aConvertRect.GetSize() );
                 m_aTilings.back().m_pTilingStream   = new SvMemoryStream();
-                m_aTilings.back().m_pTilingStream->Write( aTilingStream.getStr(), aTilingStream.getLength() );
+                m_aTilings.back().m_pTilingStream->WriteBytes(
+                    aTilingStream.getStr(), aTilingStream.getLength() );
                 // phase the tiling so wallpaper begins on upper left
                 if ((aConvertRect.GetWidth() == 0) || (aConvertRect.GetHeight() == 0))
                     throw o3tl::divide_by_zero();
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 377d41be6df6..57dc337ad296 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -297,7 +297,7 @@ bool PNGReaderImpl::ReadNextChunk()
             sal_Int32 nBytesRead = 0;
             do {
                 sal_uInt8* pPtr = &rChunkData.aData[ nBytesRead ];
-                nBytesRead += mrPNGStream.Read( pPtr, mnChunkLen - nBytesRead );
+                nBytesRead += mrPNGStream.ReadBytes(pPtr, mnChunkLen - nBytesRead);
             } while ( ( nBytesRead < mnChunkLen ) && ( mrPNGStream.GetError() == ERRCODE_NONE ) );
 
             nCRC32 = rtl_crc32( nCRC32, &rChunkData.aData[ 0 ], mnChunkLen );
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index f4eb63912490..4f61e92b1041 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -279,7 +279,7 @@ bool PNGWriterImpl::Write(SvStream& rOStm)
         rOStm.WriteUInt32(nDataSize);
         rOStm.WriteUInt32(aBeg->nType);
         if (nDataSize)
-            rOStm.Write(&aBeg->aData[0], nDataSize);
+            rOStm.WriteBytes(&aBeg->aData[0], nDataSize);
         rOStm.WriteUInt32(nCRC);
         ++aBeg;
     }
diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
index 6c0fc705f1f5..2efe52f332ee 100644
--- a/vcl/source/gdi/svgdata.cxx
+++ b/vcl/source/gdi/svgdata.cxx
@@ -175,7 +175,7 @@ SvgData::SvgData(const OUString& rPath):
     if (nStmLen)
     {
         maSvgDataArray.realloc(nStmLen);
-        rIStm.Read(maSvgDataArray.begin(), nStmLen);
+        rIStm.ReadBytes(maSvgDataArray.begin(), nStmLen);
 
         if (rIStm.GetError())
         {
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index f28daa662aad..ef8ad97ecdd3 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -242,7 +242,7 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont,
     rActualCharSet = GetStoreCharSet( rFont.GetCharSet() );
     ImplWriteColor( rOStm, rFont.GetColor() );
     ImplWriteColor( rOStm, rFont.GetFillColor() );
-    rOStm.Write( aName, 32 );
+    rOStm.WriteBytes( aName, 32 );
     WritePair( rOStm, rFont.GetFontSize() );
     rOStm.WriteInt16( 0 ); // no character orientation anymore
     rOStm.WriteInt16( rFont.GetOrientation() );
@@ -477,7 +477,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
     sal_Int16   nVersion;
 
     // read header
-    rIStm.Read( aCode, sizeof( aCode ) );  // Identifier
+    rIStm.ReadBytes(aCode, sizeof(aCode));  // Identifier
     rIStm.ReadInt16( nSize );                                 // Size
     rIStm.ReadInt16( nVersion );                              // Version
     sal_Int32 nTmp32(0);
@@ -817,7 +817,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
 
                     ImplReadColor( rIStm, aActionColor ); aFont.SetColor( aActionColor );
                     ImplReadColor( rIStm, aActionColor ); aFont.SetFillColor( aActionColor );
-                    rIStm.Read( aName, 32 );
+                    rIStm.ReadBytes( aName, 32 );
                     aFont.SetFamilyName( OUString( aName, strlen(aName), rIStm.GetStreamCharSet() ) );
                     rIStm.ReadInt32( nWidth ).ReadInt32( nHeight );
                     rIStm.ReadInt16( nCharOrient ).ReadInt16( nLineOrient );
@@ -1330,7 +1330,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     if( nDataSize )
                     {
                         pData = new sal_uInt8[ nDataSize ];
-                        rIStm.Read( pData, nDataSize );
+                        rIStm.ReadBytes( pData, nDataSize );
                     }
                     else
                         pData = nullptr;
@@ -1736,7 +1736,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.WriteInt32( pAct->GetIndex() );
                 rOStm.WriteInt32( pAct->GetLen() );
                 rOStm.WriteInt32( nStrLen );
-                rOStm.Write( aText.getStr(), nStrLen + 1 );
+                rOStm.WriteBytes( aText.getStr(), nStrLen + 1 );
                 nCount++;
             }
             break;
@@ -1776,7 +1776,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.WriteInt32( nLen );
                 rOStm.WriteInt32( nLen );
                 rOStm.WriteInt32( nAryLen );
-                rOStm.Write( aText.getStr()+pAct->GetIndex(), nLen + 1 );
+                rOStm.WriteBytes( aText.getStr()+pAct->GetIndex(), nLen + 1 );
 
                 for (sal_Int32 n = 0; n < nAryLen; ++n)
                     rOStm.WriteInt32( pDXArray[ n ] );
@@ -1802,7 +1802,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.WriteInt32( pAct->GetLen() );
                 rOStm.WriteInt32( nStrLen );
                 rOStm.WriteInt32( pAct->GetWidth() );
-                rOStm.Write( aText.getStr(), nStrLen + 1 );
+                rOStm.WriteBytes( aText.getStr(), nStrLen + 1 );
                 nCount++;
             }
             break;
@@ -2441,7 +2441,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
                 rOStm.WriteInt32( pA->GetValue() ).WriteUInt32( nDataSize );
 
                 if( nDataSize )
-                    rOStm.Write( pA->GetData(), nDataSize );
+                    rOStm.WriteBytes( pA->GetData(), nDataSize );
 
                 rOStm.WriteInt32( 0 ); // number of actions that follow this comment
 
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 49b6d97c1ffb..b512dd43047a 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -70,7 +70,7 @@ std::shared_ptr<SvStream> wrapStream(css::uno::Reference< css::io::XInputStream
         sal_Int32 const size = 2048;
         css::uno::Sequence< sal_Int8 > data(size);
         sal_Int32 n = stream->readBytes(data, size);
-        s->Write(data.getConstArray(), n);
+        s->WriteBytes(data.getConstArray(), n);
         if (n < size)
             break;
     }
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index aead34c96eb1..730487dbc294 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -176,7 +176,7 @@ bool JobData::getStreamBuffer( void*& pData, sal_uInt32& bytes )
     sal_uLong nBytes;
     std::unique_ptr<char[]> pContextBuffer(m_aContext.getStreamableBuffer( nBytes ));
     if( nBytes )
-        aStream.Write( pContextBuffer.get(), nBytes );
+        aStream.WriteBytes( pContextBuffer.get(), nBytes );
     pContextBuffer.reset();
 
     // success
@@ -276,7 +276,7 @@ bool JobData::constructFromStreamBuffer( void* pData, sal_uInt32 bytes, JobData&
                     rJobData.m_aContext.setParser( rJobData.m_pParser );
                     const sal_uInt64 nBytes = bytes - aStream.Tell();
                     std::unique_ptr<char[]> pRemain(new char[bytes - aStream.Tell()]);
-                    aStream.Read( pRemain.get(), nBytes );
+                    aStream.ReadBytes( pRemain.get(), nBytes );
                     rJobData.m_aContext.rebuildFromStreamBuffer( pRemain.get(), nBytes );
                     bContext = true;
                 }
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 65d16c11e0fe..bcb14219e6a3 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -266,7 +266,7 @@ IMPL_LINK_NOARG_TYPED( MyWin, SelectHdl, ListBox&, void)
         aCommand.append( OUStringToOString( aEntry.copy( nPos+2 ), RTL_TEXTENCODING_ASCII_US ) );
         OString aAnswer( processCommand( aCommand.makeStringAndClear() ) );
         SvMemoryStream aStream( aAnswer.getLength() );
-        aStream.Write( aAnswer.getStr(), aAnswer.getLength() );
+        aStream.WriteBytes( aAnswer.getStr(), aAnswer.getLength() );
         aStream.Seek( STREAM_SEEK_TO_BEGIN );
 
         Graphic aGraphicResult;