jl152 #i77196# only restarting if a extension was added/removed, XextensionManager.getSupportedArguments: removed repository argument

1 files changed, 6 insertions, 9 deletions

diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index b68593c7f174..5ccc3d7225d4 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -602,7 +602,7 @@ void syncRepositories(Reference<ucb::XCommandEnvironment> const & xCmdEnv)
     Reference<deployment::XExtensionManager> xExtensionManager;
     //synchronize shared before bundled otherewise there are
     //more revoke and registration calls.
-    bool bSynced = false;
+    bool bModified = false;
     const OUString sShared(RTL_CONSTASCII_USTRINGPARAM("shared"));
     if (needToSyncRepostitory(sShared))
     {
@@ -612,9 +612,8 @@ void syncRepositories(Reference<ucb::XCommandEnvironment> const & xCmdEnv)
 
         if (xExtensionManager.is())
         {
-            xExtensionManager->synchronize(
+            bModified = xExtensionManager->synchronize(
                 sShared, Reference<task::XAbortChannel>(), xCmdEnv);
-            bSynced = true;
         }
     }
 
@@ -629,24 +628,22 @@ void syncRepositories(Reference<ucb::XCommandEnvironment> const & xCmdEnv)
         }
         if (xExtensionManager.is())
         {
-            xExtensionManager->synchronize(
+            bModified |= xExtensionManager->synchronize(
                 sBundled, Reference<task::XAbortChannel>(), xCmdEnv);
-            bSynced = true;
         }
     }
 
-    if (bSynced)
+    if (bModified)
     {
         Reference<task::XRestartManager> restarter(
             comphelper_getProcessComponentContext()->getValueByName(
                 OUSTR( "/singletons/com.sun.star.task.OfficeRestartManager") ), UNO_QUERY );
         if (restarter.is())
         {
-            fprintf(stdout, "\nrestarting\n");
             restarter->requestRestart(xCmdEnv.is() == sal_True ? xCmdEnv->getInteractionHandler() :
                                       Reference<task::XInteractionHandler>());
-         }
-    }
+        }
+     }
 }