diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 92327c7c5426..be9d76d4b2a3 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: break.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2001-04-27 17:53:08 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -228,7 +228,7 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) :
     aPageCollBox(this, SW_RES(LB_COLL)),
     aPageNumBox(this, SW_RES(CB_PAGENUM)),
     aPageNumEdit(this, SW_RES(ED_PAGENUM)),
-    aBreakFrm(this,SW_RES(GB_BREAK)),
+    aBreakFL(this,SW_RES(FL_BREAK)),
     aOkBtn(this,SW_RES(BT_OK)),
     aCancelBtn(this,SW_RES(BT_CANCEL)),
     aHelpBtn(this,SW_RES(BT_HELP)),
@@ -304,6 +304,9 @@ SwBreakDlg::~SwBreakDlg() {}
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2001/04/27 17:53:08  jp
+    use Collator for international string compare
+
     Revision 1.1.1.1  2000/09/18 17:14:32  hr
     initial import
 
diff --git a/sw/source/ui/chrdlg/break.hrc b/sw/source/ui/chrdlg/break.hrc
index fa0dd2089e9a..ebeb5a34fd6b 100644
--- a/sw/source/ui/chrdlg/break.hrc
+++ b/sw/source/ui/chrdlg/break.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: break.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,7 +64,7 @@
 #define RB_COL      3
 #define FT_COLL     4
 #define LB_COLL     5
-#define GB_BREAK    6
+#define FL_BREAK        6
 #define CB_PAGENUM  7
 #define ED_PAGENUM  8
 
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index ea8b4bfeee2e..22997c39fdfe 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drpcps.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -301,9 +301,8 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) :
     aTextEdit     (this, SW_RES(EDT_TEXT    )),
     aTemplateText (this, SW_RES(TXT_TEMPLATE)),
     aTemplateBox  (this, SW_RES(BOX_TEMPLATE)),
-    aSettingsGroup(this, SW_RES(GRP_SETTINGS)),
-    aPictBox      (this, SW_RES(BOX_PICT       )),
-    aContentBox   (this, SW_RES(BOX_CONTENT )),
+    aSettingsFL   (this, SW_RES(FL_SETTINGS)),
+    aContentFL    (this, SW_RES(FL_CONTENT )),
     pPict         (new SwDropCapsPict(this, SW_RES(CNT_PICT))),
     bModified(FALSE),
     bFormat(TRUE),
@@ -322,6 +321,8 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) :
     // Metriken
     SetMetric( aDistanceField, GetDfltMetric(bHtmlMode) );
 
+    pPict->SetBorderStyle( WINDOW_BORDER_MONO );
+
     // Handler installieren
     Link aLk = LINK(this, SwDropCapsPage, ModifyHdl);
     aDropCapsField.SetModifyHdl( aLk );
