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

[Libreoffice Gerrit user]

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

New commits:
commit 7eaaf96e17c14ac49f98da9722a06c0c95f0c5c0
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Nov 26 10:19:27 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Nov 29 09:35:37 2018 +0100

    Simplify code
    
    Change-Id: Ib22c4f628042458cab937c27224505489c67da2e
    Reviewed-on: https://gerrit.libreoffice.org/64024
    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 25ca6cdcc2d1..e564ea3cbd32 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1294,19 +1294,15 @@ 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
     {
-        bOk = create_ucb_content(
-                nullptr, m_activePackages_expanded, Reference<css::ucb::XCommandEnvironment>(), false);
+        create_ucb_content(nullptr, m_activePackages_expanded,
+                           Reference<css::ucb::XCommandEnvironment>(), false);
     }
     catch (const css::ucb::ContentCreationException&)
     {
-        bOk = false;
-    }
-
-    if (!bOk)
         return bModified;
+    }
 
     ::ucbhelper::Content tempFolder( m_activePackages_expanded, xCmdEnv, m_xComponentContext );
     Reference<sdbc::XResultSet> xResultSet(