From c4f0efc2378cebc3b581bc949da70a2b2f149961 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Dec 2011 10:44:56 +0000 Subject: 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 --- basic/source/runtime/iosys.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basic') diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index a2fe3bd9a096..1a63f943d5a7 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -656,7 +656,7 @@ SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerBy n = nLen; if( !n ) return nError = SbERR_BAD_RECORD_LENGTH; - rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*pStrm, n)); + rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n)); //Pad it out with ' ' to the requested length on short read sal_Int32 nRequested = sal::static_int_cast(n); comphelper::string::padToLength(aBuffer, nRequested, ' '); -- cgit