prompt to restart office when required for experimental features
Change-Id: I43051ec6b0efeaebcf4a28940f70913423b8ea9f
This commit is contained in:
@@ -632,6 +632,11 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
|
|||||||
{
|
{
|
||||||
SvtMiscOptions aMiscOpt;
|
SvtMiscOptions aMiscOpt;
|
||||||
aMiscOpt.SetExperimentalSidebar( m_pExpSidebarCB->IsChecked() );
|
aMiscOpt.SetExperimentalSidebar( m_pExpSidebarCB->IsChecked() );
|
||||||
|
|
||||||
|
svtools::executeRestartDialog(
|
||||||
|
comphelper::getProcessComponentContext(), this,
|
||||||
|
svtools::RESTART_REASON_MODIFIED_SIDEBAR);
|
||||||
|
|
||||||
bModified = sal_True;
|
bModified = sal_True;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -29,9 +29,12 @@ enum RestartReason {
|
|||||||
RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
|
RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
|
||||||
// For the modified default print job format to take effect,
|
// For the modified default print job format to take effect,
|
||||||
// %PRODUCTNAME must be restarted.
|
// %PRODUCTNAME must be restarted.
|
||||||
RESTART_REASON_BIBLIOGRAPHY_INSTALL
|
RESTART_REASON_BIBLIOGRAPHY_INSTALL,
|
||||||
// "For the bibliography to work properly,
|
// "For the bibliography to work properly,
|
||||||
// %PRODUCTNAME must be restarted."
|
// %PRODUCTNAME must be restarted."
|
||||||
|
RESTART_REASON_MODIFIED_SIDEBAR
|
||||||
|
// "For the sidebar to work properly,
|
||||||
|
// %PRODUCTNAME must be restarted."
|
||||||
};
|
};
|
||||||
|
|
||||||
// Must be called with the solar mutex locked:
|
// Must be called with the solar mutex locked:
|
||||||
|
@@ -40,6 +40,9 @@ public:
|
|||||||
case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL:
|
case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL:
|
||||||
get(reason_, "reason_bibliography_install");
|
get(reason_, "reason_bibliography_install");
|
||||||
break;
|
break;
|
||||||
|
case svtools::RESTART_REASON_MODIFIED_SIDEBAR:
|
||||||
|
get(reason_, "reason_sidebar");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
assert(false); // this cannot happen
|
assert(false); // this cannot happen
|
||||||
}
|
}
|
||||||
|
@@ -100,6 +100,20 @@
|
|||||||
<property name="position">2</property>
|
<property name="position">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkLabel" id="reason_sidebar">
|
||||||
|
<property name="can_focus">False</property>
|
||||||
|
<property name="no_show_all">True</property>
|
||||||
|
<property name="label" translatable="yes">For the modified sidebar setting to take effect, %PRODUCTNAME must be restarted.</property>
|
||||||
|
<property name="wrap">True</property>
|
||||||
|
<property name="max_width_chars">50</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">3</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel" id="label">
|
<object class="GtkLabel" id="label">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
@@ -110,7 +124,7 @@
|
|||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="position">3</property>
|
<property name="position">4</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
Reference in New Issue
Block a user