#88289# redesign fixes

7 files changed, 165 insertions, 177 deletions

diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src
index 3c2219a985b9..8102a333a3b9 100644
--- a/sd/source/ui/dlg/copydlg.src
+++ b/sd/source/ui/dlg/copydlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: copydlg.src,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: thb $ $Date: 2001-06-15 18:16:50 $
+ *  last change: $Author: dr $ $Date: 2001-06-25 13:34:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@ ModalDialog DLG_COPY
     HelpID = SID_COPYOBJECTS ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 204 , 175 ) ;
+    Size = MAP_APPFONT ( 204 , 177 ) ;
     Text = "Duplizieren" ;
     Text [ ENGLISH ] = "Duplicate" ;
     Text [ norwegian ] = "Duplicate" ;
@@ -103,8 +103,8 @@ ModalDialog DLG_COPY
     };
     FixedText FT_COPIES
     {
-        Pos = MAP_APPFONT ( 6 , 8  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 9 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "Anzahl an ~Kopien" ;
         Text [ ENGLISH ] = "Number of ~Copies" ;
         Text [ norwegian ] = "Antall ~Kopier" ;
@@ -133,8 +133,8 @@ ModalDialog DLG_COPY
     NumericField NUM_FLD_COPIES
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 76 , 6  ) ;
-        Size = MAP_APPFONT ( 37 , 12 ) ;
+        Pos = MAP_APPFONT ( 76 , 7 ) ;
+        Size = MAP_APPFONT ( 35 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -147,7 +147,7 @@ ModalDialog DLG_COPY
     };
     ImageButton BTN_SET_VIEWDATA
     {
-        Pos = MAP_APPFONT ( 125 , 5  ) ;
+        Pos = MAP_APPFONT ( 122 , 6 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         QuickHelpText = "Werte von Selektion aufnehmen" ;
         QuickHelpText [ ENGLISH ] = "Get values from selection" ;
@@ -166,7 +166,7 @@ ModalDialog DLG_COPY
         QuickHelpText [ french ] = "Utiliser les valeurs de la s�lection" ;
         QuickHelpText [ dutch ] = "Waarden uit selectie overnemen" ;
         QuickHelpText [ portuguese ] = "Aplica os valores seleccionados" ;
-    QuickHelpText[ russian ] = "������� �������� �� ������";
+        QuickHelpText[ russian ] = "������� �������� �� ������";
         QuickHelpText[ polish ] = "Wpisz warto�ci selekcji!";
         QuickHelpText[ japanese ] = "�I���������l����������!";
         QuickHelpText[ chinese_simplified ] = "����ѡ�����ֵ";
@@ -211,8 +211,8 @@ ModalDialog DLG_COPY
     MetricField MTR_FLD_ANGLE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 76 , 67  ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
+        Pos = MAP_APPFONT ( 76 , 69 ) ;
+        Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -247,8 +247,8 @@ ModalDialog DLG_COPY
     };
     FixedText FT_ANGLE
     {
-        Pos = MAP_APPFONT ( 12 , 69  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 71 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "~Drehwinkel" ;
         Text [ ENGLISH ] = "~Angle" ;
         Text [ norwegian ] = "~Vinkel" ;
@@ -276,8 +276,8 @@ ModalDialog DLG_COPY
     };
     FixedText FT_MOVE_X
     {
-        Pos = MAP_APPFONT ( 12 , 37  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 39 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "~X-Achse" ;
         Text [ ENGLISH ] = "~X-Axis" ;
         Text [ norwegian ] = "~X-Axis" ;
@@ -306,8 +306,8 @@ ModalDialog DLG_COPY
     MetricField MTR_FLD_MOVE_X
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 76 , 35  ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
+        Pos = MAP_APPFONT ( 76 , 37 ) ;
+        Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -323,8 +323,8 @@ ModalDialog DLG_COPY
     MetricField MTR_FLD_MOVE_Y
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 76 , 51  ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
+        Pos = MAP_APPFONT ( 76 , 53 ) ;
+        Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -340,8 +340,8 @@ ModalDialog DLG_COPY
     MetricField MTR_FLD_WIDTH
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 76 , 96  ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
+        Pos = MAP_APPFONT ( 76 , 98 ) ;
+        Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -357,8 +357,8 @@ ModalDialog DLG_COPY
     MetricField MTR_FLD_HEIGHT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 76 , 112  ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
+        Pos = MAP_APPFONT ( 76 , 114 ) ;
+        Size = MAP_APPFONT ( 45 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -373,8 +373,8 @@ ModalDialog DLG_COPY
     };
     FixedText FT_MOVE_Y
     {
-        Pos = MAP_APPFONT ( 12 , 53  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 55 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "~Y-Achse" ;
         Text [ ENGLISH ] = "~Y-Axis" ;
         Text [ norwegian ] = "~Y-Axis" ;
@@ -402,8 +402,8 @@ ModalDialog DLG_COPY
     };
     FixedText FT_WIDTH
     {
-        Pos = MAP_APPFONT ( 12 , 98  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 100 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "~Breite" ;
         Text [ ENGLISH ] = "~Width" ;
         Text [ norwegian ] = "~Bredde" ;
@@ -431,9 +431,8 @@ ModalDialog DLG_COPY
     };
     FixedText FT_HEIGHT
     {
-        Pos = MAP_APPFONT ( 12 , 114  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
-        /* ### ACHTUNG: Neuer Text in Resource? ~H�he : ~H�he */
+        Pos = MAP_APPFONT ( 12 , 116 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "H�h~e" ;
         Text [ ENGLISH ] = "~Height" ;
         Text [ norwegian ] = "~H�yde" ;
@@ -461,7 +460,7 @@ ModalDialog DLG_COPY
     };
     FixedLine GRP_MOVEMENT
     {
-        Pos = MAP_APPFONT ( 6 , 24  ) ;
+        Pos = MAP_APPFONT ( 6 , 26 ) ;
         Size = MAP_APPFONT ( 136 , 8 ) ;
         Text = "Verschiebung" ;
         Text [ ENGLISH ] = "Movement" ;
@@ -490,9 +489,8 @@ ModalDialog DLG_COPY
     };
     FixedLine GRP_ENLARGEMENT
     {
-        Pos = MAP_APPFONT ( 6 , 85  ) ;
+        Pos = MAP_APPFONT ( 6 , 87 ) ;
         Size = MAP_APPFONT ( 136 , 8 ) ;
-        /* ### ACHTUNG: Neuer Text in Resource? Vergr��erung : Vergr��erung */
         Text = "Vergr��erung" ;
         Text [ ENGLISH ] = "Enlargement" ;
         Text [ norwegian ] = "Forst�rrelse " ;
@@ -520,10 +518,8 @@ ModalDialog DLG_COPY
     };
     FixedLine GRP_COLOR
     {
-        Pos = MAP_APPFONT ( 6 , 130  ) ;
+        Pos = MAP_APPFONT ( 6 , 132 ) ;
         Size = MAP_APPFONT ( 136 , 8 ) ;
-         //Pos = MAP_APPFONT( 6, 142 );
-         //Size = MAP_APPFONT( 168, 48 );
         Text = "Farben" ;
         Text [ ENGLISH ] = "Colors" ;
         Text [ dutch ] = "Kleuren" ;
@@ -551,20 +547,16 @@ ModalDialog DLG_COPY
     ListBox LB_START_COLOR
     {
         Border = TRUE ;
-         //Pos = MAP_APPFONT( 57, 153 );
-         //Size = MAP_APPFONT( 111, 56 );
-        Pos = MAP_APPFONT ( 76 , 141  ) ;
-        Size = MAP_APPFONT ( 50 , 90 ) ;
+        Pos = MAP_APPFONT ( 76 , 143 ) ;
+        Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         DDExtraWidth = TRUE ;
     };
     FixedText FT_START_COLOR
     {
-         //Pos = MAP_APPFONT( 12, 155 );
-         //Size = MAP_APPFONT( 40, 10 );
-        Pos = MAP_APPFONT ( 12 , 143  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 145 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "~Anfang" ;
         Text [ ENGLISH ] = "~Start" ;
         Text [ dutch ] = "~Begin" ;
@@ -592,20 +584,16 @@ ModalDialog DLG_COPY
     ListBox LB_END_COLOR
     {
         Border = TRUE ;
-         //Pos = MAP_APPFONT( 57, 171 );
-         //Size = MAP_APPFONT( 111, 56 );
-        Pos = MAP_APPFONT ( 76 , 157  ) ;
-        Size = MAP_APPFONT ( 50 , 90 ) ;
+        Pos = MAP_APPFONT ( 76 , 159 ) ;
+        Size = MAP_APPFONT ( 60 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         DDExtraWidth = TRUE ;
     };
     FixedText FT_END_COLOR
     {
-         //Pos = MAP_APPFONT( 12, 172 );
-         //Size = MAP_APPFONT( 40, 10 );
-        Pos = MAP_APPFONT ( 12 , 159  ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 161 ) ;
+        Size = MAP_APPFONT ( 60 , 8 ) ;
         Text = "E~nde" ;
         Text [ ENGLISH ] = "~End" ;
         Text [ dutch ] = "~Einde" ;
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index c4625e7d6974..ef4052a5b052 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgass.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: af $ $Date: 2001-06-19 12:48:20 $
+ *  last change: $Author: dr $ $Date: 2001-06-25 13:34:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -332,14 +332,14 @@ public:
 
     // Common
     Assistent           m_aAssistentFunc;
-    OKButton            m_aFinishButton;
-    CancelButton        m_aCancelButton;
+    CheckBox            m_aPreviewFlag;
+    CheckBox            m_aStartWithFlag;
     HelpButton          m_aHelpButton;
+    CancelButton        m_aCancelButton;
     PushButton          m_aLastPageButton;
     PushButton          m_aNextPageButton;
-    CheckBox            m_aPreviewFlag;
+    OKButton            m_aFinishButton;
     SdDocPreviewWin     m_aPreview;
-    CheckBox            m_aStartWithFlag;
 
     // Seite 1
     FixedBitmap*        m_pPage1FB;
diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src
index 6f13c0e0811b..979c28306010 100644
--- a/sd/source/ui/dlg/dlgass.src
+++ b/sd/source/ui/dlg/dlgass.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgass.src,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: rt $ $Date: 2001-06-15 21:58:36 $
+ *  last change: $Author: dr $ $Date: 2001-06-25 13:34:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,7 @@ ModalDialog DLG_ASS
     CheckBox CB_PREVIEW
     {
         Pos = MAP_APPFONT ( 144 , 140  );
-        Size = MAP_APPFONT ( 92 , 10 );
+        Size = MAP_APPFONT ( 122 , 10 );
         TabStop = TRUE;
         Text = "~Vorschau";
         Text [ ENGLISH ] = "Pre~view";
@@ -157,7 +157,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE;
         Pos = MAP_APPFONT ( 6 , 37  );
-        Size =MAP_APPFONT ( 134 , 8 );
+        Size =MAP_APPFONT ( 132 , 8 );
         Text = "Art";
         Text [ ENGLISH ] = "Type";
         Text [ ENGLISH_US ] = "Type";
@@ -186,7 +186,7 @@ ModalDialog DLG_ASS
     RadioButton RB_PAGE1_EMPTY
     {
         Pos = MAP_APPFONT ( 12 , 48  );
-        Size = MAP_APPFONT ( 122 , 10 );
+        Size = MAP_APPFONT ( 120 , 10 );
         Text = "~Leere Pr�sentation";
         Text [ ENGLISH ] = "~Empty presentation";
         TabStop = TRUE;
@@ -216,7 +216,7 @@ ModalDialog DLG_ASS
     RadioButton RB_PAGE1_TEMPLATE
     {
         Pos = MAP_APPFONT ( 12 , 62  );
-        Size = MAP_APPFONT ( 122 , 10 );
+        Size = MAP_APPFONT ( 120 , 10 );
         Text = "~Aus Vorlage";
         Text [ ENGLISH ] = "From ~template";
         Text[ english_us ] = "~From template";
@@ -245,7 +245,7 @@ ModalDialog DLG_ASS
     RadioButton RB_PAGE1_OPEN
     {
         Pos = MAP_APPFONT ( 12 , 76  );
-        Size = MAP_APPFONT ( 122 , 10 );
+        Size = MAP_APPFONT ( 120 , 10 );
         Text = "~�ffnen einer vorhandenen Pr�sentation";
         Text [ ENGLISH ] = "~Open existing presentation";
         Text[ english_us ] = "~Open existing presentation";
@@ -274,7 +274,7 @@ ModalDialog DLG_ASS
     ListBox LB_PAGE1_REGION
     {
         Pos = MAP_APPFONT ( 12 , 90  );
-        Size = MAP_APPFONT ( 122 , 12 );
+        Size = MAP_APPFONT ( 120 , 12 );
         TabStop = TRUE ;
         Border = TRUE ;
         DropDown = TRUE ;
@@ -285,14 +285,14 @@ ModalDialog DLG_ASS
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 106  ) ;
-        Size = MAP_APPFONT ( 122 , 56 ) ;
+        Size = MAP_APPFONT ( 120 , 56 ) ;
         HelpId = HID_SD_AUTOPILOT_TEMPLATES ;
     };
 
     ListBox LB_PAGE1_OPEN
     {
         Pos = MAP_APPFONT ( 12 , 90  );
-        Size = MAP_APPFONT ( 122 , 72 );
+        Size = MAP_APPFONT ( 120 , 72 );
         TabStop = TRUE;
         Border = TRUE;
         HelpId = HID_SD_AUTOPILOT_OPEN ;
@@ -313,7 +313,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE ;
         Pos = MAP_APPFONT ( 6 , 37  ) ;
-        Size = MAP_APPFONT ( 134 , 8 ) ;
+        Size = MAP_APPFONT ( 132 , 8 ) ;
         Text = "W�hlen Sie eine ~Seitenvorlage" ;
         Text [ ENGLISH ] = "Choose a ~page template" ;
         Text [ english_us ] = "~Select a Page Style" ;
@@ -360,7 +360,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE ;
         Pos = MAP_APPFONT ( 6 , 110  ) ;
-        Size = MAP_APPFONT ( 134 , 8 ) ;
+        Size = MAP_APPFONT ( 132 , 8 ) ;
         Text = "W�hlen Sie ein Ausgabemedium" ;
         Text [ ENGLISH ] = "Choose Your presentationoutput" ;
         Text [ dutch ] = "Kies een presentatiemedium" ;
@@ -554,7 +554,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE ;
         Pos = MAP_APPFONT ( 6 , 37  );
-        Size = MAP_APPFONT ( 134 , 8 );
+        Size = MAP_APPFONT ( 132 , 8 );
         Text = "W�hlen Sie einen Diawechsel";
         Text [ ENGLISH ] = "Choose your slide change";
         Text[ english_us ] = "Select a slide transition";
@@ -585,29 +585,29 @@ ModalDialog DLG_ASS
         OutputSize = TRUE ;
         Pos = MAP_APPFONT ( 12 , 49  );
         Size = MAP_APPFONT ( 60 , 10 );
-        Text = "~Effekt:";
-        Text [ ENGLISH ] = "~Effect:";
-        Text[ english_us ] = "~Effect:";
-        Text[ portuguese ] = "~Efeito:";
-        Text[ russian ] = "~������:";
-        Text[ dutch ] = "~Effect:";
-        Text[ french ] = "~Effet :";
-        Text[ spanish ] = "~Efecto:";
-        Text[ italian ] = "Effetto:";
-        Text[ danish ] = "Effekt:";
-        Text[ swedish ] = "~Effekt:";
-        Text[ polish ] = "Efekt:";
-        Text[ portuguese_brazilian ] = "~Effect:";
-        Text[ japanese ] = "����(~E):";
+        Text = "~Effekt";
+        Text [ ENGLISH ] = "~Effect";
+        Text[ english_us ] = "~Effect";
+        Text[ portuguese ] = "~Efeito";
+        Text[ russian ] = "~������";
+        Text[ dutch ] = "~Effect";
+        Text[ french ] = "~Effet";
+        Text[ spanish ] = "~Efecto";
+        Text[ italian ] = "Effetto";
+        Text[ danish ] = "Effekt";
+        Text[ swedish ] = "~Effekt";
+        Text[ polish ] = "Efekt";
+        Text[ portuguese_brazilian ] = "~Effect";
+        Text[ japanese ] = "����(~E)";
         Text[ chinese_simplified ] = "��(~E)��";
         Text[ chinese_traditional ] = "�ĪG(~E)�G";
-        Text[ arabic ] = "�������:";
-        Text[ greek ] = "���:";
-        Text[ korean ] = "ȿ��(~E):";
-        Text[ turkish ] = "Efekt:";
+        Text[ arabic ] = "�������";
+        Text[ greek ] = "���";
+        Text[ korean ] = "ȿ��(~E)";
+        Text[ turkish ] = "Efekt";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Efecto:";
-        Text[ finnish ] = "~Vaikutus:";
+        Text[ catalan ] = "~Efecto";
+        Text[ finnish ] = "~Vaikutus";
     };
 
     ListBox LB_PAGE3_EFFECT
@@ -625,29 +625,29 @@ ModalDialog DLG_ASS
         OutputSize = TRUE ;
         Pos = MAP_APPFONT ( 12 , 65  );
         Size = MAP_APPFONT ( 60 , 10 );
-        Text = "~Geschwindigkeit:";
-        Text [ ENGLISH ] = "~Speed:";
-        Text[ english_us ] = "~Speed:";
-        Text[ portuguese ] = "~Velocidade:";
-        Text[ russian ] = "~��������:";
-        Text[ dutch ] = "~Snelheid:";
-        Text[ french ] = "~Vitesse :";
-        Text[ spanish ] = "Vel~ocidad:";
-        Text[ italian ] = "Velocit�:";
-        Text[ danish ] = "Hastighed:";
-        Text[ swedish ] = "~Hastighet:";
-        Text[ polish ] = "Szy~bko��:";
-        Text[ portuguese_brazilian ] = "~Speed:";
-        Text[ japanese ] = "��߰��(~S):";
+        Text = "~Geschwindigkeit";
+        Text [ ENGLISH ] = "~Speed";
+        Text[ english_us ] = "~Speed";
+        Text[ portuguese ] = "~Velocidade";
+        Text[ russian ] = "~��������";
+        Text[ dutch ] = "~Snelheid";
+        Text[ french ] = "~Vitesse";
+        Text[ spanish ] = "Vel~ocidad";
+        Text[ italian ] = "Velocit�";
+        Text[ danish ] = "Hastighed";
+        Text[ swedish ] = "~Hastighet";
+        Text[ polish ] = "Szy~bko��";
+        Text[ portuguese_brazilian ] = "~Speed";
+        Text[ japanese ] = "��߰��(~S)";
         Text[ chinese_simplified ] = "�ٶ�(~S)��";
         Text[ chinese_traditional ] = "�t��(~S)�G";
-        Text[ arabic ] = "������:";
-        Text[ greek ] = "��������:";
-        Text[ korean ] = "�ӵ�(~S):";
-        Text[ turkish ] = "H�z:";
+        Text[ arabic ] = "������";
+        Text[ greek ] = "��������";
+        Text[ korean ] = "�ӵ�(~S)";
+        Text[ turkish ] = "H�z";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Vel~ocidad:";
-        Text[ finnish ] = "~Nopeus:";
+        Text[ catalan ] = "Vel~ocidad";
+        Text[ finnish ] = "~Nopeus";
     };
 
     ListBox LB_PAGE3_SPEED
@@ -664,7 +664,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE;
         Pos = MAP_APPFONT ( 6 , 83  );
-        Size = MAP_APPFONT ( 134 , 8 );
+        Size = MAP_APPFONT ( 132 , 8 );
         Text = "W�hlen Sie die Art der Pr�sentation";
         Text [ ENGLISH ] = "Choose the presentation kind";
         Text[ english_us ] = "Select the presentation type";
@@ -694,7 +694,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE;
         Pos = MAP_APPFONT ( 12 , 94  );
-        Size = MAP_APPFONT ( 122 , 10 );
+        Size = MAP_APPFONT ( 120 , 10 );
         Text = "~Standard";
         Text [ ENGLISH ] = "~Standard";
         Text[ english_us ] = "~Default";
@@ -724,7 +724,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE;
         Pos = MAP_APPFONT ( 12 , 108  );
-        Size = MAP_APPFONT ( 122 , 10 );
+        Size = MAP_APPFONT ( 120 , 10 );
         Text = "~Automatisch";
         Text [ ENGLISH ] = "~Auto";
         Text[ english_us ] = "~Automatic";
@@ -753,7 +753,7 @@ ModalDialog DLG_ASS
     FixedText FT_PAGE3_TIME
     {
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 18 , 123  );
+        Pos = MAP_APPFONT ( 21 , 123  );
         Size = MAP_APPFONT ( 55 , 10 );
         Text = "Stand~dauer";
         Text [ ENGLISH ] = "~Duration of page";
@@ -784,7 +784,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE;
         Pos = MAP_APPFONT ( 77 , 122  ) ;
-        Size = MAP_APPFONT ( 57 , 12 ) ;
+        Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -808,7 +808,7 @@ ModalDialog DLG_ASS
     FixedText FT_PAGE3_BREAK
     {
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 18 , 139  );
+        Pos = MAP_APPFONT ( 21 , 139  );
         Size = MAP_APPFONT ( 55 , 10 );
         Text = "~Pausendauer";
         Text [ ENGLISH ] = "~Duration of pause";
@@ -839,7 +839,7 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE;
         Pos = MAP_APPFONT ( 77 , 138  ) ;
-        Size = MAP_APPFONT ( 57 , 12 ) ;
+        Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -863,8 +863,8 @@ ModalDialog DLG_ASS
     CheckBox CB_PAGE3_LOGO
     {
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 18 , 154  );
-        Size = MAP_APPFONT ( 116 , 10 );
+        Pos = MAP_APPFONT ( 21 , 154  );
+        Size = MAP_APPFONT ( 111 , 10 );
         TabStop = TRUE;
         Text = "~Logo einblenden";
         Text [ ENGLISH ] = "Show ~logo";
@@ -935,8 +935,8 @@ ModalDialog DLG_ASS
     FixedText FT_PAGE4_ASKNAME
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 13 , 48  ) ;
-        Size = MAP_APPFONT ( 247 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 48 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Wie ist Ihr Name oder der Name Ihrer Firma?" ;
         Text [ ENGLISH ] = "What is Your name or the of Your company?" ;
         Text [ dutch ] = "Hoe is uw naam of de naam van uw bedrijf?" ;
@@ -966,15 +966,15 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 13 , 61  ) ;
-        Size = MAP_APPFONT ( 247 , 12 ) ;
+        Pos = MAP_APPFONT ( 12 , 59 ) ;
+        Size = MAP_APPFONT ( 248 , 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_PAGE4_ASKTOPIC
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 13 , 77  ) ;
-        Size = MAP_APPFONT ( 247 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 77 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Was ist der Themenbereich Ihrer Pr�sentation?" ;
         Text [ ENGLISH ] = "What is the topic of Your presentation?" ;
         Text [ dutch ] = "Wat is het onderwerp van uw presentatie ?" ;
@@ -1003,15 +1003,15 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 13 , 90  ) ;
-        Size = MAP_APPFONT ( 247 , 12 ) ;
+        Pos = MAP_APPFONT ( 12 , 88 ) ;
+        Size = MAP_APPFONT ( 248 , 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_PAGE4_ASKINFORMATION
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 13 , 106  ) ;
-        Size = MAP_APPFONT ( 247 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 106 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Weitere darzustellende Gedanken?" ;
         Text [ ENGLISH ] = "Further things to be mentioned?" ;
         Text [ dutch ] = "Verdere idee�n die u wilt realiseren?" ;
@@ -1040,8 +1040,8 @@ ModalDialog DLG_ASS
     {
         OutputSize = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 13 , 119  ) ;
-        Size = MAP_APPFONT ( 247 , 34 ) ;
+        Pos = MAP_APPFONT ( 12 , 117  ) ;
+        Size = MAP_APPFONT ( 248 , 47 ) ;
         TabStop = TRUE ;
         VSCROLL = TRUE ;
     };
@@ -1060,8 +1060,8 @@ ModalDialog DLG_ASS
     FixedText FT_PAGE5_PAGELIST
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 39  );
-        Size = MAP_APPFONT ( 132 , 10 );
+        Pos = MAP_APPFONT ( 6 , 39 );
+        Size = MAP_APPFONT ( 132 , 8 );
         Text = "~W�hlen Sie die gew�nschten Seiten";
         Text [ ENGLISH ] = "~Choose your pages";
         Text[ english_us ] = "Ch~oose your pages";
@@ -1090,8 +1090,8 @@ ModalDialog DLG_ASS
     Control CT_PAGE5_PAGELIST
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 52  );
-        Size = MAP_APPFONT ( 132 , 97 );
+        Pos = MAP_APPFONT ( 6 , 50 );
+        Size = MAP_APPFONT ( 132 , 100 );
         Border = TRUE;
     };
 
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 55f8ef394441..2cf32cd53875 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docprev.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:48:32 $
+ *  last change: $Author: dr $ $Date: 2001-06-25 13:34:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,11 +123,13 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, USHORT nShowPage )
 SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId )
 : Control(pParent, rResId), pMetaFile( 0 ), bInEffect(FALSE), m_pObj(NULL)
 {
+    SetBorderStyle( WINDOW_BORDER_MONO );
 }
 
 SdDocPreviewWin::SdDocPreviewWin( Window* pParent )
 : Control(pParent, 0 ), pMetaFile( 0 ), bInEffect(FALSE), m_pObj(NULL)
 {
+    SetBorderStyle( WINDOW_BORDER_MONO );
     Resize();
     Show();
 }
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 6bfecade6124..912313e6aa8f 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prntopts.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-05-04 09:19:35 $
+ *  last change: $Author: dr $ $Date: 2001-06-25 13:34:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,8 +122,6 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) :
         rOutAttrs               ( rInAttrs )
 {
     FreeResource();
-    aSeparator1FL.SetStyle( aSeparator1FL.GetStyle() | WB_VERT );
-    aSeparator2FL.SetStyle( aSeparator2FL.GetStyle() | WB_VERT );
 
     Link aLink = LINK( this, SdPrintOptions, ClickBookletHdl );
     aRbtDefault.SetClickHdl( aLink );
diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src
index e311f1aa4b69..f6e6c371fa2a 100644
--- a/sd/source/ui/dlg/prntopts.src
+++ b/sd/source/ui/dlg/prntopts.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prntopts.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: thb $ $Date: 2001-06-15 18:16:50 $
+ *  last change: $Author: dr $ $Date: 2001-06-25 13:34:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,7 +82,7 @@ TabPage TP_PRINT_OPTIONS
     Hide = TRUE;
     FixedLine GRP_PRINT
     {
-        Pos = MAP_APPFONT ( 6 , 3  ) ;
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
         Size = MAP_APPFONT ( 118 , 8 ) ;
         Text = "Inhalt" ;
         Text [ ENGLISH ] = "Contents" ;
@@ -115,9 +115,9 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "Ze~ichnung" ;
-        Text [ ENGLISH ] = "Drawing" ;
+        Text [ ENGLISH ] = "Drawin~g" ;
         Text [ dutch ] = "Te~kening" ;
-        Text [ english_us ] = "~Drawing" ;
+        Text [ english_us ] = "Drawin~g" ;
         Text [ italian ] = "Disegno" ;
         Text [ spanish ] = "~Dibujo" ;
         Text [ french ] = "~Dessin" ;
@@ -143,7 +143,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 12 , 28  ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "No~tizen" ;
-        Text [ ENGLISH ] = "Notes" ;
+        Text [ ENGLISH ] = "~Notes" ;
         TabStop = TRUE ;
         Text [ english_us ] = "~Notes" ;
         Text [ italian ] = "No~te" ;
@@ -172,7 +172,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 12 , 42  ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "Handzette~l" ;
-        Text [ ENGLISH ] = "Handouts" ;
+        Text [ ENGLISH ] = "Hando~uts" ;
         TabStop = TRUE ;
         Text [ dutch ] = "~Folder" ;
         Text [ english_us ] = "Hando~uts" ;
@@ -201,7 +201,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 12 , 56  ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "~Gliederung" ;
-        Text [ ENGLISH ] = "Outliner" ;
+        Text [ ENGLISH ] = "Out~line" ;
         TabStop = TRUE ;
         Text [ english_us ] = "Out~line" ;
         Text [ italian ] = "~Struttura" ;
@@ -227,8 +227,9 @@ TabPage TP_PRINT_OPTIONS
     };
     FixedLine FL_SEPARATOR1
     {
-        Pos = MAP_APPFONT ( 125 , 10  ) ;
-        Size = MAP_APPFONT ( 4 , 62 ) ;
+        Pos = MAP_APPFONT ( 125 , 14 ) ;
+        Size = MAP_APPFONT ( 4 , 52 ) ;
+        Vert = TRUE ;
     };
     FixedLine GRP_OUTPUT
     {
@@ -263,8 +264,8 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 136 , 14  ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text = "Standa~rd" ;
-        Text [ ENGLISH ] = "Default" ;
-        Text [ english_us ] = "Default" ;
+        Text [ ENGLISH ] = "~Default" ;
+        Text [ english_us ] = "~Default" ;
         TabStop = TRUE ;
         Text [ portuguese_brazilian ] = "Standard" ;
         Text [ swedish ] = "Standa~rd" ;
@@ -292,7 +293,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 136 , 28  ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text = "Graustu~fen" ;
-        Text [ ENGLISH ] = "Grayscale" ;
+        Text [ ENGLISH ] = "Gra~yscale" ;
         Text [ english_us ] = "Gra~yscale" ;
         TabStop = TRUE ;
         Text [ portuguese_brazilian ] = "Graustufen" ;
@@ -321,7 +322,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 136 , 42  ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text = "Schwarz~wei�" ;
-        Text [ ENGLISH ] = "Black & White" ;
+        Text [ ENGLISH ] = "Black & ~white" ;
         Text [ english_us ] = "Black & ~white" ;
         TabStop = TRUE ;
         Text [ portuguese_brazilian ] = "Schwarzwei?" ;
@@ -379,7 +380,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 12 , 83  ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "Seiten~name" ;
-        Text [ ENGLISH ] = "Page~name" ;
+        Text [ ENGLISH ] = "~Page name" ;
         Text [ norwegian ] = "Side~navn" ;
         Text [ italian ] = "Nome pagina" ;
         Text [ portuguese_brazilian ] = "Nome da ~p?gina" ;
@@ -409,7 +410,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 12 , 97  ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "Dat~um" ;
-        Text [ ENGLISH ] = "~Date" ;
+        Text [ ENGLISH ] = "D~ate" ;
         Text [ norwegian ] = "~Dato" ;
         Text [ italian ] = "Data" ;
         Text [ portuguese_brazilian ] = "~Data" ;
@@ -439,7 +440,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 12 , 111  ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "Z~eit" ;
-        Text [ ENGLISH ] = "~Time" ;
+        Text [ ENGLISH ] = "Ti~me" ;
         Text [ norwegian ] = "~Tidspunkt" ;
         Text [ italian ] = "Orario" ;
         Text [ portuguese_brazilian ] = "~Hora" ;
@@ -496,8 +497,9 @@ TabPage TP_PRINT_OPTIONS
     };
     FixedLine FL_SEPARATOR2
     {
-        Pos = MAP_APPFONT ( 125 , 79  ) ;
-        Size = MAP_APPFONT ( 4 , 82 ) ;
+        Pos = MAP_APPFONT ( 125 , 83 ) ;
+        Size = MAP_APPFONT ( 4 , 80 ) ;
+        Vert = TRUE ;
     };
     FixedLine GRP_PAGE
     {
@@ -533,7 +535,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 136 , 83  ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         Text = "St~andard" ;
-        Text [ ENGLISH ] = "~Default" ;
+        Text [ ENGLISH ] = "~Standard" ;
         TabStop = TRUE ;
         Text [ english_us ] = "~Standard" ;
         Text [ italian ] = "St~andard" ;
@@ -621,10 +623,10 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 136, 125  ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         Text = "~Prospekt" ;
-        Text [ ENGLISH ] = "~Booklet" ;
+        Text [ ENGLISH ] = "~Brochure" ;
         TabStop = TRUE ;
         Text [ dutch ] = "~Brochure" ;
-        Text [ english_us ] = "B~rochure" ;
+        Text [ english_us ] = "~Brochure" ;
         Text [ italian ] = "Depliant" ;
         Text [ spanish ] = "~Prospecto" ;
         Text [ french ] = "~Prospectus" ;
@@ -647,10 +649,10 @@ TabPage TP_PRINT_OPTIONS
     };
     CheckBox CBX_FRONT
     {
-        Pos = MAP_APPFONT ( 144 , 139  ) ;
+        Pos = MAP_APPFONT ( 145 , 139  ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         Text = "~Vorderseite" ;
-        Text [ ENGLISH ] = "Front" ;
+        Text [ ENGLISH ] = "Fr~ont side" ;
         TabStop = TRUE ;
         Text [ english_us ] = "Fr~ont side" ;
         Text [ italian ] = "Davanti pagina" ;
@@ -678,8 +680,8 @@ TabPage TP_PRINT_OPTIONS
     {
         Pos = MAP_APPFONT ( 202 , 139  ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
-        Text = "R�cks~eite" ;
-        Text [ ENGLISH ] = "Back" ;
+        Text = "R~�ckseite" ;
+        Text [ ENGLISH ] = "Ba~ck side" ;
         TabStop = TRUE ;
         Text [ english_us ] = "Ba~ck side" ;
         Text [ italian ] = "Retro pagina" ;
@@ -708,7 +710,7 @@ TabPage TP_PRINT_OPTIONS
         Pos = MAP_APPFONT ( 136 , 153  ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text = "Papierschacht aus ~Druckereinstellung" ;
-        Text [ ENGLISH ] = "Paperbin from ~Printer settings" ;
+        Text [ ENGLISH ] = "Paperbin from printer s~ettings" ;
         Text [ english_us ] = "Paper tray from printer s~ettings" ;
         Text [ portuguese_brazilian ] = "Aus ~Druckereinstellung" ;
         Text [ swedish ] = "Pappersfack fr�n s~krivarinst�llning" ;
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index ef11cde0e654..c5dc537056f5 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prntopts.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2001-05-04 09:19:35 $
+ *  last change: $Author: dr $ $Date: 2001-06-25 13:31:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,6 +98,10 @@ private:
     CheckBox            aCbxOutline;
 
     FixedLine           aSeparator1FL;
+    FixedLine           aGrpOutput;
+    RadioButton         aRbtColor;
+    RadioButton         aRbtGrayscale;
+    RadioButton         aRbtBlackWhite;
 
     FixedLine           aGrpPrintExt;
     CheckBox            aCbxPagename;
@@ -105,13 +109,7 @@ private:
     CheckBox            aCbxTime;
     CheckBox            aCbxHiddenPages;
 
-    FixedLine           aGrpOutput;
-    RadioButton         aRbtColor;
-    RadioButton         aRbtGrayscale;
-    RadioButton         aRbtBlackWhite;
-
     FixedLine           aSeparator2FL;
-
     FixedLine           aGrpPageoptions;
     RadioButton         aRbtDefault;
     RadioButton         aRbtPagesize;