mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#155176: only use item's URL in case filesystem path failed

Browse Source 
I was daydreaming, when thought that we can rely on the system-provided
file URL. Windows creates such URLs using current 8-bit codepage, and
URL-encodes the octets from that string, which fails when the URL is
treated as UTF-8 after URL-decode.

Change-Id: I2703586d371c1254e693a5760c5b6b74101e299d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151456
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2023-05-07 11:49:48 +03:00
parent dfb0d118f6
commit 54d07afac6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fpicker/source/win32/VistaFilePickerImpl.cxx
View File

@ -170,12 +170,15 @@ using TFolderPickerDialogImpl = TDialogImpl<TFileOpenDialog, CLSID_FileOpenDialo
static OUString lcl_getURLFromShellItem (IShellItem* pItem) static OUString lcl_getURLFromShellItem (IShellItem* pItem)
{ {
sal::systools::CoTaskMemAllocated<wchar_t> pStr; sal::systools::CoTaskMemAllocated<wchar_t> pStr;
if (SUCCEEDED(pItem->GetDisplayName(SIGDN_URL, &pStr)))
return OUString(o3tl::toU(pStr));
HRESULT hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &pStr); HRESULT hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &pStr);
if (FAILED(hr)) if (FAILED(hr))
{ {
// tdf#155176: One could think that querying SIGDN_URL would go first. But Windows uses
// current 8-bit codepage for the filenames, and URL-encodes those octets. So check it
// only after SIGDN_FILESYSPATH query failed (can it ever happen?)
if (SUCCEEDED(pItem->GetDisplayName(SIGDN_URL, &pStr)))
return OUString(o3tl::toU(pStr));
hr = pItem->GetDisplayName(SIGDN_PARENTRELATIVEPARSING, &pStr); hr = pItem->GetDisplayName(SIGDN_PARENTRELATIVEPARSING, &pStr);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {