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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/misc/imap.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 4267ebebc8a1..b99921696530 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1139,7 +1139,7 @@ SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj rOStm.WriteUChar( bLink ); if( bLink ) - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); return rOStm; } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 34244ac7a6ae..d38995ef69af 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -88,16 +88,16 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const const OString aRelURL = OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, aRelURL); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aAltText, eEncoding); + write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); rOStm.WriteUChar( bActive ); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aTarget, eEncoding); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); WriteIMapObject( rOStm ); aEventList.Write( rOStm ); // V4 - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aName, eEncoding); // V5 + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aName, eEncoding); // V5 delete pCompat; } @@ -949,10 +949,10 @@ void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const // write MagicCode rOStm.WriteCharPtr( IMAPMAGIC ); rOStm.WriteUInt16( GetVersion() ); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding); - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); //dummy + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); + write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, OString()); //dummy rOStm.WriteUInt16( nCount ); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); |