summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorirem <iremsendur1@gmail.com>2016-05-23 09:43:44 +0100
committerjan iversen <jani@documentfoundation.org>2016-06-23 06:44:23 +0000
commit2c1056d679187a702bad3a2ba5dcb6b068e1aa5e (patch)
tree7682b83bbcb550e903bd686a690253f100988a85 /desktop
parentaa0d0536a444fb26d9e570bd6bf6c1bdc3596cf3 (diff)
tdf#46279 Show restart message after extension installation
Change-Id: I91feab63b77055b8f73d0fb481a76586b249160c Reviewed-on: https://gerrit.libreoffice.org/24595 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Library_deployment.mk2
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx6
2 files changed, 8 insertions, 0 deletions
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index ac32cebc1734..269b98e0c226 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -29,9 +29,11 @@ $(eval $(call gb_Library_use_libraries,deployment,\
deploymentmisc \
sal \
svl \
+ svt \
tl \
ucbhelper \
utl \
+ vcl \
xmlscript \
i18nlangtag \
$(gb_UWINAPI) \
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index e09ba86f3f2f..c3e48071f3d1 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -40,9 +40,12 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <xmlscript/xml_helper.hxx>
#include <osl/diagnose.h>
+#include <svtools/restartdialog.hxx>
+#include <vcl/svapp.hxx>
#include "dp_interact.h"
#include "dp_resource.h"
#include "dp_ucb.h"
@@ -1493,6 +1496,9 @@ void ExtensionManager::fireModified()
[this] (uno::Reference<util::XModifyListener> const& xListener)
{ return xListener->modified(lang::EventObject(static_cast<OWeakObject *>(this))); });
}
+
+ SolarMutexGuard aGuard;
+ ::svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_EXTENSION_INSTALL);
}
} // namespace dp_manager