#86988# dialog redesign

14 files changed, 181 insertions, 202 deletions

diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 4136ebc39251..f3cc5acec54b 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dapidata.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: nn $ $Date: 2001-02-21 16:28:49 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:27:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,7 +111,7 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) :
     aCbObject       ( this, ScResId( CB_OBJECT ) ),
     aFtType         ( this, ScResId( FT_OBJTYPE ) ),
     aLbType         ( this, ScResId( LB_OBJTYPE ) ),
-    aGbFrame        ( this, ScResId( GB_FRAME ) )
+    aFlFrame        ( this, ScResId( FL_FRAME ) )
 {
     FreeResource();
 
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 2d1bad9059e2..36e07e842aa9 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dapitype.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:54 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:27:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,7 +85,7 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg( Window* pParent, BOOL bEnabl
     aBtnSelection   ( this, ScResId( BTN_SELECTION ) ),
     aBtnDatabase    ( this, ScResId( BTN_DATABASE ) ),
     aBtnExternal    ( this, ScResId( BTN_EXTERNAL ) ),
-    aGbFrame        ( this, ScResId( GB_FRAME ) )
+    aFlFrame        ( this, ScResId( FL_FRAME ) )
 {
     if (!bEnableExternal)
         aBtnExternal.Disable();
@@ -133,7 +133,7 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent,
     aEdUser         ( this, ScResId( ED_USER ) ),
     aFtPasswd       ( this, ScResId( FT_PASSWD ) ),
     aEdPasswd       ( this, ScResId( ED_PASSWD ) ),
-    aGbFrame        ( this, ScResId( GB_FRAME ) )
+    aFlFrame        ( this, ScResId( FL_FRAME ) )
 {
     long nCount = rServices.getLength();
     const rtl::OUString* pArray = rServices.getConstArray();
diff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrc
index 938b7426976f..c4693bf52251 100644
--- a/sc/source/ui/dbgui/dapitype.hrc
+++ b/sc/source/ui/dbgui/dapitype.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dapitype.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:54 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:27:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,7 @@
 #define BTN_SELECTION   4
 #define BTN_DATABASE    5
 #define BTN_EXTERNAL    6
-#define GB_FRAME        7
+#define FL_FRAME        7
 
 #define FT_SERVICE      8
 #define LB_SERVICE      9
diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src
index 16190c61bf53..016384950bae 100644
--- a/sc/source/ui/dbgui/dapitype.src
+++ b/sc/source/ui/dbgui/dapitype.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dapitype.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 07:52:25 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:27:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,7 @@ ModalDialog RID_SCDLG_DAPITYPE
     OutputSize = TRUE ;
     HelpId = HID_DATAPILOT_TYPE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 191 , 75 ) ;
+    Size = MAP_APPFONT ( 191 , 63 ) ;
     Text = "Quelle auswählen" ;
     Text [ ENGLISH ] = "Select source" ;
     Moveable = TRUE ;
@@ -123,7 +123,7 @@ ModalDialog RID_SCDLG_DAPITYPE
     };
     RadioButton BTN_DATABASE
     {
-        Pos = MAP_APPFONT ( 12 , 27 ) ;
+        Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 114 , 10 ) ;
         Text = "~In %PRODUCTNAME angemeldete Datenquelle" ;
         Text [ ENGLISH ] = "Database source" ;
@@ -152,7 +152,7 @@ ModalDialog RID_SCDLG_DAPITYPE
     };
     RadioButton BTN_EXTERNAL
     {
-        Pos = MAP_APPFONT ( 12 , 40 ) ;
+        Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 114 , 10 ) ;
         Text = "~Externe Quelle/Schnittstelle" ;
         Text [ ENGLISH ] = "External source/interface" ;
@@ -179,10 +179,10 @@ ModalDialog RID_SCDLG_DAPITYPE
         Text[ catalan ] = "~Fuente externa/Interfaz";
         Text[ finnish ] = "~Ulkoinen lähde/liittymä";
     };
-    GroupBox GB_FRAME
+    FixedLine FL_FRAME
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 123 , 69 ) ;
+        Size = MAP_APPFONT ( 123 , 8 ) ;
         Text = "Auswahl" ;
         Text [ ENGLISH ] = "Select" ;
         Text[ english_us ] = "Selection";
@@ -239,7 +239,7 @@ ModalDialog RID_SCDLG_DAPISERVICE
     OutputSize = TRUE ;
     HelpId = HID_DATAPILOT_SERVICE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 241 , 95 ) ;
+    Size = MAP_APPFONT ( 241 , 94 ) ;
     Text = "Externe Datenquelle" ;
     Text [ ENGLISH ] = "External source" ;
     Moveable = TRUE ;
@@ -266,7 +266,7 @@ ModalDialog RID_SCDLG_DAPISERVICE
     FixedText FT_SERVICE
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Service" ;
         Text [ ENGLISH ] = "Service" ;
         Text[ english_us ] = "~Service";
@@ -294,15 +294,15 @@ ModalDialog RID_SCDLG_DAPISERVICE
     ListBox LB_SERVICE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 12 ) ;
-        Size = MAP_APPFONT ( 116 , 80 ) ;
+        Pos = MAP_APPFONT ( 56 , 12 ) ;
+        Size = MAP_APPFONT ( 120 , 80 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     FixedText FT_SOURCE
     {
-        Pos = MAP_APPFONT ( 12 , 29 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 30 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Quelle" ;
         Text [ ENGLISH ] = "Source" ;
         Text[ english_us ] = "So~urce";
@@ -330,14 +330,14 @@ ModalDialog RID_SCDLG_DAPISERVICE
     Edit ED_SOURCE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 28 ) ;
-        Size = MAP_APPFONT ( 116 , 12 ) ;
+        Pos = MAP_APPFONT ( 56 , 28 ) ;
+        Size = MAP_APPFONT ( 120 , 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_NAME
     {
-        Pos = MAP_APPFONT ( 12 , 44 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 46 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Name" ;
         Text [ ENGLISH ] = "Name" ;
         Text[ english_us ] = "~Name";
@@ -365,14 +365,14 @@ ModalDialog RID_SCDLG_DAPISERVICE
     Edit ED_NAME
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 43 ) ;
-        Size = MAP_APPFONT ( 116 , 12 ) ;
+        Pos = MAP_APPFONT ( 56 , 44 ) ;
+        Size = MAP_APPFONT ( 120 , 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_USER
     {
-        Pos = MAP_APPFONT ( 12 , 59 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 62 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Benutzer" ;
         Text [ ENGLISH ] = "User" ;
         Text[ english_us ] = "Us~er";
@@ -400,14 +400,14 @@ ModalDialog RID_SCDLG_DAPISERVICE
     Edit ED_USER
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 58 ) ;
-        Size = MAP_APPFONT ( 116 , 12 ) ;
+        Pos = MAP_APPFONT ( 56 , 60 ) ;
+        Size = MAP_APPFONT ( 120 , 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_PASSWD
     {
-        Pos = MAP_APPFONT ( 12 , 74 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 78 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Kennwort" ;
         Text [ ENGLISH ] = "Password" ;
         Text[ english_us ] = "~Password";
@@ -435,15 +435,15 @@ ModalDialog RID_SCDLG_DAPISERVICE
     Edit ED_PASSWD
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 73 ) ;
-        Size = MAP_APPFONT ( 116 , 12 ) ;
+        Pos = MAP_APPFONT ( 56 , 76 ) ;
+        Size = MAP_APPFONT ( 120 , 12 ) ;
         TabStop = TRUE ;
         PassWord = TRUE ;
     };
-    GroupBox GB_FRAME
+    FixedLine FL_FRAME
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 173 , 89 ) ;
+        Size = MAP_APPFONT ( 173 , 8 ) ;
         Text = "Auswahl" ;
         Text [ ENGLISH ] = "Select" ;
         Text[ english_us ] = "Selection";
@@ -500,7 +500,7 @@ ModalDialog RID_SCDLG_DAPIDATA
     OutputSize = TRUE ;
     HelpId = HID_DATAPILOT_DATABASE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 241 , 75 ) ;
+    Size = MAP_APPFONT ( 241 , 63 ) ;
     Text = "Datenquelle auswählen" ;
     Text [ ENGLISH ] = "Select data source" ;
     Moveable = TRUE ;
@@ -528,7 +528,7 @@ ModalDialog RID_SCDLG_DAPIDATA
     FixedText FT_DATABASE
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Datenbank" ;
         Text [ ENGLISH ] = "Database" ;
         Text[ english_us ] = "~Database";
@@ -556,16 +556,16 @@ ModalDialog RID_SCDLG_DAPIDATA
     ListBox LB_DATABASE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 12 ) ;
-        Size = MAP_APPFONT ( 116 , 80 ) ;
+        Pos = MAP_APPFONT ( 56 , 12 ) ;
+        Size = MAP_APPFONT ( 120 , 80 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
 
     FixedText FT_OBJECT
     {
-        Pos = MAP_APPFONT ( 12 , 29 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 30 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "Daten~quelle" ;
         Text [ ENGLISH ] = "Data source" ;
         Text[ english_us ] = "Data so~urce";
@@ -593,16 +593,16 @@ ModalDialog RID_SCDLG_DAPIDATA
     ComboBox CB_OBJECT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 27 ) ;
-        Size = MAP_APPFONT ( 116 , 80 ) ;
+        Pos = MAP_APPFONT ( 56 , 28 ) ;
+        Size = MAP_APPFONT ( 120 , 80 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
 
     FixedText FT_OBJTYPE
     {
-        Pos = MAP_APPFONT ( 12 , 44 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 46 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Art" ;
         Text [ ENGLISH ] = "Type" ;
         Text[ english_us ] = "~Type";
@@ -630,8 +630,8 @@ ModalDialog RID_SCDLG_DAPIDATA
     ListBox LB_OBJTYPE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 42 ) ;
-        Size = MAP_APPFONT ( 116 , 80 ) ;
+        Pos = MAP_APPFONT ( 56 , 44 ) ;
+        Size = MAP_APPFONT ( 120 , 80 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         StringList =
@@ -797,10 +797,10 @@ ModalDialog RID_SCDLG_DAPIDATA
     };
     };
 
-    GroupBox GB_FRAME
+    FixedLine FL_FRAME
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 173 , 69 ) ;
+        Size = MAP_APPFONT ( 173 , 8 ) ;
         Text = "Auswahl" ;
         Text [ ENGLISH ] = "Select" ;
         Text[ english_us ] = "Selection";
diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc
index 99afec6744d6..89875a764332 100644
--- a/sc/source/ui/dbgui/pivot.hrc
+++ b/sc/source/ui/dbgui/pivot.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pivot.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:54 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:27:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,31 +61,30 @@
 #include "sc.hrc" // ->RID_SCDLG_PIVOT_LAYOUT
 
 #define BTN_OK                  1
-#define BTN_CANCEL              1
-#define BTN_HELP                1
-#define BTN_MORE                1
+#define BTN_CANCEL              2
+#define BTN_HELP                3
+#define BTN_MORE                4
 
-#define GB_LAYOUT               1
-#define WND_HSCROLL             1
+#define FL_LAYOUT               10
+#define WND_COL                 11
+#define WND_ROW                 12
+#define WND_DATA                13
+#define WND_SELECT              14
+#define WND_FIELD               15
+#define WND_HSCROLL             16
 
-#define WND_COL                 10
-#define WND_ROW                 11
-#define WND_DATA                12
-#define WND_SELECT              13
-#define WND_FIELD               14
+#define PTR_FIELD               18
+#define FT_INFO                 19
 
-#define PTR_FIELD               1
-#define FT_INFO                 1
-
-#define GB_OUTPUT               2
-#define FT_OUTAREA              2
-#define LB_OUTAREA              1
-#define ED_OUTAREA              1
-#define RB_OUTAREA              1
-#define BTN_IGNEMPTYROWS        3
-#define BTN_DETECTCAT           4
-#define BTN_TOTALCOL            5
-#define BTN_TOTALROW            6
+#define FL_OUTPUT               20
+#define FT_OUTAREA              21
+#define LB_OUTAREA              22
+#define ED_OUTAREA              23
+#define RB_OUTAREA              24
+#define BTN_IGNEMPTYROWS        25
+#define BTN_DETECTCAT           26
+#define BTN_TOTALCOL            27
+#define BTN_TOTALROW            28
 
 #define PIVOTSTR_SUM            1
 #define PIVOTSTR_COUNT          2
diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src
index 568c02149bf4..528acfc946d7 100644
--- a/sc/source/ui/dbgui/pivot.src
+++ b/sc/source/ui/dbgui/pivot.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pivot.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 07:57:05 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:27:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     HelpId = SID_OPENDLG_PIVOTTABLE ;
     Hide = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 320 , 143 ) ;
+    Size = MAP_APPFONT ( 320 , 140 ) ;
     Text = "Datenpilot" ;
     Text [ ENGLISH ] = "Data Pilot" ;
     Text [ norwegian ] = "Data Pilot" ;
@@ -80,7 +80,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     Closeable = FALSE ;
     Window WND_ROW
     {
-        Pos = MAP_APPFONT ( 9 , 32 ) ;
+        Pos = MAP_APPFONT ( 9 , 34 ) ;
         Size = MAP_APPFONT ( 34 , 80 ) ;
         Text = "ZEILE" ;
         Text [ ENGLISH ] = "ROW" ;
@@ -109,7 +109,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     Window WND_COL
     {
-        Pos = MAP_APPFONT ( 43 , 12 ) ;
+        Pos = MAP_APPFONT ( 43 , 14 ) ;
         Size = MAP_APPFONT ( 136 , 20 ) ;
         Text = "SPALTE" ;
         Text [ ENGLISH ] = "COLUMN" ;
@@ -138,7 +138,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     Window WND_DATA
     {
-        Pos = MAP_APPFONT ( 43 , 32 ) ;
+        Pos = MAP_APPFONT ( 43 , 34 ) ;
         Size = MAP_APPFONT ( 136 , 80 ) ;
         Text = "DATEN" ;
         Text [ ENGLISH ] = "DATA" ;
@@ -167,19 +167,19 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     Window WND_SELECT
     {
-        Pos = MAP_APPFONT ( 186 , 12 ) ;
+        Pos = MAP_APPFONT ( 187 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 100 ) ;
     };
     ScrollBar WND_HSCROLL
     {
-        Pos = MAP_APPFONT ( 186 , 117 ) ;
-        Size = MAP_APPFONT ( 70 , 10 ) ;
+        Pos = MAP_APPFONT ( 187 , 118 ) ;
+        Size = MAP_APPFONT ( 70 , 8 ) ;
         HScroll = TRUE ;
     };
     FixedText FT_INFO
     {
-        Pos = MAP_APPFONT ( 9 , 117 ) ;
-        Size = MAP_APPFONT ( 171 , 18 ) ;
+        Pos = MAP_APPFONT ( 9 , 118 ) ;
+        Size = MAP_APPFONT ( 171 , 16 ) ;
         WordBreak = TRUE ;
         /* ### ACHTUNG: Neuer Text in Resource? Ziehen Sie die Felder auf der rechten Seite mit der Maus in die gewünschten Bereiche. : Ziehen Sie die Felder auf der rechten Seite mit der Maus in die gew³nschten Bereiche. */
         Text = "Ziehen Sie die Felder auf der rechten Seite mit der Maus in die gewünschten Bereiche." ;
@@ -207,11 +207,12 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Arrastre los campos de la página derecha hacia el área deseada.";
     };
-    GroupBox GB_LAYOUT
+    FixedLine FL_LAYOUT
     {
-        Pos = MAP_APPFONT ( 3 , 3 ) ;
-        Size = MAP_APPFONT ( 260 , 135 ) ;
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 257 , 8 ) ;
         Text = "Layout" ;
+        Text [ ENGLISH ] = "Layout" ;
     };
     OKButton BTN_OK
     {
@@ -234,23 +235,8 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     MoreButton BTN_MORE
     {
-        Pos = MAP_APPFONT ( 270 , 124 ) ;
+        Pos = MAP_APPFONT ( 270 , 120 ) ;
         Size = MAP_APPFONT ( 45 , 14 ) ;
-        /*
-            Text = "~Zusätze";
-            Text[ ENGLISH ] = "~More";
-            Text[norwegian] = "~Mer";
-            Text[italian] = "~Altro";
-            Text[portuguese_brazilian] = "~Mais";
-            Text[portuguese] = "~Mais";
-            Text[finnish] = "~Enemmän";
-            Text[danish] = "~Flere";
-            Text[french] = " S~uite";
-            Text[swedish] = "~Fler";
-            Text[dutch] = "~Overige";
-            Text[spanish] = "~Más";
-            Text[english_us] = "~More";
-            */
         TabStop = TRUE ;
         MapUnit = MAP_APPFONT ;
         Delta = 59 ;
@@ -258,14 +244,14 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     Window WND_FIELD
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 186 , 12 ) ;
+        Pos = MAP_APPFONT ( 187 , 17 ) ;
         Size = MAP_APPFONT ( 34 , 10 ) ;
         Text = "Field" ;
     };
-    GroupBox GB_OUTPUT
+    FixedLine FL_OUTPUT
     {
-        Pos = MAP_APPFONT ( 3 , 142 ) ;
-        Size = MAP_APPFONT ( 260 , 56 ) ;
+        Pos = MAP_APPFONT ( 6 , 140 ) ;
+        Size = MAP_APPFONT ( 257 , 8 ) ;
         Text = "Ergebnis" ;
         Text [ ENGLISH ] = "Result" ;
         Text [ norwegian ] = "Resultat" ;
@@ -294,10 +280,10 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     FixedText FT_OUTAREA
     {
-        Pos = MAP_APPFONT ( 9 , 153 ) ;
-        Size = MAP_APPFONT ( 43 , 10 ) ;
-        Text = "Ausgabe ab" ;
-        Text [ ENGLISH ] = "Output from" ;
+        Pos = MAP_APPFONT ( 12 , 153 ) ;
+        Size = MAP_APPFONT ( 43 , 8 ) ;
+        Text = "~Ausgabe ab" ;
+        Text [ ENGLISH ] = "~Output from" ;
         Text [ norwegian ] = "Utgående fra " ;
         Text [ italian ] = "Risultato da" ;
         Text [ portuguese_brazilian ] = "Sa?da de" ;
@@ -325,8 +311,8 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     ListBox LB_OUTAREA
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 55 , 152 ) ;
-        Size = MAP_APPFONT ( 90 , 90 ) ;
+        Pos = MAP_APPFONT ( 57 , 151 ) ;
+        Size = MAP_APPFONT ( 85 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Hide = TRUE ;
@@ -334,8 +320,8 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     Edit ED_OUTAREA
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 150 , 152 ) ;
-        Size = MAP_APPFONT ( 92 , 12 ) ;
+        Pos = MAP_APPFONT ( 146 , 151 ) ;
+        Size = MAP_APPFONT ( 100 , 12 ) ;
         TabStop = TRUE ;
         Hide = TRUE ;
     };
@@ -343,7 +329,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     {
         QuickHelpText = "Verkleinern" ;
         QuickHelpText [ ENGLISH ] = "Shrink" ;
-        Pos = MAP_APPFONT ( 244 , 152 ) ;
+        Pos = MAP_APPFONT ( 248 , 151 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         TabStop = FALSE ;
         QuickHelpText [ portuguese ] = "Afastar" ;
@@ -370,8 +356,8 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     CheckBox BTN_IGNEMPTYROWS
     {
-        Pos = MAP_APPFONT ( 9 , 168 ) ;
-        Size = MAP_APPFONT ( 85 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 169 ) ;
+        Size = MAP_APPFONT ( 121 , 10 ) ;
         Text = "Leerzeilen ~ignorieren" ;
         Text [ ENGLISH ] = "~Ignore empty rows" ;
         Text [ norwegian ] = "~Ignorer tomme rader " ;
@@ -401,8 +387,8 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     CheckBox BTN_DETECTCAT
     {
-        Pos = MAP_APPFONT ( 97 , 168 ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
+        Pos = MAP_APPFONT ( 139 , 169 ) ;
+        Size = MAP_APPFONT ( 121 , 10 ) ;
         Text = "~Kategorieerkennung" ;
         Text [ ENGLISH ] = "~Detect Categories" ;
         Text [ norwegian ] = "~Finn Kategorier " ;
@@ -432,8 +418,8 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     CheckBox BTN_TOTALCOL
     {
-        Pos = MAP_APPFONT ( 9 , 181 ) ;
-        Size = MAP_APPFONT ( 85 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 183 ) ;
+        Size = MAP_APPFONT ( 121 , 10 ) ;
         Text = "Gesamtergebnis-~Spalten" ;
         Text [ ENGLISH ] = "Add total ~colunms" ;
         TabStop = TRUE ;
@@ -462,8 +448,8 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     };
     CheckBox BTN_TOTALROW
     {
-        Pos = MAP_APPFONT ( 97 , 181 ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
+        Pos = MAP_APPFONT ( 139 , 183 ) ;
+        Size = MAP_APPFONT ( 121 , 10 ) ;
         Text = "~Gesamtergebnis-Zeilen" ;
         Text [ ENGLISH ] = "Add total ~rows" ;
         TabStop = TRUE ;
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 91178aa1913c..726fe0e15c82 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pvlaydlg.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: nn $ $Date: 2001-01-25 19:40:06 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:27:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -149,7 +149,7 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window
         aFtOutArea      ( this, ScResId( FT_OUTAREA ) ),
         aEdOutPos       ( this, ScResId( ED_OUTAREA ) ),
         aRbOutPos       ( this, ScResId( RB_OUTAREA ), &aEdOutPos ),
-        aGbAreas        ( this, ScResId( GB_OUTPUT ) ),
+        aFlAreas        ( this, ScResId( FL_OUTPUT ) ),
 
         aWndRow         ( this, ScResId( WND_ROW ),    TYPE_ROW ),
         aWndCol         ( this, ScResId( WND_COL ),    TYPE_COL ),
@@ -162,7 +162,7 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window
         aPtrRow         ( POINTER_PIVOT_ROW  ),
 
         aSlider         ( this, ScResId( WND_HSCROLL ) ),
-        aGbLayout       ( this, ScResId( GB_LAYOUT ) ),
+        aFlLayout       ( this, ScResId( FL_LAYOUT ) ),
         aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ),
         aStrNewTable    ( ScResId( SCSTR_NEWTABLE ) ),
 
@@ -240,7 +240,7 @@ void __EXPORT ScPivotLayoutDlg::Init()
     aBtnMore.AddWindow( &aBtnDetectCat );
     aBtnMore.AddWindow( &aBtnTotalCol );
     aBtnMore.AddWindow( &aBtnTotalRow );
-    aBtnMore.AddWindow( &aGbAreas );
+    aBtnMore.AddWindow( &aFlAreas );
     aBtnMore.SetClickHdl( LINK( this, ScPivotLayoutDlg, MoreClickHdl ) );
 
     {
@@ -275,12 +275,9 @@ void __EXPORT ScPivotLayoutDlg::Init()
         aSlider.SetPosSizePixel( aPos, aSize );
         aSlider.SetEndScrollHdl( LINK( this, ScPivotLayoutDlg, ScrollHdl ) );
         aSlider.SetPageSize( PAGE_SIZE );
-        aSlider.SetVisibleSize( LINE_SIZE );
+        aSlider.SetVisibleSize( PAGE_SIZE );
         aSlider.SetLineSize( LINE_SIZE );
-        aSlider.SetRange( Range( 0, (thePivotData.nLabels/LINE_SIZE)*LINE_SIZE
-                                       + ((thePivotData.nLabels%LINE_SIZE)
-                                            ? LINE_SIZE
-                                            : 0) ) );
+        aSlider.SetRange( Range( 0, ((thePivotData.nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE ) );
         aSlider.Show();
     }
     else
diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx
index 8da548bdca3c..b9ce460392bc 100644
--- a/sc/source/ui/inc/dapidata.hxx
+++ b/sc/source/ui/inc/dapidata.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dapidata.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:58 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:24:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,9 +71,6 @@
 #ifndef _SV_FIXED_HXX
 #include <vcl/fixed.hxx>
 #endif
-#ifndef _SV_GROUP_HXX
-#include <vcl/group.hxx>
-#endif
 #ifndef _SV_LSTBOX_HXX
 #include <vcl/lstbox.hxx>
 #endif
@@ -89,13 +86,13 @@ struct ScImportSourceDesc;
 class ScDataPilotDatabaseDlg : public ModalDialog
 {
 private:
+    FixedLine       aFlFrame;
     FixedText       aFtDatabase;
     ListBox         aLbDatabase;
     FixedText       aFtObject;
     ComboBox        aCbObject;
     FixedText       aFtType;
     ListBox         aLbType;
-    GroupBox        aGbFrame;
     OKButton        aBtnOk;
     CancelButton    aBtnCancel;
     HelpButton      aBtnHelp;
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index ff60fdcc9411..29be8eaa8950 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dapitype.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:44:58 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:24:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,6 @@
 #ifndef _SV_FIXED_HXX
 #include <vcl/fixed.hxx>
 #endif
-#ifndef _SV_GROUP_HXX
-#include <vcl/group.hxx>
-#endif
 #ifndef _SV_LSTBOX_HXX
 #include <vcl/lstbox.hxx>
 #endif
@@ -90,10 +87,10 @@
 class ScDataPilotSourceTypeDlg : public ModalDialog
 {
 private:
+    FixedLine       aFlFrame;
     RadioButton     aBtnSelection;
     RadioButton     aBtnDatabase;
     RadioButton     aBtnExternal;
-    GroupBox        aGbFrame;
     OKButton        aBtnOk;
     CancelButton    aBtnCancel;
     HelpButton      aBtnHelp;
@@ -111,6 +108,7 @@ public:
 class ScDataPilotServiceDlg : public ModalDialog
 {
 private:
+    FixedLine       aFlFrame;
     FixedText       aFtService;
     ListBox         aLbService;
     FixedText       aFtSource;
@@ -121,7 +119,6 @@ private:
     Edit            aEdUser;
     FixedText       aFtPasswd;
     Edit            aEdPasswd;
-    GroupBox        aGbFrame;
     OKButton        aBtnOk;
     CancelButton    aBtnCancel;
     HelpButton      aBtnHelp;
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index a9a41cc3368d..2130764ad749 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pvlaydlg.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:00 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:24:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,9 +65,6 @@
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
 #ifndef _SCRBAR_HXX //autogen
 #include <vcl/scrbar.hxx>
 #endif
@@ -142,14 +139,15 @@ public:
     const Pointer*  NotifyMouseMove      ( const Point& rAt );
 
 private:
-    ScrollBar       aSlider;
+    FixedLine       aFlLayout;
     FieldWindow     aWndRow;
     FieldWindow     aWndCol;
     FieldWindow     aWndData;
     FieldWindow     aWndSelect;
-    GroupBox        aGbLayout;
-
+    ScrollBar       aSlider;
     FixedInfo       aFtInfo;
+
+    FixedLine       aFlAreas;
     ListBox         aLbOutPos;
     FixedText       aFtOutArea;
     ScRefEdit       aEdOutPos;
@@ -158,12 +156,11 @@ private:
     CheckBox        aBtnDetectCat;
     CheckBox        aBtnTotalCol;
     CheckBox        aBtnTotalRow;
-    GroupBox        aGbAreas;
 
     OKButton        aBtnOk;
     CancelButton    aBtnCancel;
-    MoreButton      aBtnMore;
     HelpButton      aBtnHelp;
+    MoreButton      aBtnMore;
 
     Pointer         aPtrField;
     Pointer         aPtrCol;
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 3a7b42cf8ade..e8f6936da36c 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tptable.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:01 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:24:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,10 +66,6 @@
 #include <sfx2/tabdlg.hxx>
 #endif
 
-#ifndef _SV_GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
 #ifndef _SV_FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
 #endif
@@ -95,6 +91,7 @@ private:
                          const SfxItemSet&  rCoreSet );
             ~ScTablePage();
 private:
+    FixedLine       aFlPrint;
     CheckBox        aBtnHeaders;
     CheckBox        aBtnGrid;
     CheckBox        aBtnNotes;
@@ -103,8 +100,9 @@ private:
     CheckBox        aBtnDrawings;
     CheckBox        aBtnFormulas;
     CheckBox        aBtnNullVals;
-    GroupBox        aGbPrint;
 
+    FixedLine       aFlSep;
+    FixedLine       aFlPageDir;
     RadioButton     aBtnTopDown;
     RadioButton     aBtnLeftRight;
     FixedBitmap     aBmpPageDir;
@@ -112,13 +110,12 @@ private:
     Bitmap          aImgTopDown;
     CheckBox        aBtnPageNo;
     NumericField    aEdPageNo;
-    GroupBox        aGbPageDir;
 
+    FixedLine       aFlScale;
     RadioButton     aBtnScaleAll;
     RadioButton     aBtnScalePageNum;
     NumericField    aEdScaleAll;
     NumericField    aEdScalePageNum;
-    GroupBox        aGbScale;
 
 #ifdef _TPTABLE_CXX
 private:
diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc
index 98794149aa3b..452b0ea158f4 100644
--- a/sc/source/ui/pagedlg/pagedlg.hrc
+++ b/sc/source/ui/pagedlg/pagedlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pagedlg.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dr $ $Date: 2001-05-23 15:03:15 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:23:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,8 @@
 //================================================
 // TabPage: Tabelle
 
+#define FL_SEP              1
+
 #define BTN_GRID            10
 #define BTN_HEADER          11
 #define BTN_NOTES           12
@@ -81,7 +83,7 @@
 #define BTN_DRAWINGS        15
 #define BTN_FORMULAS        16
 #define BTN_NULLVALS        17
-#define GB_PRINT            19
+#define FL_PRINT            19
 
 #define BTN_TOPDOWN         20
 #define BTN_LEFTRIGHT       21
@@ -90,14 +92,14 @@
 #define IMG_TOPDOWN         24
 #define BTN_PAGENO          25
 #define ED_PAGENO           26
-#define GB_PAGEDIR          29
+#define FL_PAGEDIR          29
 
 #define BTN_SCALENONE       30
 #define BTN_SCALEALL        31
 #define ED_SCALEALL         32
 #define BTN_SCALEPAGENUM    33
 #define ED_SCALEPAGENUM     34
-#define GB_SCALE            39
+#define FL_SCALE            39
 
 //================================================
 // Dialog: Druckbereiche
diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src
index 607c3493c909..13e36ed63618 100644
--- a/sc/source/ui/pagedlg/pagedlg.src
+++ b/sc/source/ui/pagedlg/pagedlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pagedlg.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: dr $ $Date: 2001-05-23 16:59:39 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:23:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -709,7 +709,7 @@ TabPage RID_SCPAGE_TABLE
     CheckBox BTN_HEADER
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
+        Size = MAP_APPFONT ( 91 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Zeilen- & Sp~altenköpfe : Zeilen- & Sp~altenk÷pfe */
         Text = "Zeilen- & Sp~altenköpfe" ;
         Text [ ENGLISH ] = "Column- & row he~adings" ;
@@ -739,7 +739,7 @@ TabPage RID_SCPAGE_TABLE
     CheckBox BTN_GRID
     {
         Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
+        Size = MAP_APPFONT ( 91 , 10 ) ;
         Text = "Tabellen~gitter" ;
         Text [ ENGLISH ] = "~Grid" ;
         Text [ norwegian ] = "~Grid" ;
@@ -768,7 +768,7 @@ TabPage RID_SCPAGE_TABLE
     CheckBox BTN_NOTES
     {
         Pos = MAP_APPFONT ( 12 , 42 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
+        Size = MAP_APPFONT ( 91 , 10 ) ;
         Text = "~Notizen" ;
         Text [ ENGLISH ] = "~Notes" ;
         Text [ norwegian ] = "~Notes" ;
@@ -797,7 +797,7 @@ TabPage RID_SCPAGE_TABLE
     CheckBox BTN_OBJECTS
     {
         Pos = MAP_APPFONT ( 12 , 56 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
+        Size = MAP_APPFONT ( 91 , 10 ) ;
         Text = "~Objekte/Grafiken" ;
         Text [ ENGLISH ] = "~Objects/Images" ;
         Text [ norwegian ] = "~Objects/Images" ;
@@ -826,7 +826,7 @@ TabPage RID_SCPAGE_TABLE
     CheckBox BTN_CHARTS
     {
         Pos = MAP_APPFONT ( 12 , 70 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
+        Size = MAP_APPFONT ( 91 , 10 ) ;
         Text = "~Diagramme" ;
         Text [ ENGLISH ] = "~Charts" ;
         Text [ norwegian ] = "~Charts" ;
@@ -855,7 +855,7 @@ TabPage RID_SCPAGE_TABLE
     CheckBox BTN_DRAWINGS
     {
         Pos = MAP_APPFONT ( 12 , 84 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
+        Size = MAP_APPFONT ( 91 , 10 ) ;
         Text = "Zeichenob~jekte" ;
         Text [ ENGLISH ] = "Drawob~jects" ;
         Text [ norwegian ] = "Drawob~jects" ;
@@ -884,7 +884,7 @@ TabPage RID_SCPAGE_TABLE
     CheckBox BTN_FORMULAS
     {
         Pos = MAP_APPFONT ( 12 , 98 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
+        Size = MAP_APPFONT ( 91 , 10 ) ;
         Text = "~Formeln" ;
         Text [ ENGLISH ] = "~Formulas" ;
         Text [ norwegian ] = "~Formulas" ;
@@ -913,7 +913,7 @@ TabPage RID_SCPAGE_TABLE
     CheckBox BTN_NULLVALS
     {
         Pos = MAP_APPFONT ( 12 , 112 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
+        Size = MAP_APPFONT ( 91 , 10 ) ;
         Text = "N~ullwerte" ;
         Text [ ENGLISH ] = "N~ull values" ;
         Text [ norwegian ] = "N~ull values" ;
@@ -939,10 +939,10 @@ TabPage RID_SCPAGE_TABLE
         Text[ turkish ] = "Sýfýr deðer~leri";
         Text[ catalan ] = "~Valores cero";
     };
-    GroupBox GB_PRINT
+    FixedLine FL_PRINT
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 100 , 122 ) ;
+        Size = MAP_APPFONT ( 100 , 8 ) ;
         Text = "Drucken" ;
         Text [ ENGLISH ] = "Print" ;
         Text [ norwegian ] = "Skriv ut" ;
@@ -967,6 +967,11 @@ TabPage RID_SCPAGE_TABLE
         Text[ turkish ] = "Yazdýr";
         Text[ catalan ] = "Imprimir";
     };
+    FixedLine FL_SEP
+    {
+        Pos = MAP_APPFONT ( 109 , 14 ) ;
+        Size = MAP_APPFONT ( 1 , 108 ) ;
+    };
     RadioButton BTN_TOPDOWN
     {
         Pos = MAP_APPFONT ( 118 , 14 ) ;
@@ -1067,7 +1072,7 @@ TabPage RID_SCPAGE_TABLE
     NumericField ED_PAGENO
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 191 , 45 ) ;
+        Pos = MAP_APPFONT ( 191 , 44 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         TabStop = TRUE ;
         Spin = TRUE ;
@@ -1076,10 +1081,10 @@ TabPage RID_SCPAGE_TABLE
         SpinSize = 1 ;
         Repeat = TRUE ;
     };
-    GroupBox GB_PAGEDIR
+    FixedLine FL_PAGEDIR
     {
         Pos = MAP_APPFONT ( 112 , 3 ) ;
-        Size = MAP_APPFONT ( 141 , 67 ) ;
+        Size = MAP_APPFONT ( 142 , 8 ) ;
         Text = "Seitenreihenfolge" ;
         Text [ ENGLISH ] = "Page Order" ;
         Text [ norwegian ] = "Page Order" ;
@@ -1106,7 +1111,7 @@ TabPage RID_SCPAGE_TABLE
     };
     RadioButton BTN_SCALEALL
     {
-        Pos = MAP_APPFONT ( 118 , 85 ) ;
+        Pos = MAP_APPFONT ( 118 , 75 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text = "A~lles auf [%]" ;
         Text [ ENGLISH ] = "~All pages to [%]" ;
@@ -1135,7 +1140,7 @@ TabPage RID_SCPAGE_TABLE
     };
     RadioButton BTN_SCALEPAGENUM
     {
-        Pos = MAP_APPFONT ( 118 , 101 ) ;
+        Pos = MAP_APPFONT ( 118 , 91 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text = "Ma~x. Seitenzahl" ;
         Text [ ENGLISH ] = "To ~fit on pages" ;
@@ -1165,7 +1170,7 @@ TabPage RID_SCPAGE_TABLE
     NumericField ED_SCALEALL
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 191 , 84 ) ;
+        Pos = MAP_APPFONT ( 191 , 73 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Spin = TRUE ;
@@ -1178,7 +1183,7 @@ TabPage RID_SCPAGE_TABLE
     NumericField ED_SCALEPAGENUM
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 191 , 100 ) ;
+        Pos = MAP_APPFONT ( 191 , 89 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Spin = TRUE ;
@@ -1187,10 +1192,10 @@ TabPage RID_SCPAGE_TABLE
         Maximum = 999 ;
         SpinSize = 1 ;
     };
-    GroupBox GB_SCALE
+    FixedLine FL_SCALE
     {
-        Pos = MAP_APPFONT ( 112 , 73 ) ;
-        Size = MAP_APPFONT ( 141 , 52 ) ;
+        Pos = MAP_APPFONT ( 112 , 62 ) ;
+        Size = MAP_APPFONT ( 142 , 8 ) ;
         Text = "Skalierung" ;
         Text [ ENGLISH ] = "Scale" ;
         Text [ ENGLISH_US ] = "Scale" ;
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 9d134a895694..40300974cbb4 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tptable.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:45:04 $
+ *  last change: $Author: dr $ $Date: 2001-05-25 15:23:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,7 +132,8 @@ ScTablePage::ScTablePage( Window*               pParent,
         aBtnDrawings        ( this, ScResId( BTN_DRAWINGS ) ),
         aBtnFormulas        ( this, ScResId( BTN_FORMULAS ) ),
         aBtnNullVals        ( this, ScResId( BTN_NULLVALS ) ),
-        aGbPrint            ( this, ScResId( GB_PRINT ) ),
+        aFlPrint            ( this, ScResId( FL_PRINT ) ),
+        aFlSep              ( this, ScResId( FL_SEP ) ),
         aBtnTopDown         ( this, ScResId( BTN_TOPDOWN ) ),
         aBtnLeftRight       ( this, ScResId( BTN_LEFTRIGHT ) ),
         aBmpPageDir         ( this, ScResId( BMP_PAGEDIR ) ),
@@ -140,12 +141,12 @@ ScTablePage::ScTablePage( Window*               pParent,
         aImgLeftRight       ( ScResId( IMG_LEFTRIGHT ) ),
         aBtnPageNo          ( this, ScResId( BTN_PAGENO ) ),
         aEdPageNo           ( this, ScResId( ED_PAGENO ) ),
-        aGbPageDir          ( this, ScResId( GB_PAGEDIR ) ),
+        aFlPageDir          ( this, ScResId( FL_PAGEDIR ) ),
         aBtnScaleAll        ( this, ScResId( BTN_SCALEALL ) ),
         aBtnScalePageNum    ( this, ScResId( BTN_SCALEPAGENUM ) ),
         aEdScaleAll         ( this, ScResId( ED_SCALEALL ) ),
         aEdScalePageNum     ( this, ScResId( ED_SCALEPAGENUM ) ),
-        aGbScale            ( this, ScResId( GB_SCALE ) )
+        aFlScale            ( this, ScResId( FL_SCALE ) )
 {
     SetExchangeSupport();
     aBtnPageNo          .SetClickHdl( PAGENO_HDL );
@@ -153,6 +154,7 @@ ScTablePage::ScTablePage( Window*               pParent,
     aBtnLeftRight       .SetClickHdl( PAGEDIR_HDL );
     aBtnScaleAll        .SetClickHdl( SCALE_HDL );
     aBtnScalePageNum    .SetClickHdl( SCALE_HDL );
+    aFlSep.SetStyle( aFlSep.GetStyle() | WB_VERT );
     FreeResource();
 }