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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index c5bdc95c1abf..8c601355183a 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1891,7 +1891,7 @@ Err: OUString read_uInt8_BeltAndBracesString(SvStream& rStrm, rtl_TextEncoding eEnc) { - OUString aRet = read_lenPrefixed_uInt8s_ToOUString<sal_uInt8>(rStrm, eEnc); + OUString aRet = read_uInt8_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); rStrm.SeekRel(sizeof(sal_uInt8)); // skip null-byte at end return aRet; } @@ -3821,7 +3821,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen rArray.push_back(read_uInt16_PascalString(rStrm)); else { - OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm); + OString aTmp = read_uInt8_lenPrefixed_uInt8s_ToOString(rStrm); rArray.push_back(OStringToOUString(aTmp, eCS)); } @@ -3852,7 +3852,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen pValueArray->push_back(read_uInt16_PascalString(rStrm)); else { - OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm); + OString aTmp = read_uInt8_lenPrefixed_uInt8s_ToOString(rStrm); pValueArray->push_back(OStringToOUString(aTmp, eCS)); } } diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 50d5e5854a80..d83790bd727e 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -122,12 +122,12 @@ public: //by string contents inline OUString read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc) { - return read_lenPrefixed_uInt8s_ToOUString<sal_uInt8>(rStrm, eEnc); + return read_uInt8_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); } inline OUString read_uInt16_PascalString(SvStream& rStrm) { - return read_lenPrefixed_uInt16s_ToOUString<sal_uInt16>(rStrm); + return read_uInt16_lenPrefixed_uInt16s_ToOUString(rStrm); } //Belt and Braces strings, i.e. Pascal-style strings followed by |