[Libreoffice-commits] core.git: desktop/source

[Libreoffice Gerrit user]

 desktop/source/deployment/manager/dp_manager.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a55d15e27f4290b9aaf5597161b2b3c5200d3f85
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Nov 29 13:55:15 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Nov 29 13:56:02 2018 +0100

    Revert "Simplify code"
    
    This reverts commit 7eaaf96e17c14ac49f98da9722a06c0c95f0c5c0.
    
    Change-Id: I559b8817db6f04b44d225346914ef385f7e5048c
    Reviewed-on: https://gerrit.libreoffice.org/64251
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index e564ea3cbd32..25ca6cdcc2d1 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1294,16 +1294,20 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
     ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() );
     //check if the folder exist at all. The shared extension folder
     //may not exist for a normal user.
+    bool bOk=true;
     try
     {
-        create_ucb_content(nullptr, m_activePackages_expanded,
-                           Reference<css::ucb::XCommandEnvironment>(), false);
+        bOk = create_ucb_content(
+                nullptr, m_activePackages_expanded, Reference<css::ucb::XCommandEnvironment>(), false);
     }
     catch (const css::ucb::ContentCreationException&)
     {
-        return bModified;
+        bOk = false;
     }
 
+    if (!bOk)
+        return bModified;
+
     ::ucbhelper::Content tempFolder( m_activePackages_expanded, xCmdEnv, m_xComponentContext );
     Reference<sdbc::XResultSet> xResultSet(
         StrTitle::createCursor( tempFolder,