diff options
| author | Noel Grandin <noel@peralex.com> | 2014-01-16 12:40:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-01-22 22:00:39 +0000 |
| commit | d803483f6a5938b0d0708b8db74b30c511dd8e31 (patch) | |
| tree | 6f75da8815e03744e6ff94f3502a93c896e07bf0 /svx/source/gallery2 | |
| parent | dd34ecba1048549d122a759cd5c7f743f5899d73 (diff) | |
convert more SvStream::operator<< calls
.. to more explicit SvStream::Write* calls
This was done using another run of the clang rewriter, and then
a lot of hand tweaking to fix all the places where the rewriter
did not play nice with various macros.
Change-Id: I7bcab93851c8dfb59cde6bc76290c6484d88fb18
Reviewed-on: https://gerrit.libreoffice.org/7494
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/galmisc.cxx | 2 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index fca950f8660f..0632722b0781 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -555,7 +555,7 @@ sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pU if( pUserObject ) { - *rxOStm << *static_cast< SotStorageStream* >( pUserObject ); + rxOStm->WriteStream( *static_cast< SotStorageStream* >( pUserObject ) ); bRet = ( rxOStm->GetError() == ERRCODE_NONE ); } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 8d4f6fb4c704..3567a0e56075 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -319,7 +319,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt if( pOStm ) { - *pOStm << nNextNumber; + pOStm->WriteUInt32( nNextNumber ); delete pOStm; } @@ -1294,9 +1294,9 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const sal_uInt32 nCount = GetObjectCount(); sal_Bool bRel; - rOStm << (sal_uInt16) 0x0004; + rOStm.WriteUInt16( (sal_uInt16) 0x0004 ); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); - rOStm << nCount << (sal_uInt16) osl_getThreadTextEncoding(); + rOStm.WriteUInt32( nCount ).WriteUInt16( (sal_uInt16) osl_getThreadTextEncoding() ); for( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -1346,19 +1346,19 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const << m_aDestDir << "' in '" << aPath << "'"); } - rOStm << bRel; + rOStm.WriteUChar( bRel ); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aPath, RTL_TEXTENCODING_UTF8); - rOStm << pObj->nOffset << (sal_uInt16) pObj->eObjKind; + rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( (sal_uInt16) pObj->eObjKind ); } // more recently, a 512-byte reserve buffer is written, // to recognize them two sal_uIntPtr-Ids will be written. - rOStm << COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) << COMPAT_FORMAT( 'E', 'S', 'R', 'V' ); + rOStm.WriteUInt32( COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) ).WriteUInt32( COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) ); const long nReservePos = rOStm.Tell(); VersionCompat* pCompat = new VersionCompat( rOStm, STREAM_WRITE, 2 ); - rOStm << (sal_uInt32) GetId() << IsThemeNameFromResource(); // From version 2 and up + rOStm.WriteUInt32( (sal_uInt32) GetId() ).WriteUChar( IsThemeNameFromResource() ); // From version 2 and up delete pCompat; |