diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-08 14:15:51 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-09 07:21:05 +0100 |
| commit | c7f43e0f3d03ec6583fbf7eb553eec53f3ec43b8 (patch) | |
| tree | 075871c3173bba78c1306aee98440c95c4bfcb8e /sfx2 | |
| parent | 8fc4b8697b5ce487089069b76110c00660709290 (diff) | |
Do not throw on IZoneIdentifier COM error
Not being able to obtain Security Zone info from OS is not a fatal
error here; just handle it accordingly.
Change-Id: Ifb19c88f2c08e99c313aecc54044252bac50f88e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159155
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docmacromode.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 017e620303e4..8157da72b416 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -254,9 +254,9 @@ namespace sfx2 osl::FileBase::getSystemPathFromFileURL(sURL, sFilePath); sal::systools::COMReference<IZoneIdentifier> pZoneId; pZoneId.CoCreateInstance(CLSID_PersistentZoneIdentifier); - sal::systools::COMReference<IPersistFile> pPersist(pZoneId, sal::systools::COM_QUERY_THROW); + sal::systools::COMReference<IPersistFile> pPersist(pZoneId, sal::systools::COM_QUERY); DWORD dwZone; - if (!SUCCEEDED(pPersist->Load(o3tl::toW(sFilePath.getStr()), STGM_READ)) || + if (!pPersist || !SUCCEEDED(pPersist->Load(o3tl::toW(sFilePath.getStr()), STGM_READ)) || !SUCCEEDED(pZoneId->GetId(&dwZone))) { // no Security Zone info found -> assume a local file, not |