[Libreoffice-commits] core.git: Branch 'feature/cib_contract4236' - comphelper/source

[Thorsten Behrens (via logerrit)]

 comphelper/source/misc/backupfilehelper.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 4196e932bcebd00a581ded2045b3760a7f6571f6
Author:     Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Tue Mar 24 02:15:11 2020 +0100
Commit:     Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Tue Mar 24 02:15:11 2020 +0100

    Catch deployment exception; extmgr is not functional
    
    Change-Id: I2d26c40d9b1663d206dfd826014aaf9ba5219c88

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index aa81039ad89c..d91fce269e07 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -578,10 +578,10 @@ namespace
             // create content from current extension configuration
             uno::Sequence< uno::Sequence< uno::Reference< deployment::XPackage 
> > > xAllPackages;
             uno::Reference< uno::XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
-            uno::Reference< deployment::XExtensionManager > 
m_xExtensionManager = deployment::ExtensionManager::get(xContext);
-
             try
             {
+                uno::Reference< deployment::XExtensionManager > 
m_xExtensionManager = deployment::ExtensionManager::get(xContext);
+
                 xAllPackages = 
m_xExtensionManager->getAllExtensions(uno::Reference< task::XAbortChannel >(),
                     uno::Reference< ucb::XCommandEnvironment >());
             }
@@ -603,6 +603,10 @@ namespace
                 throw css::lang::WrappedTargetRuntimeException( e.Message,
                                 e.Context, anyEx );
             }
+            catch (const uno::RuntimeException &)
+            {
+                return;
+            }
 
             for (sal_Int32 i = 0; i < xAllPackages.getLength(); ++i)
             {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits