diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-13 15:42:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-13 16:46:32 +0000 |
| commit | 5b6586127828b211303b961df66531865abe5ba2 (patch) | |
| tree | 4aa5c665f930a6b0afa372280fb9552311d89988 /sw | |
| parent | a55ae5fde1cbd8c29f8aa3a66a4d362355a3062c (diff) | |
these are length prefixed strings
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 56981ace6280..ea3e65c032ca 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1964,7 +1964,6 @@ xub_StrLen WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr, rStr.Append(String(read_LEuInt16s_ToOUString(rStrm, nLen))); else { - // Alloc method automatically sets Zero at the end rtl::OString aByteStr = read_uInt8s_ToOString(rStrm, nLen); rStr.Append(String(rtl::OStringToOUString(aByteStr, eEnc))); } @@ -3867,9 +3866,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen rArray.push_back(read_LEuInt16_PascalString(rStrm)); else { - sal_uInt8 nBChar(0); - rStrm >> nBChar; - rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); + rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm); rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); } @@ -3900,9 +3897,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen pValueArray->push_back(read_LEuInt16_PascalString(rStrm)); else { - sal_uInt8 nBChar(0); - rStrm >> nBChar; - rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); + rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(rStrm); pValueArray->push_back(rtl::OStringToOUString(aTmp, eCS)); } } |