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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 10 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 0175162dc874..732d8c16c5c7 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -211,7 +211,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) ReadGDIMetaFile( rIn, aThumbMtf ); } - OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + OUString aTmpStr = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); aURL = INetURLObject(aTmpStr); } @@ -308,10 +308,10 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); rIn.SeekRel( 10 ); // 16, 16, 32, 16 - read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIn); //dummy + read_uInt16_lenPrefixed_uInt8s_ToOString(rIn); //dummy if( rReadVersion >= 5 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } DBG_NAME(SgaObjectSound) @@ -385,7 +385,7 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) rIn.ReadUInt16( nTmp16 ); eSoundType = (GalSoundType) nTmp16; if( rReadVersion >= 6 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } } @@ -538,7 +538,7 @@ void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); if( rReadVersion >= 5 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 0549d7f5cd91..fdf793a6958e 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -706,7 +706,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { sal_uInt32 nThemeId = 0; - OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pIStm); + OString aTmpStr = read_uInt16_lenPrefixed_uInt8s_ToOString(*pIStm); aThemeName = OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // execute a charakter conversion @@ -1384,7 +1384,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) rtl_TextEncoding nTextEncoding; rIStm.ReadUInt16( nVersion ); - OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); + OString aTmpStr = read_uInt16_lenPrefixed_uInt8s_ToOString(rIStm); rIStm.ReadUInt32( nCount ); if( nVersion >= 0x0004 ) @@ -1424,7 +1424,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) sal_uInt16 nTemp; rIStm.ReadUChar( bRel ); - OString aTempFileName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); + OString aTempFileName = read_uInt16_lenPrefixed_uInt8s_ToOString(rIStm); rIStm.ReadUInt32( pObj->nOffset ); rIStm.ReadUInt16( nTemp ); pObj->eObjKind = (SgaObjKind) nTemp; |