diff options
| author | Noel Grandin <noel@peralex.com> | 2014-01-17 08:48:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-01-22 22:00:47 +0000 |
| commit | 16a2e903356520c90a9bf91c47265f79be12e74a (patch) | |
| tree | fe696998dc937562003b0d4273ded896df1ba5f5 /svx | |
| parent | d803483f6a5938b0d0708b8db74b30c511dd8e31 (diff) | |
remove SvStream::operator<< methods
.. and convert the last few places still using those methods.
Change-Id: Id2cd8f9c0dd281df43af439d4fef65881f34a6fd
Reviewed-on: https://gerrit.libreoffice.org/7495
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 10 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 2f078021059a..6d85fa8da31c 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -192,7 +192,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const OUString aURLWithoutDestDir = aURL.GetMainURL( INetURLObject::NO_DECODE ); aURLWithoutDestDir = aURLWithoutDestDir.replaceFirst(rDestDir, ""); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); } void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) @@ -299,8 +299,8 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const OUString& rDestDir ) const SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, OString()); //dummy - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_uInt16_lenPrefixed_uInt8s_FromOString(rOut, OString()); //dummy + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) @@ -371,7 +371,7 @@ void SgaObjectSound::WriteData( SvStream& rOut, const OUString& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); rOut.WriteUInt16( (sal_uInt16) eSoundType ); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) @@ -530,7 +530,7 @@ sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel ) void SgaObjectSvDraw::WriteData( SvStream& rOut, const OUString& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 3567a0e56075..193026226b18 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1295,7 +1295,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const sal_Bool bRel; rOStm.WriteUInt16( (sal_uInt16) 0x0004 ); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); rOStm.WriteUInt32( nCount ).WriteUInt16( (sal_uInt16) osl_getThreadTextEncoding() ); for( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1347,7 +1347,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const } rOStm.WriteUChar( bRel ); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aPath, RTL_TEXTENCODING_UTF8); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( (sal_uInt16) pObj->eObjKind ); } |