diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-17 15:53:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:10:58 +0000 |
| commit | 92f396733ebc518bcb7a9eae2dd3169d333b82b9 (patch) | |
| tree | 55cf13dea05f06d4eea95c8382f771090a3bac4b /editeng | |
| parent | b57eceb231b61abc7121686d70df8d7c0dfacb75 (diff) | |
convert ReadByteString/WriteByteString from ByteString to OString
Nobody ever used the return values anyway, so for reading just
return the string and for writing the number of bytes written
Doesn't need to be members, make standalone functions
Rename to
read_lenPrefixed_uInt8s_ToO[U]String and
write_lenPrefixed_uInt8s_FromO[U]String, lengthy,
but much less unambiguous, seeing as a lot of users of it don't
seem to be aware that they read/write pascal-style length
prefixed strings, which isn't surprising given the
apparent simplicity of their original name.
added a unit test
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 678f31abad56..0fd144b42514 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1131,10 +1131,10 @@ void BinTextObject::StoreData( SvStream& rOStream ) const // Convert CH_FEATURE to CH_FEATURE_OLD aText.SearchAndReplaceAll( cFeatureConverted, CH_FEATURE_OLD ); - rOStream.WriteByteString( aText ); + write_lenPrefixed_uInt8s_FromOString(rOStream, aText); // StyleName and Family... - rOStream.WriteByteString( rtl::OUStringToOString(pC->GetStyle(), eEncoding) ); + write_lenPrefixed_uInt8s_FromOUString(rOStream, pC->GetStyle(), eEncoding); rOStream << (sal_uInt16)pC->GetFamily(); // Paragraph attributes ... @@ -1226,9 +1226,8 @@ void BinTextObject::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - ByteString aByteString; - rIStream.ReadByteString( aByteString ); - pC->GetText() = String( aByteString, eSrcEncoding ); + ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); + pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding ); |