[Libreoffice-commits] .: tools/inc tools/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Tue Jul 5 12:57:50 PDT 2011
tools/inc/tools/stream.hxx | 2 ++
tools/source/stream/stream.cxx | 10 ++++++++++
2 files changed, 12 insertions(+)
New commits:
commit b97b16173baf6f240d6db3a67d44705ecb5b12d3
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Wed Jun 29 22:56:28 2011 +0200
Added SvStream::ReadLine( rtl::OString& )
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 6f6a3be..391024f 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -34,6 +34,7 @@
#include <tools/errinf.hxx>
#include <tools/ref.hxx>
#include <tools/rtti.hxx>
+#include <rtl/string.hxx>
class FileCopier;
class StreamData;
@@ -403,6 +404,7 @@ public:
sal_Bool ReadCString( String& rStr ) { return ReadCString( rStr, GetStreamCharSet()); }
sal_Bool ReadLine( ByteString& rStr );
+ sal_Bool ReadLine( rtl::OString& rStr );
sal_Bool WriteLine( const ByteString& rStr );
sal_Bool WriteLines( const ByteString& rStr );
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 1316c6c..6ca9d79 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -43,6 +43,7 @@
#include <tools/solar.h>
+
#define SWAPNIBBLES(c) \
unsigned char nSwapTmp=c; \
nSwapTmp <<= 4; \
@@ -719,6 +720,15 @@ sal_Bool SvStream::ReadLine( ByteString& rStr )
return bEnd;
}
+sal_Bool SvStream::ReadLine( rtl::OString& rStr )
+{
+ ByteString aFoo;
+ sal_Bool ret;
+ ret = ReadLine(aFoo);
+ rStr = aFoo;
+ return ret;
+}
+
sal_Bool SvStream::ReadUniStringLine( String& rStr )
{
sal_Unicode buf[256+1];
More information about the Libreoffice-commits
mailing list