summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-06-03 14:45:59 +0200
committerMichael Stahl <mstahl@redhat.com>2016-06-06 18:09:11 +0000
commit62d270116bf34778bf581f21b27fa9cdbff7de0e (patch)
tree0402df0506ab8f6825ef497f27426f01d2e01850 /sfx2/source
parentd0bc637426060593046c8d3a4d01d0b05b052cc5 (diff)
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>
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/xpackcreator.cxx2
-rw-r--r--sfx2/source/doc/docfile.cxx4
-rw-r--r--sfx2/source/doc/oleprops.cxx8
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx2
4 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 9e952baf5696..49f34224a443 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -102,7 +102,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
if ( aSeq.getLength() < 32000 )
aSeq.realloc( 32000 );
- nRead = pTempStream->Read( aSeq.getArray(), 32000 );
+ nRead = pTempStream->ReadBytes(aSeq.getArray(), 32000);
if ( nRead < 32000 )
aSeq.realloc( nRead );
xTargetStream->writeBytes( aSeq );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2b6f96bb02a9..b64e8d317386 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3418,9 +3418,9 @@ void SfxMedium::CreateTempFile( bool bReplace )
while( !pImpl->m_pInStream->IsEof() && nErr == ERRCODE_NONE )
{
- sal_uInt32 nRead = pImpl->m_pInStream->Read( pBuf, 8192 );
+ sal_uInt32 nRead = pImpl->m_pInStream->ReadBytes(pBuf, 8192);
nErr = pImpl->m_pInStream->GetError();
- pImpl->m_pOutStream->Write( pBuf, nRead );
+ pImpl->m_pOutStream->WriteBytes( pBuf, nRead );
}
bTransferSuccess = true;
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 2d1fe085654c..71e0e98b6bf7 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -277,7 +277,7 @@ OUString SfxOleStringHelper::ImplLoadString8( SvStream& rStrm ) const
{
// load character buffer
::std::vector< sal_Char > aBuffer( static_cast< size_t >( nSize + 1 ), 0 );
- rStrm.Read( &aBuffer.front(), static_cast< sal_Size >( nSize ) );
+ rStrm.ReadBytes(&aBuffer.front(), static_cast<sal_Size>(nSize));
// create string from encoded character array
aValue = OUString( &aBuffer.front(), strlen( &aBuffer.front() ), GetTextEncoding() );
}
@@ -321,7 +321,7 @@ void SfxOleStringHelper::ImplSaveString8( SvStream& rStrm, const OUString& rValu
sal_Int32 nSize = aEncoded.getLength() + 1;
rStrm.WriteInt32( nSize );
// write character array with trailing NUL character
- rStrm.Write(aEncoded.getStr(), aEncoded.getLength());
+ rStrm.WriteBytes(aEncoded.getStr(), aEncoded.getLength());
rStrm.WriteUChar( 0 );
}
@@ -629,7 +629,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm )
// clipboard size: clip_format_tag + data_format_tag + bitmap_len
sal_Int32 nClipSize = static_cast< sal_Int32 >( 4 + 4 + mData.getLength() );
rStrm.WriteInt32( nClipSize ).WriteInt32( CLIPFMT_WIN ).WriteInt32( CLIPDATAFMT_DIB );
- rStrm.Write( mData.getConstArray(), mData.getLength() );
+ rStrm.WriteBytes(mData.getConstArray(), mData.getLength());
}
else
{
@@ -655,7 +655,7 @@ void SfxOleBlobProperty::ImplLoad( SvStream& )
void SfxOleBlobProperty::ImplSave( SvStream& rStrm )
{
if (IsValid()) {
- rStrm.Write( mData.getConstArray(), mData.getLength() );
+ rStrm.WriteBytes(mData.getConstArray(), mData.getLength());
} else {
SAL_WARN( "sfx.doc", "SfxOleBlobProperty::ImplSave - invalid BLOB property" );
SetError( SVSTREAM_INVALID_ACCESS );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 6be889c2b9dd..9f42bf8d7f81 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1971,7 +1971,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
const sal_uInt32 nLen = pStream->Seek( STREAM_SEEK_TO_END );
Sequence< sal_Int8 > aSeq( nLen );
pStream->Seek( STREAM_SEEK_TO_BEGIN );
- pStream->Read( aSeq.getArray(), nLen );
+ pStream->ReadBytes(aSeq.getArray(), nLen);
delete pStream;
if( aSeq.getLength() )
aAny <<= aSeq;