diff options
| author | irem <iremsendur1@gmail.com> | 2016-05-11 10:42:17 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-23 08:34:38 +0000 |
| commit | a4e8419c8a1eb3e56ef973de4b15fdafc91248a2 (patch) | |
| tree | 63cbb72016e2c104483d244168a5e35a54405436 /cui | |
| parent | 42e51c4a6320763d9b60914da4372eae9a11f17d (diff) | |
tdf#99211 Use the restart dialog for notifications about restart
Change-Id: I97a10cddafc464ccbdd37902c5d24b73246f5c3f
Reviewed-on: https://gerrit.libreoffice.org/24877
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optjava.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 44f9ccf2e4e5..20a651b600c0 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -55,6 +55,9 @@ #define CLASSPATH_DELIMITER SAL_PATHSEPARATOR +#include <svtools/restartdialog.hxx> +#include <comphelper/solarmutex.hxx> + using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ui::dialogs; @@ -329,8 +332,8 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) (void)eErr; if ( bRunning ) { - ScopedVclPtrInstance< MessageDialog > aWarnBox( this, CUI_RES( RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO ); - aWarnBox->Execute(); + SolarMutexGuard aGuard; + svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_ASSIGNING_JAVAPARAMETERS); } } } @@ -374,8 +377,8 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) (void)eErr; if ( bRunning ) { - ScopedVclPtrInstance< MessageDialog > aWarnBox( this, CUI_RES( RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO ); - aWarnBox->Execute(); + SolarMutexGuard aGuard; + svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_ASSIGNING_FOLDERS); } } } @@ -650,8 +653,8 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) SvtMiscOptions aMiscOpt; aMiscOpt.SetExperimentalMode( m_pExperimentalCB->IsChecked() ); bModified = true; - ScopedVclPtrInstance< MessageDialog > aWarnBox( this, CUI_RES( RID_SVXSTR_OPTIONS_RESTART ), VCL_MESSAGE_INFO ); - aWarnBox->Execute(); + SolarMutexGuard aGuard; + svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_EXP_FEATURES); } if ( m_pMacroCB->IsValueChangedFromSaved() ) |