diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-06-27 10:24:28 +0300 |
|---|---|---|
| committer | Gabor Kelemen <kelemeng@ubuntu.com> | 2022-06-29 11:46:24 +0100 |
| commit | 039dd5feae8183088c736f439aacdb366912456b (patch) | |
| tree | 4b84882291685dc0f3a05e097b2e9464270efc71 | |
| parent | Update git submodules (diff) | |
| download | core-039dd5feae8183088c736f439aacdb366912456b.tar.gz core-039dd5feae8183088c736f439aacdb366912456b.zip | |
tdf#126263: make sure to convert system path to file URLs
Change-Id: Ia21f29e3a1eb078a7df2366399c59d46ab26ff3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136482
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | shell/source/win32/simplemail/smplmailclient.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index 45331098b835..4919ded7f889 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -207,7 +207,11 @@ OUString CSmplMailClient::CopyAttachment(const OUString& sOrigAttachURL, OUStrin maAttachmentFiles.back()->EnableKillingFile(); INetURLObject aFilePathObj(maAttachmentFiles.back()->GetURL()); OUString sNewAttachmentURL = aFilePathObj.GetMainURL(INetURLObject::DecodeMechanism::NONE); - if (osl::File::copy(sOrigAttachURL, sNewAttachmentURL) == osl::FileBase::RC::E_None) + OUString sCorrectedOrigAttachURL(sOrigAttachURL); + // Make sure to convert to URL, if a system path was passed to XSimpleMailMessage + // Ignore conversion error, in which case sCorrectedOrigAttachURL is unchanged + osl::FileBase::getFileURLFromSystemPath(sCorrectedOrigAttachURL, sCorrectedOrigAttachURL); + if (osl::File::copy(sCorrectedOrigAttachURL, sNewAttachmentURL) == osl::FileBase::RC::E_None) { INetURLObject url(sOrigAttachURL, INetURLObject::EncodeMechanism::WasEncoded); sUserVisibleName = url.getName(INetURLObject::LAST_SEGMENT, true, |