diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-25 12:03:22 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-25 16:30:56 +0100 |
commit | 2508f949f1f20bb353f8bef1bd908f9cf3b039ef (patch) | |
tree | b8b4349fe47b200a7a01bc0b3846070ad6443386 /sc | |
parent | 5c0fa3265962373f36020f3ba8ddcdbc265e0acc (diff) |
tdf#124318 FILEOPEN: XLS Hyperlink URL incorrect
regression from
commit 52f69445c55c9af8ad97bee6da335b4592d56d4d
Date: Wed Aug 1 17:03:18 2018 +0200
loplugin:stringloop in sc
Change-Id: I7d481ea27866fc146c5de9d027aa7bb308f14e52
Reviewed-on: https://gerrit.libreoffice.org/69652
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 756252ce13f541049af620983f6741223d44573b)
Reviewed-on: https://gerrit.libreoffice.org/69660
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/excel/xistream.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index e48d596bd5ef..649c8f9ce2df 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -867,7 +867,9 @@ OUString XclImpStream::ReadRawUniString( sal_uInt16 nChars, bool b16Bit ) } *pcEndChar = '\0'; - aRet.append( pcBuffer.get(), pcUniChar - pcBuffer.get() ); + // this has the side-effect of only copying as far as the first null, which appears to be intentional. e.g. + // see tdf#124318 + aRet.append( pcBuffer.get() ); nCharsLeft = nCharsLeft - nReadSize; if( nCharsLeft > 0 ) |