diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-13 17:51:17 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-13 18:30:29 +0200 |
commit | 7f44f0b5083fda151f32955f4334b318e2386681 (patch) | |
tree | 29f9deab3e56a7852c0ad7b04a02b08cd3823fb1 /lotuswordpro/source | |
parent | 4646c9474f062282ac32919700a5c3749d54300e (diff) |
Return value of LwpTools::QuickReadUnicode is unused
...since previous commit
Change-Id: I439c8d66a826624a3131b56d96ff3fdd030abb28
Diffstat (limited to 'lotuswordpro/source')
-rw-r--r-- | lotuswordpro/source/filter/lwptools.cxx | 8 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwptools.hxx | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lotuswordpro/source/filter/lwptools.cxx b/lotuswordpro/source/filter/lwptools.cxx index 48385216d9ea..6c2a3c196353 100644 --- a/lotuswordpro/source/filter/lwptools.cxx +++ b/lotuswordpro/source/filter/lwptools.cxx @@ -80,12 +80,10 @@ using namespace ::osl; /** * @descr read lwp unicode string from stream to OUString per aEncoding */ -sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, +void LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, OUString& str, sal_uInt16 strlen, rtl_TextEncoding aEncoding) //strlen: length of bytes { - - sal_uInt16 readLen = 0; OUStringBuffer strBuf(128); if( !IsUnicodePacked(pObjStrm, strlen) ) @@ -100,11 +98,9 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, buf[len] = '\0'; strBuf.append( OUString(buf, len, aEncoding) ); strlen -= len; - readLen += len; if(!len) break; } str = strBuf.makeStringAndClear(); - return readLen; } else { @@ -116,6 +112,7 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, bool flag = false; //switch if unicode part reached sal_uInt16 sublen = 0; + sal_uInt16 readLen = 0; while(readLen<strlen) { if(!flag) //Not unicode string @@ -174,7 +171,6 @@ sal_uInt16 LwpTools::QuickReadUnicode(LwpObjectStream* pObjStrm, } } str = strBuf.makeStringAndClear(); - return readLen; } } diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx index 05ea62e0356c..c5d11e6244d0 100644 --- a/lotuswordpro/source/filter/lwptools.hxx +++ b/lotuswordpro/source/filter/lwptools.hxx @@ -86,7 +86,7 @@ class LwpTools { public: - static sal_uInt16 QuickReadUnicode( LwpObjectStream* pObjStrm, + static void QuickReadUnicode( LwpObjectStream* pObjStrm, OUString& str, sal_uInt16 strlen, rtl_TextEncoding aEncoding ); static bool IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len); |