core.git: Branch 'distro/collabora/co-24.04' - 2 commits - sfx2/source

[Miklos Vajna (via logerrit)]

 sfx2/source/doc/objmisc.cxx |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit a2ca28d58bc7f5fa46144c64af371eda93044fbe
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Jan 24 08:31:13 2025 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Jan 24 10:42:03 2025 +0100

    cool#11002 sfx2: fix uncaught exception in SfxObjectShell::isExportLocked()
    
    Similar to commit 71aa5352f6f57283d1db51c980f6f0b802381871 (sfx2: fix
    uncaught exception in SfxObjectShell::isEditDocLocked(), 2025-01-23).
    
    This seems to be the last problem with this pattern.
    
    Change-Id: Ibaceb23beaff808d9f192fd55505361bf74016b5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180683
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index cff95996460c..0c880d7914fb 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -2054,7 +2054,15 @@ bool SfxObjectShell::isExportLocked() const
     Reference<XModel3> xModel = GetModel();
     if (!xModel.is())
         return false;
-    return comphelper::NamedValueCollection::getOrDefault(xModel->getArgs2( { 
"LockExport" } ), u"LockExport", false);
+    try
+    {
+        return 
comphelper::NamedValueCollection::getOrDefault(xModel->getArgs2( { "LockExport" 
} ), u"LockExport", false);
+    }
+    catch (const uno::RuntimeException&)
+    {
+        TOOLS_WARN_EXCEPTION("sfx.appl", "unexpected RuntimeException");
+    }
+    return false;
 }
 
 bool SfxObjectShell::isPrintLocked() const
commit 825ba76626c9db981b5f1186e064d7779881b48b
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Jan 24 08:13:51 2025 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Jan 24 10:41:57 2025 +0100

    cool#11002 sfx2: fix uncaught exception in 
SfxObjectShell::isContentExtractionLocked()
    
    Similar to commit 71aa5352f6f57283d1db51c980f6f0b802381871 (sfx2: fix
    uncaught exception in SfxObjectShell::isEditDocLocked(), 2025-01-23).
    
    Change-Id: I9f6c35c8b2934fee193a4c4211f4d3fbcad12aab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180682
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 607f2074577d..cff95996460c 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -2038,7 +2038,15 @@ bool SfxObjectShell::isContentExtractionLocked() const
     Reference<XModel3> xModel = GetModel();
     if (!xModel.is())
         return false;
-    return comphelper::NamedValueCollection::getOrDefault(xModel->getArgs2( { 
"LockContentExtraction" } ), u"LockContentExtraction", false);
+    try
+    {
+        return 
comphelper::NamedValueCollection::getOrDefault(xModel->getArgs2( { 
"LockContentExtraction" } ), u"LockContentExtraction", false);
+    }
+    catch (const uno::RuntimeException&)
+    {
+        TOOLS_WARN_EXCEPTION("sfx.appl", "unexpected RuntimeException");
+    }
+    return false;
 }
 
 bool SfxObjectShell::isExportLocked() const