Resolves: fdo#44664 Provide a way to set the default print job format.

a) In the print dialog you can temporarily override the default print job
format for a single print job
b) In the printer options dialog you can override the default print job format
for a single printer
c) Under tools->options->print you can override the default print job format
for all printers.

Tidy up the restart dialog in passing

Change-Id: Ibea94bab6a79c3590dbf34583013db4e2ac06f45

1 files changed, 6 insertions, 3 deletions

diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index 1004a2d6d394..2e8428f935cf 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -30,16 +30,19 @@ public:
     RestartDialog(Window * parent, svtools::RestartReason reason):
         ModalDialog(parent, "RestartDialog", "svt/ui/restartdialog.ui")
     {
-        get(reasonJava_, "reason_java");
         get(btnYes_, "yes");
         get(btnNo_, "no");
         switch (reason) {
         case svtools::RESTART_REASON_JAVA:
-            reasonJava_->Show();
+            get(reason_, "reason_java");
+            break;
+        case svtools::RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT:
+            get(reason_, "reason_pdf");
             break;
         default:
             assert(false); // this cannot happen
         }
+        reason_->Show();
         btnYes_->SetClickHdl(LINK(this, RestartDialog, hdlYes));
         btnNo_->SetClickHdl(LINK(this, RestartDialog, hdlNo));
     }
@@ -48,7 +51,7 @@ private:
     DECL_LINK(hdlYes, void *);
     DECL_LINK(hdlNo, void *);
 
-    Window * reasonJava_;
+    Window * reason_;
     PushButton * btnYes_;
     PushButton * btnNo_;
 };