@@ -615,6 +616,9 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet )
 
 /*--------------------------------------------------
   $Log: not supported by cvs2svn $
+  Revision 1.1.1.1  2000/09/18 17:14:32  hr
+  initial import
+
   Revision 1.100  2000/09/18 16:05:14  willem.vandorp
   OpenOffice header added.
 
diff --git a/sw/source/ui/chrdlg/drpcps.hrc b/sw/source/ui/chrdlg/drpcps.hrc
index 19b00fc6c305..ba422f3d969e 100644
--- a/sw/source/ui/chrdlg/drpcps.hrc
+++ b/sw/source/ui/chrdlg/drpcps.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drpcps.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,10 +75,9 @@
 #define EDT_TEXT       9
 #define TXT_TEMPLATE  10
 #define BOX_TEMPLATE  11
-#define GRP_SETTINGS  12
+#define FL_SETTINGS  12
 #define CB_SWITCH     13
-#define BOX_PICT      14
-#define BOX_CONTENT   15
+#define FL_CONTENT   15
 #define CB_WORD       16
 
 #endif
diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src
index 212b5b352a40..6bb77a657eac 100644
--- a/sw/source/ui/chrdlg/drpcps.src
+++ b/sw/source/ui/chrdlg/drpcps.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drpcps.src,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:15:51 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -196,7 +196,7 @@ TabPage TP_DROPCAPS
     FixedText FT_DROPCAPS
     {
         Pos = MAP_APPFONT ( 12 , 44 ) ;
-        Size = MAP_APPFONT ( 70 , 10 ) ;
+        Size = MAP_APPFONT ( 70 , 8 ) ;
         Text = "Anzahl der Ze~ichen" ;
         Text [ English ] = "Number of characters" ;
         Text [ english_us ] = "Number of ~characters:" ;
@@ -239,7 +239,7 @@ TabPage TP_DROPCAPS
     {
         Left = TRUE ;
         Pos = MAP_APPFONT ( 12 , 60 ) ;
-        Size = MAP_APPFONT ( 70 , 10 ) ;
+        Size = MAP_APPFONT ( 70 , 8 ) ;
         Text = "Zei~len" ;
         Text [ English ] = "~Lines" ;
         Text [ norwegian ] = "~Linjer" ;
@@ -282,8 +282,8 @@ TabPage TP_DROPCAPS
     FixedText TXT_DISTANCE
     {
         Left = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 74 ) ;
-        Size = MAP_APPFONT ( 70 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 76 ) ;
+        Size = MAP_APPFONT ( 70 , 8 ) ;
         Text = "A~bstand zum Text" ;
         Text [ English ] = "D~istance" ;
         Text [ norwegian ] = "A~vstand" ;
@@ -318,7 +318,7 @@ TabPage TP_DROPCAPS
         Left = TRUE ;
         Maximum = 200 ;
         Minimum = 0 ;
-        Pos = MAP_APPFONT ( 89 , 72 ) ;
+        Pos = MAP_APPFONT ( 89 , 74 ) ;
         Repeat = TRUE ;
         Size = MAP_APPFONT ( 36 , 12 ) ;
         Spin = TRUE ;
@@ -326,10 +326,10 @@ TabPage TP_DROPCAPS
         TabStop = TRUE ;
         Unit = FUNIT_CM ;
     };
-    GroupBox GRP_SETTINGS
+    FixedLine FL_SETTINGS
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 125 , 84 ) ;
+        Size = MAP_APPFONT ( 125 , 8 ) ;
         Text = "Einstellungen" ;
         Text [ English ] = "Options" ;
         Text [ norwegian ] = "Options" ;
@@ -358,41 +358,13 @@ TabPage TP_DROPCAPS
     Control CNT_PICT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 143 , 14 ) ;
-        Size = MAP_APPFONT ( 105 , 67 ) ;
-    };
-    GroupBox BOX_PICT
-    {
-        Pos = MAP_APPFONT ( 137 , 3 ) ;
-        Size = MAP_APPFONT ( 117 , 84 ) ;
-        Text = "Beispiel" ;
-        Text [ English ] = "Example" ;
-        Text [ dutch ] = "Voorbeeld" ;
-        Text [ english_us ] = "Preview" ;
-        Text [ italian ] = "Esempio" ;
-        Text [ spanish ] = "Ejemplo" ;
-        Text [ french ] = "Exemple" ;
-        Text [ swedish ] = "Exempel" ;
-        Text [ danish ] = "Eksempel" ;
-        Text [ portuguese_brazilian ] = "Beispiel" ;
-        Text [ portuguese ] = "Exemplo" ;
-        Text[ chinese_simplified ] = "ʾÀý";
-        Text[ russian ] = "Ïðèìåð";
-        Text[ polish ] = "Przyk³ad";
-        Text[ japanese ] = "—á";
-        Text[ chinese_traditional ] = "¹wÄý";
-        Text[ arabic ] = "äãæÐÌ";
-        Text[ greek ] = "ÐáñÜäåéãìá";
-        Text[ korean ] = "¹Ì¸®º¸±â";
-        Text[ turkish ] = "Önizleme";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ejemplo";
-        Text[ finnish ] = "Esikatselu";
+        Pos = MAP_APPFONT ( 143 , 7 ) ;
+        Size = MAP_APPFONT ( 105 , 80 ) ;
     };
     FixedText TXT_TEXT
     {
         Left = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 103 ) ;
+        Pos = MAP_APPFONT ( 12 , 102 ) ;
         Size = MAP_APPFONT ( 70 , 8 ) ;
         Text = "Initialen~text" ;
         Text [ English ] = "~Text" ;
@@ -423,7 +395,7 @@ TabPage TP_DROPCAPS
     {
         Border = TRUE ;
         Left = TRUE ;
-        Pos = MAP_APPFONT ( 143 , 101 ) ;
+        Pos = MAP_APPFONT ( 143 , 100 ) ;
         Size = MAP_APPFONT ( 105 , 12 ) ;
         TabStop = TRUE ;
         MaxTextLength = 9 ;
@@ -431,8 +403,8 @@ TabPage TP_DROPCAPS
     FixedText TXT_TEMPLATE
     {
         Left = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 119 ) ;
-        Size = MAP_APPFONT ( 70 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 118 ) ;
+        Size = MAP_APPFONT ( 70 , 8 ) ;
         Text = "Zeichen~vorlage" ;
         Text [ English ] = "Character st~yle" ;
         Text [ norwegian ] = "M~al" ;
@@ -462,14 +434,14 @@ TabPage TP_DROPCAPS
     {
         Border = TRUE ;
         DropDown = TRUE ;
-        Pos = MAP_APPFONT ( 143 , 117 ) ;
+        Pos = MAP_APPFONT ( 143 , 116 ) ;
         Size = MAP_APPFONT ( 105 , 61 ) ;
         TabStop = TRUE ;
     };
-    GroupBox BOX_CONTENT
+    FixedLine FL_CONTENT
     {
-        Pos = MAP_APPFONT ( 6 , 90 ) ;
-        Size = MAP_APPFONT ( 248 , 42 ) ;
+        Pos = MAP_APPFONT ( 6 , 89 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Inhalt" ;
         Text [ English ] = "Content" ;
         Text [ english_us ] = "Contents" ;
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index cfe6481f992f..11eabdc95624 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numpara.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-02-23 12:45:28 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,13 +107,13 @@ static USHORT __FAR_DATA aPageRg[] = {
 SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent,
                                                 const SfxItemSet& rAttr ) :
     SfxTabPage(pParent, SW_RES(TP_NUMPARA), rAttr),
-    aNumberStyleGB          ( this, ResId( GB_NUMBER_STYLE ) ),
+    aNumberStyleFT          ( this, ResId( FT_NUMBER_STYLE ) ),
     aNumberStyleLB          ( this, ResId( LB_NUMBER_STYLE ) ),
-    aNewStartGB             ( this, ResId( GB_NEW_START ) ),
+    aNewStartFL             ( this, ResId( FL_NEW_START ) ),
     aNewStartCB             ( this, ResId( CB_NEW_START ) ),
     aNewStartFT             ( this, ResId( FT_NEW_START ) ),
     aNewStartNF             ( this, ResId( NF_NEW_START ) ),
-    aCountParaGB            ( this, ResId( GB_COUNT_PARA        ) ),
+    aCountParaFL            ( this, ResId( FL_COUNT_PARA        ) ),
     aCountParaCB            ( this, ResId( CB_COUNT_PARA        ) ),
     aRestartParaCountCB     ( this, ResId( CB_RESTART_PARACOUNT ) ),
     aRestartFT              ( this, ResId( FT_RESTART_NO        ) ),
@@ -132,7 +132,7 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent,
         USHORT nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue();
         if(HTMLMODE_ON & nHtmlMode)
         {
-            aCountParaGB        .Hide();
+            aCountParaFL        .Hide();
             aCountParaCB        .Hide();
             aRestartParaCountCB .Hide();
             aRestartFT          .Hide();
@@ -285,7 +285,7 @@ void    SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
 --------------------------------------------------*/
 void SwParagraphNumTabPage::EnableNewStart()
 {
-    aNewStartGB.Show();
+    aNewStartFL.Show();
     aNewStartCB.Show();
     aNewStartFT.Show();
     aNewStartNF.Show();
@@ -331,6 +331,9 @@ IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox*, pBox )
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.2  2001/02/23 12:45:28  os
+      Complete use of DefaultNumbering component
+
       Revision 1.1.1.1  2000/09/18 17:14:32  hr
       initial import
 
diff --git a/sw/source/ui/chrdlg/numpara.hrc b/sw/source/ui/chrdlg/numpara.hrc
index cbe488697f9b..183d885aba13 100644
--- a/sw/source/ui/chrdlg/numpara.hrc
+++ b/sw/source/ui/chrdlg/numpara.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numpara.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,12 +65,12 @@
 // #define ******************************************************************
 
 #define LB_NUMBER_STYLE             1
-#define GB_NUMBER_STYLE             2
+#define FT_NUMBER_STYLE                         2
 #define CB_NEW_START                3
 #define FT_NEW_START                4
-#define GB_NEW_START                5
+#define FL_NEW_START                5
 #define NF_NEW_START                6
-#define GB_COUNT_PARA               7
+#define FL_COUNT_PARA               7
 #define CB_COUNT_PARA               8
 #define CB_RESTART_PARACOUNT        9
 #define FT_RESTART_NO              10
diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src
index 01e3c6b5b69c..194245dd4ae9 100644
--- a/sw/source/ui/chrdlg/numpara.src
+++ b/sw/source/ui/chrdlg/numpara.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numpara.src,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:18:34 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,10 +71,10 @@ TabPage TP_NUMPARA
     HelpID = HID_NUMPARA ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     Hide = TRUE ;
-    GroupBox GB_NUMBER_STYLE
+    FixedText FT_NUMBER_STYLE
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 26 ) ;
+        Pos = MAP_APPFONT ( 6 , 16 ) ;
+        Size = MAP_APPFONT ( 100 , 8 ) ;
         Text = "Nummerierungsvorlage" ;
         Text [ ENGLISH ] = "Number style" ;
         Text [ portuguese ] = "Estilo de numeração" ;
@@ -101,8 +101,8 @@ TabPage TP_NUMPARA
     };
     ListBox LB_NUMBER_STYLE
     {
-        Pos = MAP_APPFONT ( 93 , 14 ) ;
-        Size = MAP_APPFONT ( 158 , 65 ) ;
+        Pos = MAP_APPFONT ( 130 , 14 ) ;
+        Size = MAP_APPFONT ( 118 , 65 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         StringList =
@@ -198,10 +198,10 @@ TabPage TP_NUMPARA
              < "Ei mitään" ; > ;
     };
     };
-    GroupBox GB_NEW_START
+    FixedLine FL_NEW_START
     {
         Pos = MAP_APPFONT ( 6 , 32 ) ;
-        Size = MAP_APPFONT ( 248 , 40 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Nummerierung" ;
         Text [ English ] = "Numbering" ;
         TabStop = TRUE ;
@@ -260,7 +260,7 @@ TabPage TP_NUMPARA
     };
     FixedText FT_NEW_START
     {
-        Pos = MAP_APPFONT ( 12 , 59 ) ;
+        Pos = MAP_APPFONT ( 18 , 59 ) ;
         Size = MAP_APPFONT ( 50 , 8 ) ;
         Text = "~Beginnen mit:" ;
         Text [ English ] = "~Start at:" ;
@@ -291,7 +291,7 @@ TabPage TP_NUMPARA
     NumericField NF_NEW_START
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 225 , 57 ) ;
+        Pos = MAP_APPFONT ( 130 , 57 ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -305,10 +305,10 @@ TabPage TP_NUMPARA
         Hide = TRUE ;
         Disable = TRUE ;
     };
-    GroupBox GB_COUNT_PARA
+    FixedLine FL_COUNT_PARA
     {
         Pos = MAP_APPFONT ( 6 , 75 ) ;
-        Size = MAP_APPFONT ( 248 , 54 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Zeilennummerierung" ;
         Text [ English ] = "Line numbering" ;
         TabStop = TRUE ;
@@ -394,7 +394,7 @@ TabPage TP_NUMPARA
     };
     FixedText FT_RESTART_NO
     {
-        Pos = MAP_APPFONT ( 12 , 116 ) ;
+        Pos = MAP_APPFONT ( 18 , 116 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text = "B~eginnen mit:" ;
         Text [ English ] = "~Start at:" ;
@@ -424,7 +424,7 @@ TabPage TP_NUMPARA
     NumericField NF_RESTART_PARA
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 225 , 114 ) ;
+        Pos = MAP_APPFONT ( 130 , 114 ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src
index da8f976e4090..e28fd52748d9 100644
--- a/sw/source/ui/chrdlg/swbreak.src
+++ b/sw/source/ui/chrdlg/swbreak.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swbreak.src,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:28:13 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:28:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -199,10 +199,10 @@ ModalDialog DLG_BREAK
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Salto de colu~mna";
     };
-    GroupBox GB_BREAK
+    FixedLine FL_BREAK
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 93 , 105 ) ;
+        Size = MAP_APPFONT ( 93 , 8 ) ;
         Text = "Art" ;
         Text [ ENGLISH ] = "Type" ;
         Text [ norwegian ] = "Type" ;
@@ -365,7 +365,7 @@ ModalDialog DLG_BREAK
     };
     CheckBox CB_PAGENUM
     {
-        Pos = MAP_APPFONT ( 12 , 77 ) ;
+        Pos = MAP_APPFONT ( 12 , 79 ) ;
         Size = MAP_APPFONT ( 84 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Seitennummer ~ändern : Seitennummer ~õndern */
         Text = "Seitennummer ~ändern" ;
@@ -397,7 +397,7 @@ ModalDialog DLG_BREAK
     NumericField ED_PAGENUM
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 90 ) ;
+        Pos = MAP_APPFONT ( 12 , 94 ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 943cbae644ba..2adc14f99031 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envfmt.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2001-03-20 17:01:50 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -156,7 +156,7 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
 
     SfxTabPage(pParent, SW_RES(TP_ENV_FMT), rSet),
 
-    aAddrGroup          (this, SW_RES( GRP_ADDRESSEE )),
+    aAddrFL             (this, SW_RES( FL_ADDRESSEE )),
     aAddrPosInfo        (this, SW_RES( TXT_ADDR_POS )),
     aAddrLeftText       (this, SW_RES( TXT_ADDR_LEFT )),
     aAddrLeftField      (this, SW_RES( FLD_ADDR_LEFT )),
@@ -164,7 +164,7 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
     aAddrTopField       (this, SW_RES( FLD_ADDR_TOP )),
     aAddrFormatInfo     (this, SW_RES( TXT_ADDR_FORMAT )),
     aAddrEditButton     (this, SW_RES( BTN_ADDR_EDIT )),
-    aSendGroup          (this, SW_RES( GRP_SENDER )),
+    aSendFL             (this, SW_RES( FL_SENDER )),
     aSendPosInfo        (this, SW_RES( TXT_SEND_POS )),
     aSendLeftText       (this, SW_RES( TXT_SEND_LEFT )),
     aSendLeftField      (this, SW_RES( FLD_SEND_LEFT )),
@@ -172,7 +172,7 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
     aSendTopField       (this, SW_RES( FLD_SEND_TOP )),
     aSendFormatInfo     (this, SW_RES( TXT_SEND_FORMAT )),
     aSendEditButton     (this, SW_RES( BTN_SEND_EDIT )),
-    aSizeGroup          (this, SW_RES( GRP_SIZE )),
+    aSizeFL             (this, SW_RES( FL_SIZE )),
     aSizeFormatText     (this, SW_RES( TXT_SIZE_FORMAT )),
     aSizeFormatBox      (this, SW_RES( BOX_SIZE_FORMAT )),
     aSizeWidthText      (this, SW_RES( TXT_SIZE_WIDTH )),
@@ -212,6 +212,8 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
     aAddrEditButton.SetSelectHdl( aLk );
     aSendEditButton.SetSelectHdl( aLk );
 
+    aPreview.SetBorderStyle( WINDOW_BORDER_MONO );
+
     aSizeFormatBox     .SetSelectHdl(LINK(this, SwEnvFmtPage, FormatHdl));
 
     // aSizeFormatBox
@@ -682,6 +684,9 @@ void __EXPORT SwEnvFmtPage::Reset(const SfxItemSet& rSet)
 
 /*--------------------------------------------------------------------
 $Log: not supported by cvs2svn $
+Revision 1.3  2001/03/20 17:01:50  jp
+use stdarr
+
 Revision 1.2  2001/02/09 09:07:12  tl
 TabPages modification
 
diff --git a/sw/source/ui/envelp/envfmt.hrc b/sw/source/ui/envelp/envfmt.hrc
index 8ba7c7d330c1..03bff6704cf9 100644
--- a/sw/source/ui/envelp/envfmt.hrc
+++ b/sw/source/ui/envelp/envfmt.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envfmt.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tl $ $Date: 2001-02-09 09:07:12 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,7 @@
 
 // Lokale Resourcen *********************************************************
 
-#define GRP_ADDRESSEE       11
+#define FL_ADDRESSEE           11
 #define TXT_ADDR_POS        12
 #define TXT_ADDR_LEFT       13
 #define FLD_ADDR_LEFT       14
@@ -77,7 +77,7 @@
 #define TXT_ADDR_FORMAT     17
 #define BTN_ADDR_EDIT       18
 
-#define GRP_SENDER          21
+#define FL_SENDER                      21
 #define TXT_SEND_POS        22
 #define TXT_SEND_LEFT       23
 #define FLD_SEND_LEFT       24
@@ -86,7 +86,7 @@
 #define TXT_SEND_FORMAT     27
 #define BTN_SEND_EDIT       28
 
-#define GRP_SIZE            31
+#define FL_SIZE                        31
 #define TXT_SIZE_FORMAT     32
 #define BOX_SIZE_FORMAT     33
 #define TXT_SIZE_WIDTH      34
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 17e49fe9f095..190424781c0b 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envfmt.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tl $ $Date: 2001-02-09 09:07:12 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,7 +86,7 @@
 class SwEnvFmtPage : public SfxTabPage
 {
 
-    GroupBox     aAddrGroup;
+    FixedLine    aAddrFL;
     FixedInfo    aAddrPosInfo;
     FixedText    aAddrLeftText;
     MetricField  aAddrLeftField;
@@ -94,7 +94,7 @@ class SwEnvFmtPage : public SfxTabPage
     MetricField  aAddrTopField;
     FixedInfo    aAddrFormatInfo;
     MenuButton   aAddrEditButton;
-    GroupBox     aSendGroup;
+    FixedLine    aSendFL;
     FixedInfo    aSendPosInfo;
     FixedText    aSendLeftText;
     MetricField  aSendLeftField;
@@ -102,7 +102,7 @@ class SwEnvFmtPage : public SfxTabPage
     MetricField  aSendTopField;
     FixedInfo    aSendFormatInfo;
     MenuButton   aSendEditButton;
-    GroupBox     aSizeGroup;
+    FixedLine    aSizeFL;
     FixedText    aSizeFormatText;
     ListBox      aSizeFormatBox;
     FixedText    aSizeWidthText;
diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src
index 98153dacda24..6995b523c526 100644
--- a/sw/source/ui/envelp/envfmt.src
+++ b/sw/source/ui/envelp/envfmt.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envfmt.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:14:42 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,10 +69,10 @@ TabPage TP_ENV_FMT
     HelpID = HID_ENV_FMT ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     Hide = TRUE ;
-    GroupBox GRP_ADDRESSEE
+    FixedLine FL_ADDRESSEE
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 140 , 76 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Empfänger" ;
         Text [ ENGLISH ] = "Addressee" ;
         Text [ norwegian ] = "Addressee" ;
@@ -100,7 +100,7 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_ADDR_POS
     {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "Position" ;
@@ -128,7 +128,7 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_ADDR_LEFT
     {
-        Pos = MAP_APPFONT ( 56 , 16 ) ;
+        Pos = MAP_APPFONT ( 18 , 27 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "v~on links" ;
@@ -159,7 +159,7 @@ TabPage TP_ENV_FMT
     MetricField FLD_ADDR_LEFT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 14 ) ;
+        Pos = MAP_APPFONT ( 60 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -175,7 +175,7 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_ADDR_TOP
     {
-        Pos = MAP_APPFONT ( 56 , 32 ) ;
+        Pos = MAP_APPFONT ( 18 , 43 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "~von oben" ;
@@ -206,7 +206,7 @@ TabPage TP_ENV_FMT
     MetricField FLD_ADDR_TOP
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 30 ) ;
+        Pos = MAP_APPFONT ( 60 , 41 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -222,7 +222,7 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_ADDR_FORMAT
     {
-        Pos = MAP_APPFONT ( 12 , 62 ) ;
+        Pos = MAP_APPFONT ( 149 , 27 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "Format" ;
@@ -250,7 +250,7 @@ TabPage TP_ENV_FMT
     };
     MenuButton BTN_ADDR_EDIT
     {
-        Pos = MAP_APPFONT ( 56 , 59 ) ;
+        Pos = MAP_APPFONT ( 194 , 24 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         Text = "Bearb." ;
@@ -278,10 +278,10 @@ TabPage TP_ENV_FMT
         Text[ turkish ] = "Düzenle";
         Text[ catalan ] = "Editar";
     };
-    GroupBox GRP_SENDER
+    FixedLine FL_SENDER
     {
-        Pos = MAP_APPFONT ( 6 , 103 ) ;
-        Size = MAP_APPFONT ( 140 , 76 ) ;
+        Pos = MAP_APPFONT ( 6 , 56 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Absender" ;
         Text [ ENGLISH ] = "Sender" ;
         Text [ norwegian ] = "Sender" ;
@@ -309,7 +309,7 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_SEND_POS
     {
-        Pos = MAP_APPFONT ( 12 , 116 ) ;
+        Pos = MAP_APPFONT ( 12 , 67 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "Position" ;
@@ -337,7 +337,7 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_SEND_LEFT
     {
-        Pos = MAP_APPFONT ( 56 , 116 ) ;
+        Pos = MAP_APPFONT ( 18 , 80 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "von ~links" ;
@@ -368,7 +368,7 @@ TabPage TP_ENV_FMT
     MetricField FLD_SEND_LEFT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 114 ) ;
+        Pos = MAP_APPFONT ( 60 , 78 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -384,7 +384,7 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_SEND_TOP
     {
-        Pos = MAP_APPFONT ( 56 , 132 ) ;
+        Pos = MAP_APPFONT ( 18 , 96 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "vo~n oben" ;
@@ -415,7 +415,7 @@ TabPage TP_ENV_FMT
     MetricField FLD_SEND_TOP
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 100 , 130 ) ;
+        Pos = MAP_APPFONT ( 60 , 94 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -431,7 +431,7 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_SEND_FORMAT
     {
-        Pos = MAP_APPFONT ( 12 , 162 ) ;
+        Pos = MAP_APPFONT ( 149 , 80 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "Format" ;
@@ -459,7 +459,7 @@ TabPage TP_ENV_FMT
     };
     MenuButton BTN_SEND_EDIT
     {
-        Pos = MAP_APPFONT ( 56 , 159 ) ;
+        Pos = MAP_APPFONT ( 194 , 77 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text = "Bearb." ;
         Text [ ENGLISH ] = "Edit" ;
@@ -487,10 +487,10 @@ TabPage TP_ENV_FMT
         Text[ turkish ] = "Düzenle";
         Text[ catalan ] = "Editar";
     };
-    GroupBox GRP_SIZE
+    FixedLine FL_SIZE
     {
-        Pos = MAP_APPFONT ( 152 , 3 ) ;
-        Size = MAP_APPFONT ( 102 , 94 ) ;
+        Pos = MAP_APPFONT ( 6 , 109 ) ;
+        Size = MAP_APPFONT ( 148 , 8 ) ;
         Text = "Größe" ;
         Text [ ENGLISH ] = "Size" ;
         Text [ norwegian ] = "Størrelse" ;
@@ -518,8 +518,8 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_SIZE_FORMAT
     {
-        Pos = MAP_APPFONT ( 158 , 14 ) ;
-        Size = MAP_APPFONT ( 90 , 8 ) ;
+        Pos = MAP_APPFONT ( 12 , 122 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Format" ;
         Text [ ENGLISH ] = "Format" ;
         Text [ norwegian ] = "Format" ;
@@ -549,15 +549,15 @@ TabPage TP_ENV_FMT
     ListBox BOX_SIZE_FORMAT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 158 , 25 ) ;
-        Size = MAP_APPFONT ( 90 , 72 ) ;
+        Pos = MAP_APPFONT ( 60 , 120 ) ;
+        Size = MAP_APPFONT ( 40 , 72 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     FixedText TXT_SIZE_WIDTH
     {
-        Pos = MAP_APPFONT ( 158 , 41 ) ;
-        Size = MAP_APPFONT ( 90 , 8 ) ;
+        Pos = MAP_APPFONT ( 12 , 138 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Text = "~Breite" ;
         Text [ ENGLISH ] = "Width" ;
         Text [ norwegian ] = "Bredde " ;
@@ -587,7 +587,7 @@ TabPage TP_ENV_FMT
     MetricField FLD_SIZE_WIDTH
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 158 , 52 ) ;
+        Pos = MAP_APPFONT ( 60 , 136 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -603,8 +603,8 @@ TabPage TP_ENV_FMT
     };
     FixedText TXT_SIZE_HEIGHT
     {
-        Pos = MAP_APPFONT ( 158 , 68 ) ;
-        Size = MAP_APPFONT ( 90 , 8 ) ;
+        Pos = MAP_APPFONT ( 12 , 154 ) ;
+        Size = MAP_APPFONT ( 40 , 8 ) ;
         Left = TRUE ;
         Text = "~Höhe" ;
         Text [ ENGLISH ] = "Height" ;
@@ -634,7 +634,7 @@ TabPage TP_ENV_FMT
     MetricField FLD_SIZE_HEIGHT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 158 , 79 ) ;
+        Pos = MAP_APPFONT ( 60 , 152 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -651,8 +651,8 @@ TabPage TP_ENV_FMT
     Window WIN_PREVIEW
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 152 , 103 ) ;
-        Size = MAP_APPFONT ( 102 , 76 ) ;
+        Pos = MAP_APPFONT ( 160 , 116 ) ;
+        Size = MAP_APPFONT ( 84 , 63 ) ;
     };
 };
  // Menu *********************************************************************
diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src
index 9d281a68b6c3..ce766c299917 100644
--- a/sw/source/ui/envelp/envlop.src
+++ b/sw/source/ui/envelp/envlop.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envlop.src,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:16:37 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -285,7 +285,7 @@ TabPage TP_ENV_ENV
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
-        Size = MAP_APPFONT ( 124 , 77 ) ;
+        Size = MAP_APPFONT ( 124 , 66 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
         HScroll = TRUE ;
@@ -294,7 +294,7 @@ TabPage TP_ENV_ENV
     };
     FixedText FT_DATABASE
     {
-        Pos = MAP_APPFONT ( 162 , 17 ) ;
+        Pos = MAP_APPFONT ( 162 , 6 ) ;
         Size = MAP_APPFONT ( 92 , 8 ) ;
         Text = "~Datenbank" ;
         Text [ English ] = "Database" ;
@@ -324,14 +324,14 @@ TabPage TP_ENV_ENV
     ListBox LB_DATABASE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 162 , 28 ) ;
-        Size = MAP_APPFONT ( 92 , 12 ) ;
+        Pos = MAP_APPFONT ( 162 , 17 ) ;
+        Size = MAP_APPFONT ( 82 , 12 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     FixedText FT_TABLE
     {
-        Pos = MAP_APPFONT ( 162 , 44 ) ;
+        Pos = MAP_APPFONT ( 162 , 33 ) ;
         Size = MAP_APPFONT ( 92 , 8 ) ;
         Text = "~Tabelle" ;
         Text [ ENGLISH ] = "Table" ;
@@ -360,22 +360,21 @@ TabPage TP_ENV_ENV
     ListBox LB_TABLE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 162 , 55 ) ;
-        Size = MAP_APPFONT ( 92 , 12 ) ;
+        Pos = MAP_APPFONT ( 162 , 44 ) ;
+        Size = MAP_APPFONT ( 82 , 12 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
     ImageButton BTN_INSERT
     {
-        Pos = MAP_APPFONT ( 137 , 82 ) ;
-        Size = MAP_APPFONT ( 18 , 12
-        ) ;
+        Pos = MAP_APPFONT ( 137 , 71 ) ;
+        Size = MAP_APPFONT ( 18 , 12 ) ;
         SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
         TabStop = TRUE ;
     };
     FixedText FT_DBFIELD
     {
-        Pos = MAP_APPFONT ( 162 , 71 ) ;
+        Pos = MAP_APPFONT ( 162 , 60 ) ;
         Size = MAP_APPFONT ( 92 , 8 ) ;
         Text = "Datenbank~feld" ;
         Text [ English ] = "Database field" ;
@@ -405,8 +404,8 @@ TabPage TP_ENV_ENV
     ListBox LB_DBFIELD
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 162 , 82 ) ;
-        Size = MAP_APPFONT ( 92 , 12 ) ;
+        Pos = MAP_APPFONT ( 162 , 71 ) ;
+        Size = MAP_APPFONT ( 82 , 12 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
@@ -454,7 +453,7 @@ TabPage TP_ENV_ENV
     Window WIN_PREVIEW
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 170 , 116 ) ;
+        Pos = MAP_APPFONT ( 160 , 116 ) ;
         Size = MAP_APPFONT ( 84 , 63 ) ;
     };
 };
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index fde4110c536b..e2e380502262 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envlop1.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: os $ $Date: 2001-02-21 12:27:33 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -139,7 +139,7 @@ void SwEnvPreview::Paint(const Rectangle &)
 
     float fx = (float) GetOutputSizePixel().Width () / nPageW,
           fy = (float) GetOutputSizePixel().Height() / nPageH,
-          f  = fx < fy ? fx : fy;
+          f  = 0.8 * ( fx < fy ? fx : fy );
 
     // Umschlag
     long   nW = (USHORT) (f * nPageW),
@@ -286,6 +286,7 @@ SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) :
     aTableLB       .SetSelectHdl(LINK(this, SwEnvPage, DatabaseHdl     ));
     aInsertBT      .SetClickHdl (LINK(this, SwEnvPage, FieldHdl        ));
     aSenderBox     .SetClickHdl (LINK(this, SwEnvPage, SenderHdl       ));
+    aPreview.SetBorderStyle( WINDOW_BORDER_MONO );
 
     SwDBData aData = pSh->GetDBData();
     sActDBName = aData.sDataSource;
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index b8a0e1216bf7..a69290dec7ce 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envprt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:35 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,7 +96,8 @@ SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) :
     aDownText    (this, SW_RES(TXT_DOWN   )),
     aDownField   (this, SW_RES(FLD_DOWN   )),
     aPrinterInfo (this, SW_RES(TXT_PRINTER)),
-    aNoNameGroup (this, SW_RES(GRP_NONAME )),
+    aNoNameFL    (this, SW_RES(FL_NONAME )),
+    aPrinterFL   (this, SW_RES(FL_PRINTER )),
     aPrtSetup    (this, SW_RES(BTN_PRTSETUP))
 
 {
@@ -120,7 +121,7 @@ SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) :
     // ToolBox
     Size aSz = aAlignBox.CalcWindowSizePixel();
     aAlignBox.SetSizePixel(aSz);
-    aAlignBox.SetPosPixel(Point(aNoNameGroup.GetPosPixel().X() + (aNoNameGroup.GetSizePixel().Width() - aSz.Width()) / 2, aAlignBox.GetPosPixel().Y()));
+//    aAlignBox.SetPosPixel(Point(aNoNameFL.GetPosPixel().X() + (aNoNameFL.GetSizePixel().Width() - aSz.Width()) / 2, aAlignBox.GetPosPixel().Y()));
     aAlignBox.SetClickHdl(LINK(this, SwEnvPrtPage, AlignHdl));
 
 }
@@ -292,6 +293,9 @@ void SwEnvPrtPage::Reset(const SfxItemSet& rSet)
 // ----------------------------------------------------------------------------
 /*
 $Log: not supported by cvs2svn $
+Revision 1.1.1.1  2000/09/18 17:14:35  hr
+initial import
+
 Revision 1.43  2000/09/18 16:05:25  willem.vandorp
 OpenOffice header added.
 
diff --git a/sw/source/ui/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc
index bf435c393750..d10559310b31 100644
--- a/sw/source/ui/envelp/envprt.hrc
+++ b/sw/source/ui/envelp/envprt.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envprt.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:35 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,8 +76,9 @@
 #define TXT_DOWN      11
 #define FLD_DOWN      12
 #define TXT_PRINTER   13
-#define GRP_NONAME    14
+#define FL_NONAME    14
 #define BTN_PRTSETUP  15
+#define FL_PRINTER    16
 
 // Globale Resourcen ********************************************************
 
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 4eccbe5d1e90..9947d92745be 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envprt.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:35 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,7 +103,8 @@ class SwEnvPrtPage : public SfxTabPage
     FixedText    aDownText;
     MetricField  aDownField;
     FixedInfo    aPrinterInfo;
-    GroupBox     aNoNameGroup;
+    FixedLine    aNoNameFL;
+    FixedLine    aPrinterFL;
     PushButton   aPrtSetup;
 
     Printer* pPrt;
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
index 928f06b5043e..e518cea093c7 100644
--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: envprt.src,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:18:51 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,15 +69,15 @@ TabPage TP_ENV_PRT
     HelpID = HID_ENV_PRT ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     Hide = TRUE ;
-    GroupBox GRP_NONAME
+    FixedLine FL_NONAME
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 123 ) ;
-        Group = TRUE ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Umschlageinzug" ;
     };
     ToolBox BOX_ALIGN
     {
-        Pos = MAP_APPFONT ( 35 , 14 ) ;
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
         ItemList =
         {
             ToolBoxItem
@@ -114,7 +114,7 @@ TabPage TP_ENV_PRT
     };
     RadioButton BTN_TOP
     {
-        Pos = MAP_APPFONT ( 12 , 39 ) ;
+        Pos = MAP_APPFONT ( 18 , 42 ) ;
         Size = MAP_APPFONT ( 179 , 10 ) ;
         Text = "Von ~oben bedrucken" ;
         Text [ ENGLISH ] = "Print upper side" ;
@@ -146,7 +146,7 @@ TabPage TP_ENV_PRT
     };
     RadioButton BTN_BOTTOM
     {
-        Pos = MAP_APPFONT ( 12 , 53 ) ;
+        Pos = MAP_APPFONT ( 18 , 56 ) ;
         Size = MAP_APPFONT ( 179 , 10 ) ;
         Text = "Von ~unten bedrucken" ;
         Text [ ENGLISH ] = "Print lower side" ;
@@ -176,7 +176,7 @@ TabPage TP_ENV_PRT
     };
     FixedText TXT_RIGHT
     {
-        Pos = MAP_APPFONT ( 12 , 69 ) ;
+        Pos = MAP_APPFONT ( 12 , 74 ) ;
         Size = MAP_APPFONT ( 50 , 8 ) ;
         Text = "Nach ~rechts" ;
         Text [ ENGLISH ] = "Shift right" ;
@@ -207,7 +207,7 @@ TabPage TP_ENV_PRT
     MetricField FLD_RIGHT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 67 ) ;
+        Pos = MAP_APPFONT ( 66 , 72 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -223,7 +223,7 @@ TabPage TP_ENV_PRT
     };
     FixedText TXT_DOWN
     {
-        Pos = MAP_APPFONT ( 12 , 85 ) ;
+        Pos = MAP_APPFONT ( 12 , 90 ) ;
         Size = MAP_APPFONT ( 50 , 8 ) ;
         Text = "~Nach unten" ;
         Text [ ENGLISH ] = "Shift down" ;
@@ -254,7 +254,7 @@ TabPage TP_ENV_PRT
     MetricField FLD_DOWN
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 66 , 83 ) ;
+        Pos = MAP_APPFONT ( 66 , 88 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -268,9 +268,15 @@ TabPage TP_ENV_PRT
         Last = 10000 ;
         SpinSize = 10 ;
     };
+    FixedLine FL_PRINTER
+    {
+        Pos = MAP_APPFONT ( 3 , 103 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Aktueller Drucker" ;
+    };
     FixedText TXT_PRINTER
     {
-        Pos = MAP_APPFONT ( 12 , 111 ) ;
+        Pos = MAP_APPFONT ( 12 , 116 ) ;
         Size = MAP_APPFONT ( 179 , 8 ) ;
         Text = "- Kein Drucker installiert -" ;
         Text [ ENGLISH ] = "- No printer installed -" ;
@@ -300,7 +306,7 @@ TabPage TP_ENV_PRT
     };
     PushButton BTN_PRTSETUP
     {
-        Pos = MAP_APPFONT ( 198 , 109 ) ;
+        Pos = MAP_APPFONT ( 198 , 114 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text = "~Einrichten..." ;
         Text [ ENGLISH ] = "Setup..." ;
diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx
index d28342fd4334..2c6be1875a13 100644
--- a/sw/source/ui/inc/break.hxx
+++ b/sw/source/ui/inc/break.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: break.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:38 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:23:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,10 +81,6 @@
 #include <vcl/field.hxx>
 #endif
 
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
 class SwWrtShell;
 
 class SwBreakDlg: public SvxStandardDialog
@@ -97,7 +93,7 @@ class SwBreakDlg: public SvxStandardDialog
     ListBox         aPageCollBox;
     CheckBox        aPageNumBox;
     NumericField    aPageNumEdit;
-    GroupBox        aBreakFrm;
+    FixedLine       aBreakFL;
 
     OKButton        aOkBtn;
     CancelButton    aCancelBtn;
diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx
index e239fbbfb9cc..1f6ceb96987e 100644
--- a/sw/source/ui/inc/drpcps.hxx
+++ b/sw/source/ui/inc/drpcps.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drpcps.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:39 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:23:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,10 +85,6 @@
 #include <vcl/edit.hxx>
 #endif
 
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
@@ -123,16 +119,15 @@ friend class SwDropCapsPict;
     NumericField    aLinesField;
     FixedText       aDistanceText;
     MetricField     aDistanceField;
-    GroupBox        aSettingsGroup;
+    FixedLine       aSettingsFL;
 
     FixedText       aTextText;
     Edit            aTextEdit;
     FixedText       aTemplateText;
     ListBox         aTemplateBox;
-    GroupBox        aContentBox;
+    FixedLine       aContentFL;
 
     SwDropCapsPict  *pPict;
-    GroupBox        aPictBox;
 
     BOOL            bModified;
     BOOL            bFormat;
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index 8deb555def55..b71805e60d21 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmpage.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-05-15 10:02:32 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:23:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,11 +115,12 @@ class SwFrmPage: public SfxTabPage
     CheckBox        aFixedRatioCB;
     CheckBox        aAutoHeightCB;
     PushButton      aRealSizeBT;
-    GroupBox        aSizeGB;
+    FixedLine       aSizeFL;
     BOOL            bWidthLastChanged;
 
     // Anker
-    GroupBox        aTypeGB;
+    FixedLine       aTypeFL;
+    FixedLine       aTypeSepFL;
     RadioButton     aAnchorAtPageRB;
     RadioButton     aAnchorAtParaRB;
     RadioButton     aAnchorAtCharRB;
@@ -140,7 +141,7 @@ class SwFrmPage: public SfxTabPage
     MetricField     aAtVertPosED;
     FixedText       aVertRelationFT;
     ListBox         aVertRelationLB;
-    GroupBox        aPositionGB;
+    FixedLine       aPositionFL;
     BOOL            bAtHorzPosModified;
     BOOL            bAtVertPosModified;
 
@@ -254,7 +255,7 @@ public:
 class SwFrmURLPage : public SfxTabPage
 {
     //Hyperlink
-    GroupBox        aHyperLinkGB;
+    FixedLine       aHyperLinkFL;
     FixedText       aURLFT;
     Edit            aURLED;
     FixedText       aNameFT;
@@ -264,7 +265,7 @@ class SwFrmURLPage : public SfxTabPage
     PushButton      aSearchPB;
 
     //Image map
-    GroupBox        aImageGB;
+    FixedLine       aImageFL;
     CheckBox        aServerCB;
     CheckBox        aClientCB;
 
@@ -294,16 +295,16 @@ class SwFrmAddPage : public SfxTabPage
     Edit        aPrevED;
     FixedText   aNextFT;
     Edit        aNextED;
-    GroupBox    aNamesGB;
+    FixedLine   aNamesFL;
 
     CheckBox    aProtectContentCB;
     CheckBox    aProtectFrameCB;
     CheckBox    aProtectSizeCB;
-    GroupBox    aProtectGB;
+    FixedLine   aProtectFL;
 
     CheckBox    aEditInReadonlyCB;
     CheckBox    aPrintFrameCB;
-    GroupBox    aExtGB;
+    FixedLine   aExtFL;
 
     SwWrtShell* pWrtSh;
 
diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx
index 21229ecdd084..8dccc1c7f323 100644
--- a/sw/source/ui/inc/numpara.hxx
+++ b/sw/source/ui/inc/numpara.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numpara.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:23:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,9 +65,6 @@
 #ifndef _SFXTABDLG_HXX //autogen
 #include <sfx2/tabdlg.hxx>
 #endif
-#ifndef _SV_GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
 #ifndef _SV_LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
@@ -89,15 +86,15 @@
  ---------------------------------------------------------------------------*/
 class SwParagraphNumTabPage : public SfxTabPage
 {
-    GroupBox                aNumberStyleGB;
+    FixedText               aNumberStyleFT;
     ListBox                 aNumberStyleLB;
 
-    GroupBox                aNewStartGB;
+    FixedLine               aNewStartFL;
     TriStateBox             aNewStartCB;
     FixedText               aNewStartFT;
     NumericField            aNewStartNF;
 
-    GroupBox                aCountParaGB;
+    FixedLine               aCountParaFL;
     TriStateBox             aCountParaCB;
     TriStateBox             aRestartParaCountCB;
     FixedText               aRestartFT;
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx
index 3a9cc0f55f95..149aa52f3eaf 100644
--- a/sw/source/ui/inc/wrap.hxx
+++ b/sw/source/ui/inc/wrap.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrap.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:43 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:23:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,10 +73,6 @@
 #include <vcl/imagebtn.hxx>
 #endif
 
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
-
 #ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
 #endif
@@ -118,13 +114,14 @@ class SwWrapTabPage: public SfxTabPage
     ImageRadioButton    aWrapParallelRB;
     ImageRadioButton    aWrapThroughRB;
     ImageRadioButton    aIdealWrapRB;
-    GroupBox            aWrapBoxC;
+    FixedLine           aWrapFLC;
 
     CheckBox            aWrapAnchorOnlyCB;
     CheckBox            aWrapTransparentCB;
     CheckBox            aWrapOutlineCB;
     CheckBox            aWrapOutsideCB;
-    GroupBox            aOptionsGB;
+    FixedLine           aOptionsFL;
+    FixedLine           aOptionsSepFL;
 
     // MARGIN
     FixedText           aLeftMarginFT;
@@ -135,7 +132,7 @@ class SwWrapTabPage: public SfxTabPage
     MetricField         aTopMarginED;
     FixedText           aBottomMarginFT;
     MetricField         aBottomMarginED;
-    GroupBox            aMarginGB;
+    FixedLine           aMarginFL;
 
     ImageList           aWrapIL;