summaryrefslogtreecommitdiff
path: root/oox/source/helper
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-12 10:45:32 +0200
committerNoel Grandin <noel@peralex.com>2014-12-12 10:46:23 +0200
commitaa2f02a4dc8a05f49e679a26f2beebb9d66b2325 (patch)
treebed0e3b1b000fceaf09552bc703d19a236de7bbc /oox/source/helper
parentdf46ec0580b625efe8bd747bed54bc4d4d71f073 (diff)
remove operator>> and operator<< methods
in favour of ReadXXX/WriteXXX methods Change-Id: I69eebee3a8ce5b40301db7940a1d85915c0bf6f4
Diffstat (limited to 'oox/source/helper')
-rw-r--r--oox/source/helper/binaryinputstream.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index b514beb70fba..7597981c29ec 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -42,8 +42,12 @@ const sal_Int32 INPUTSTREAM_BUFFERSIZE = 0x8000;
OUString BinaryInputStream::readNulUnicodeArray()
{
OUStringBuffer aBuffer;
- for( sal_uInt16 nChar = readuInt16(); !mbEof && (nChar > 0); readValue( nChar ) )
- aBuffer.append( static_cast< sal_Unicode >( nChar ) );
+ for (;;)
+ {
+ sal_uInt16 nChar = readuInt16();
+ if ( mbEof || (nChar < 0) ) break;
+ aBuffer.append( static_cast< sal_Unicode >( nChar ) );
+ }
return aBuffer.makeStringAndClear();
}