sfx2/source/doc/docmacromode.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9d973b22aab90746be6a0dd79891fcc8905112fd
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Nov 8 14:15:51 2023 +0300
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 13 09:31:10 2023 +0100
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.kagan...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159276
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 7381d45d66ed..b5f3f6fa814d 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
