diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-12-29 17:53:42 +0000 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-12-29 20:10:50 +0000 |
commit | 37723413115baafdc7d13ad26d11aa5f917c2036 (patch) | |
tree | 9588881dbd0e9c0fa70e685a445ba4fea88784c5 /sc | |
parent | f0ff9162950487f1e7ccc01e01160d60bf102488 (diff) |
tdf#152717: ScDdeLink::DataChanged may get OUString directly
... after commit 94df17f58fe6269452b7252b712a89978c444bec
(tdf#151429: don't convert OUStrings to system encoding, 2022-10-08)
Change-Id: Ie9d6eb2a4465a576eefe0840a30636e898fa9028
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144810
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/tool/ddelink.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index 95591dddb461..775c71808488 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -130,7 +130,8 @@ sfx2::SvBaseLink::UpdateResult ScDdeLink::DataChanged( return SUCCESS; OUString aLinkStr; - ScByteSequenceToString::GetString( aLinkStr, rValue, osl_getThreadTextEncoding() ); + if (!(rValue >>= aLinkStr)) + ScByteSequenceToString::GetString( aLinkStr, rValue, osl_getThreadTextEncoding() ); aLinkStr = convertLineEnd(aLinkStr, LINEEND_LF); // if string ends with line end, discard: |