diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-30 19:37:07 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2012-12-03 13:34:53 +0000 |
| commit | 8efb69e260ecbcde5ee67ab41ed7a9630783c29a (patch) | |
| tree | 06874b87d5cf1a88d0450dcaeeb0fc88916eaa2a /svtools | |
| parent | 847455f935dfdccf52cd786ea95b445cc6d02b36 (diff) | |
move base check for bibliography to sfx2
- in the libbiblio component the frame is already created, and a frame
that is loading is vetoing a terminate
- thus move check to sfx2
- use the fancy svtools::RestartDialog
Change-Id: I500aaeac44d52969575f50f6b79d0c07a08c977e
Reviewed-on: https://gerrit.libreoffice.org/1207
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/restartdialog.hxx | 5 | ||||
| -rw-r--r-- | svtools/source/dialogs/restartdialog.cxx | 3 | ||||
| -rw-r--r-- | svtools/uiconfig/ui/restartdialog.ui | 14 |
3 files changed, 21 insertions, 1 deletions
diff --git a/svtools/inc/svtools/restartdialog.hxx b/svtools/inc/svtools/restartdialog.hxx index 91ff4eafa445..63a4e8e1b763 100644 --- a/svtools/inc/svtools/restartdialog.hxx +++ b/svtools/inc/svtools/restartdialog.hxx @@ -26,9 +26,12 @@ enum RestartReason { RESTART_REASON_JAVA, // "For the selected Java runtime environment to work properly, // %PRODUCTNAME must be restarted." - RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT + RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT, // For the modified default print job format to take effect, // %PRODUCTNAME must be restarted. + RESTART_REASON_BIBLIOGRAPHY_INSTALL + // "For the bibliography to work properly, + // %PRODUCTNAME must be restarted." }; SVT_DLLPUBLIC void executeRestartDialog( diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index faf05df42e4b..e5d64dec0bc6 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -37,6 +37,9 @@ public: case svtools::RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT: get(reason_, "reason_pdf"); break; + case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL: + get(reason_, "reason_bibliography_install"); + break; default: assert(false); // this cannot happen } diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui index 856dee6fd7ee..f31af2e0c795 100644 --- a/svtools/uiconfig/ui/restartdialog.ui +++ b/svtools/uiconfig/ui/restartdialog.ui @@ -91,6 +91,20 @@ </packing> </child> <child> + <object class="GtkLabel" id="reason_bibliography_install"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">For the bibliography to work properly, %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">1</property> + </packing> + </child> + <child> <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> |