diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-06 12:44:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 15:32:11 +0000 |
| commit | b2878af3223c438abeecc77d9976e56db31a5b49 (patch) | |
| tree | 74ccf2cfdbec9093671eb98cb58dfe57f27461f1 /svtools | |
| parent | 15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 (diff) | |
more SvStream:operator>> conversion
Convert the template based read_lenPrefixed methods to regular
methods.
Change-Id: Ifd0e93aca055e55a0575e4377ec2b8e266dfb019
Reviewed-on: https://gerrit.libreoffice.org/7895
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-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 16ca08ce81ff..a1d619ab2918 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1160,7 +1160,7 @@ SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - OUString aLink = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, RTL_TEXTENCODING_UTF8); + OUString aLink = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); rGraphicObj.SetLink(aLink); } else diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index c2c18fc7d68e..9cf2a4f493de 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -118,10 +118,10 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL ) rIStm.SeekRel( 2 ); rIStm.ReadUInt16( nReadVersion ); rIStm.ReadUInt16( nTextEncoding ); - aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding); - aAltText = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding); + aURL = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aAltText = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); rIStm.ReadUChar( bActive ); - aTarget = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding); + aTarget = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); // make URL absolute aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); @@ -136,7 +136,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL ) // from version 5 onwards an objectname could be available if ( nReadVersion >= 0x0005 ) - aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding); + aName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); } delete pCompat; @@ -991,10 +991,10 @@ void ImageMap::Read( SvStream& rIStm, const OUString& rBaseURL ) // read on version rIStm.SeekRel( 2 ); - aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, osl_getThreadTextEncoding()); - read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); // Dummy + aName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, osl_getThreadTextEncoding()); + read_uInt16_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy rIStm.ReadUInt16( nCount ); - read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); // Dummy + read_uInt16_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy pCompat = new IMapCompat( rIStm, STREAM_READ ); |