diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-04 23:38:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 08:58:12 +0100 |
| commit | 253576484ff4c991a1a1299c71cb8cfb463d2c83 (patch) | |
| tree | d61f68a91921182f5fc46665ada6186cad473647 /sc | |
| parent | a1c936ce5364ffae88e682780f4579b3b94b673d (diff) | |
can replace ScfTools::AppendCString with SvStream::ReadCString
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/ftools/ftools.cxx | 14 | ||||
| -rw-r--r-- | sc/source/filter/inc/ftools.hxx | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index cf48cdd243c4..744cb49f21e3 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -310,22 +310,10 @@ ByteString ScfTools::ReadCString( SvStream& rStrm, sal_Int32& rnBytesLeft ) return aRet.makeStringAndClear(); } -void ScfTools::AppendCString( SvStream& rStrm, ByteString& rString ) -{ - sal_Char cChar; - - rStrm >> cChar; - while( cChar ) - { - rString += cChar; - rStrm >> cChar; - } -} - void ScfTools::AppendCString( SvStream& rStrm, String& rString, rtl_TextEncoding eTextEnc ) { ByteString aByteString; - AppendCString( rStrm, aByteString ); + rStrm.ReadCString(aByteString); rString += String( aByteString, eTextEnc ); } diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index cdd2d623503d..39c49dcdaac1 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -249,8 +249,6 @@ public: { return String( ReadCString( rStrm, rnBytesLeft ), eTextEnc ); } /** Appends a zero terminted byte string. */ - static void AppendCString( SvStream& rStrm, ByteString& rString ); - /** Appends a zero terminted byte string. */ static void AppendCString( SvStream& rStrm, String& rString, rtl_TextEncoding eTextEnc ); // *** HTML table names <-> named range names *** ----------------------------- |