Reinserts alternative impress document types in print dialog

Change-Id: I7d7082fffe6164dc751ede704b8707bd35b95aca
Reviewed-on: https://gerrit.libreoffice.org/57587
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit b4601ff6d9261d185cd440ebdbca8d78f3b5d459)

3 files changed, 150 insertions, 14 deletions

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 1aabcd162669..58fdc3890b01 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -460,10 +460,9 @@
 #define RID_DRAW_TABLE_TOOLBOX                          NC_("RID_DRAW_TABLE_TOOLBOX", "Table" )
 
 #define STR_IMPRESS_PRINT_UI_GROUP_NAME                 NC_("STR_IMPRESS_PRINT_UI_GROUP_NAME", "%PRODUCTNAME %s")
-#define STR_IMPRESS_PRINT_UI_PRINT_GROUP                NC_("STR_IMPRESS_PRINT_UI_PRINT_GROUP", "Print")
 #define STR_IMPRESS_PRINT_UI_CONTENT                    NC_("STR_IMPRESS_PRINT_UI_CONTENT", "Document")
-#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE              NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE", "Slides per page" )
-#define STR_IMPRESS_PRINT_UI_ORDER                      NC_("STR_IMPRESS_PRINT_UI_ORDER", "Order" )
+#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE              NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE", "Slides per page:" )
+#define STR_IMPRESS_PRINT_UI_ORDER                      NC_("STR_IMPRESS_PRINT_UI_ORDER", "Order:" )
 #define STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT            NC_("STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT", "~Contents")
 #define STR_IMPRESS_PRINT_UI_IS_PRINT_NAME              NC_("STR_IMPRESS_PRINT_UI_IS_PRINT_NAME", "~Slide name")
 #define STR_DRAW_PRINT_UI_IS_PRINT_NAME                 NC_("STR_DRAW_PRINT_UI_IS_PRINT_NAME", "P~age name")
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 7879f084667b..81f447cf9e83 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -387,13 +387,6 @@ namespace {
             uno::Sequence< OUString > aHelpIds, aWidgetIds;
             if( mbImpress )
             {
-                vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
-                aPrintOpt.maGroupHint = "JobPage" ;
-                AddDialogControl( vcl::PrinterOptionsHelper::setSubgroupControlOpt("extraimpressprintoptions",
-                                    SdResId(STR_IMPRESS_PRINT_UI_PRINT_GROUP),
-                                    "",
-                                    aPrintOpt ));
-
                 aHelpIds.realloc( 1 );
                 aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageContentType:ListBox" ;
                 AddDialogControl( vcl::PrinterOptionsHelper::setChoiceListControlOpt(
diff --git a/sd/uiconfig/simpress/ui/impressprinteroptions.ui b/sd/uiconfig/simpress/ui/impressprinteroptions.ui
index b94b7e213ae8..70e48f940aa8 100644
--- a/sd/uiconfig/simpress/ui/impressprinteroptions.ui
+++ b/sd/uiconfig/simpress/ui/impressprinteroptions.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.4 -->
 <interface domain="sd">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkBox" id="box">
@@ -10,6 +10,150 @@
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
+      <object class="GtkFrame" id="document">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkBox" id="box4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkBox" id="box7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" context="impressprinteroptions|label2">Type:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="impressdocument">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" context="impressprinteroptions|label7">Slides per page:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="slidesperpage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" context="impressprinteroptions|label1">Order:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="slidesperpageorder">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes" context="impressprinteroptions|label3">Document</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
       <object class="GtkFrame" id="contents">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -93,7 +237,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
@@ -186,7 +330,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">1</property>
+        <property name="position">2</property>
       </packing>
     </child>
     <child>
@@ -297,7 +441,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="position">3</property>
       </packing>
     </child>
   </object>