Fix #86988#: Redesign of dialogs

7 files changed, 150 insertions, 250 deletions

diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src
index 8e66e5149258..943ac1dcf8aa 100644
--- a/sw/source/ui/fldui/flddb.src
+++ b/sw/source/ui/fldui/flddb.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: flddb.src,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: fme $ $Date: 2001-05-25 14:40:31 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:37:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -329,8 +329,8 @@ TabPage TP_FLD_DB
     };
     FixedLine FL_DBFORMAT_VERT
     {
-        Pos = MAP_APPFONT ( 87 , 152 ) ;
-        Size = MAP_APPFONT ( 4 , 27 ) ;
+        Pos = MAP_APPFONT ( 87 , 148 ) ;
+        Size = MAP_APPFONT ( 4 , 31 ) ;
     };
     Text [ english_us ] = "Database" ;
     Text [ portuguese_brazilian ] = "Datenbank" ;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index a2e811c82427..c20b80277857 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmpage.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: os $ $Date: 2001-05-15 10:02:09 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:38:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -564,13 +564,14 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     aRelHeightCB    (this, SW_RES(CB_REL_HEIGHT)),
     aAutoHeightCB   (this, SW_RES(CB_AUTOHEIGHT)),
     aFixedRatioCB   (this, SW_RES(CB_FIXEDRATIO)),
-    aSizeGB         (this, SW_RES(GB_SIZE)),
+    aSizeFL         (this, SW_RES(FL_SIZE)),
     aAnchorAtPageRB (this, SW_RES(RB_ANCHOR_PAGE)),
     aAnchorAtParaRB (this, SW_RES(RB_ANCHOR_PARA)),
     aAnchorAtCharRB (this, SW_RES(RB_ANCHOR_AT_CHAR)),
     aAnchorAsCharRB (this, SW_RES(RB_ANCHOR_AS_CHAR)),
     aAnchorAtFrameRB(this, SW_RES(RB_ANCHOR_FRAME)),
-    aTypeGB         (this, SW_RES(GB_TYPE)),
+    aTypeFL        (this, SW_RES(FL_TYPE)),
+    aTypeSepFL     (this, SW_RES(FL_TYPE_SEP)),
 
     aHorizontalFT   (this, SW_RES(FT_HORIZONTAL)),
     aHorizontalDLB  (this, SW_RES(DLB_HORIZONTAL)),
@@ -585,7 +586,7 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     aAtVertPosED    (this, SW_RES(ED_AT_VERT_POS)),
     aVertRelationFT (this, SW_RES(FT_VERT_RELATION)),
     aVertRelationLB (this, SW_RES(LB_VERT_RELATION)),
-    aPositionGB     (this, SW_RES(GB_POSITION)),
+    aPositionFL     (this, SW_RES(FL_POSITION)),
     aRealSizeBT     (this, SW_RES(BT_REALSIZE)),
     aExampleWN      (this, SW_RES(WN_BSP)),
     bFormat(FALSE),
@@ -607,6 +608,8 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     FreeResource();
     SetExchangeSupport();
 
+    aTypeSepFL.SetStyle( aTypeSepFL.GetStyle() | WB_VERT );
+
     Link aLk = LINK(this, SwFrmPage, RangeModifyHdl);
     aWidthED.    SetLoseFocusHdl( aLk );
     aHeightED.   SetLoseFocusHdl( aLk );
@@ -684,7 +687,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
         aAnchorAtCharRB.Enable( FALSE );
         aAnchorAsCharRB.Enable( FALSE );
         aAnchorAtFrameRB.Enable( FALSE );
-        aTypeGB.Enable( FALSE );
+        aTypeFL.Enable( FALSE );
         aFixedRatioCB.Enable(FALSE);
     }
     else if (rAnchor.GetAnchorId() != FLY_AT_FLY && !pSh->IsFlyInFly())
@@ -2092,11 +2095,11 @@ void SwFrmPage::SetFormatUsed(BOOL bFmt)
         aAnchorAsCharRB.Show(FALSE);
         aAnchorAtFrameRB.Show(FALSE);
 
-        Point aSizePos = aSizeGB.GetPosPixel();
-        Size aSizeSize = aSizeGB.GetSizePixel();
-        aSizeSize.Width() = aTypeGB.GetPosPixel().X() +
-                    aTypeGB.GetSizePixel().Width() - aSizePos.X();
-        aSizeGB.SetSizePixel(aSizeSize);
+        Point aSizePos = aSizeFL.GetPosPixel();
+        Size aSizeSize = aSizeFL.GetSizePixel();
+        aSizeSize.Width() = aTypeFL.GetPosPixel().X() +
+                    aTypeFL.GetSizePixel().Width() - aSizePos.X();
+        aSizeFL.SetSizePixel(aSizeSize);
     }
 }
 
@@ -2450,7 +2453,7 @@ BmpWindow::~BmpWindow()
 
 SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
     SfxTabPage(pParent,     SW_RES(TP_FRM_URL), rSet),
-    aHyperLinkGB    (this, SW_RES( GB_HYPERLINK )),
+    aHyperLinkFL    (this, SW_RES( FL_HYPERLINK )),
     aURLFT          (this, SW_RES( FT_URL    )),
     aURLED          (this, SW_RES( ED_URL    )),
     aNameFT         (this, SW_RES( FT_NAME   )),
@@ -2458,7 +2461,7 @@ SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) :
     aFrameFT        (this, SW_RES( FT_FRAME   )),
     aFrameCB        (this, SW_RES( CB_FRAME   )),
     aSearchPB       (this, SW_RES( PB_SEARCH  )),
-    aImageGB        (this, SW_RES( GB_IMAGE   )),
+    aImageFL        (this, SW_RES( FL_IMAGE   )),
     aServerCB       (this, SW_RES( CB_SERVER  )),
     aClientCB       (this, SW_RES( CB_CLIENT  ))
 {
@@ -2623,16 +2626,16 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
     aPrevED            (this, SW_RES(ED_PREV)),
     aNextFT            (this, SW_RES(FT_NEXT)),
     aNextED            (this, SW_RES(ED_NEXT)),
-    aNamesGB           (this, SW_RES(GB_NAME)),
+    aNamesFL           (this, SW_RES(FL_NAME)),
 
     aProtectContentCB  (this, SW_RES(CB_PROTECT_CONTENT)),
     aProtectFrameCB    (this, SW_RES(CB_PROTECT_FRAME)),
     aProtectSizeCB     (this, SW_RES(CB_PROTECT_SIZE)),
-    aProtectGB         (this, SW_RES(GB_PROTECT)),
+    aProtectFL         (this, SW_RES(FL_PROTECT)),
 
     aEditInReadonlyCB  (this, SW_RES(CB_EDIT_IN_READONLY)),
     aPrintFrameCB      (this, SW_RES(CB_PRINT_FRAME)),
-    aExtGB             (this, SW_RES(GB_EXT)),
+    aExtFL             (this, SW_RES(FL_EXT)),
     nDlgType(0),
     pWrtSh(0),
     bFormat(FALSE),
@@ -2675,8 +2678,8 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
         aProtectSizeCB    .Hide();
         aEditInReadonlyCB .Hide();
         aPrintFrameCB     .Hide();
-        aExtGB            .Hide();
-        aProtectGB.Hide();
+        aExtFL            .Hide();
+        aProtectFL.Hide();
     }
     if ( DLG_FRM_GRF == nDlgType || DLG_FRM_OLE == nDlgType )
     {
@@ -2725,7 +2728,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
         aAltNameED.Enable(FALSE);
         aNameFT.Enable( FALSE );
         aAltNameFT.Enable(FALSE);
-        aNamesGB.Enable(FALSE);
+        aNamesFL.Enable(FALSE);
     }
     if(nDlgType == DLG_FRM_STD)
     {
@@ -2861,18 +2864,18 @@ void    SwFrmAddPage::SetFormatUsed(BOOL bFmt)
         aPrevED.Show(FALSE);
         aNextFT.Show(FALSE);
         aNextED.Show(FALSE);
-          aNamesGB.Show(FALSE);
+        aNamesFL.Show(FALSE);
 
-        sal_Int32 nDiff = aExtGB.GetPosPixel().Y() - aNamesGB.GetPosPixel().Y();
+        sal_Int32 nDiff = aExtFL.GetPosPixel().Y() - aNamesFL.GetPosPixel().Y();
 
         lcl_Move(aProtectContentCB, nDiff);
         lcl_Move(aProtectFrameCB, nDiff);
         lcl_Move(aProtectSizeCB, nDiff);
-        lcl_Move(aProtectGB, nDiff);
+        lcl_Move(aProtectFL, nDiff);
 
         lcl_Move(aEditInReadonlyCB, nDiff);
         lcl_Move(aPrintFrameCB, nDiff);
-        lcl_Move(aExtGB, nDiff);
+        lcl_Move(aExtFL, nDiff);
 
     }
 }
diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc
index a276ac0e170c..b58c34a518e3 100644
--- a/sw/source/ui/frmdlg/frmpage.hrc
+++ b/sw/source/ui/frmdlg/frmpage.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmpage.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-02-09 07:49:14 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:38:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,13 +68,13 @@
 
 
 
-#define GB_TYPE                 26
+#define FL_TYPE                 26
 #define FT_WIDTH                27
 #define ED_WIDTH                28
 #define FT_HEIGHT               29
 #define ED_HEIGHT               30
 #define CB_AUTOHEIGHT           31
-#define GB_SIZE                 32
+#define FL_SIZE                 32
 #define FT_HORIZONTAL           33
 #define DLB_HORIZONTAL          34
 #define FT_AT_HORZ_POS          35
@@ -88,7 +88,7 @@
 #define ED_AT_VERT_POS          41
 #define FT_VERT_RELATION        3
 #define LB_VERT_RELATION        4
-#define GB_POSITION             43
+#define FL_POSITION             43
 #define BT_REALSIZE             44
 #define BT_MANUAL               45
 
@@ -110,10 +110,10 @@
 #define RB_MIRROR_LEFT_PAGES    64
 #define RB_MIRROR_RIGHT_PAGES   65
 
-#define GB_HYPERLINK            94
+#define FL_HYPERLINK                    94
 #define FT_FRAME                95
 #define CB_FRAME                96
-#define GB_IMAGE                97
+#define FL_IMAGE                97
 #define CB_SERVER               98
 #define CB_CLIENT               99
 
@@ -132,11 +132,12 @@
 #define ED_PREV                 115
 #define FT_NEXT                 116
 #define ED_NEXT                 117
-#define GB_NAME                 118
+#define FL_NAME                 118
 #define CB_PROTECT_CONTENT      119
 #define CB_PROTECT_FRAME        120
 #define CB_PROTECT_SIZE         121
-#define GB_PROTECT              122
+#define FL_PROTECT              122
 #define CB_EDIT_IN_READONLY     123
 #define CB_PRINT_FRAME          124
-#define GB_EXT                  125
+#define FL_EXT                  125
+#define FL_TYPE_SEP             126
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index 86c53b70fedd..01e66d7f8f75 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: frmpage.src,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:21:25 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:38:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -860,7 +860,7 @@ TabPage TP_FRM_STD
     FixedText FT_WIDTH
     {
         Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Size = MAP_APPFONT ( 50 , 8 ) ;
         Left = TRUE ;
         Text = "~Breite" ;
         Text [ ENGLISH ] = "~Width" ;
@@ -889,7 +889,7 @@ TabPage TP_FRM_STD
     MetricField ED_WIDTH
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 77 , 14 ) ;
+        Pos = MAP_APPFONT ( 65 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Text = "12,99" ;
         TabStop = TRUE ;
@@ -906,8 +906,8 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_REL_WIDTH
     {
-        Pos = MAP_APPFONT ( 12 , 30 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
+        Pos = MAP_APPFONT ( 70 , 30 ) ;
+        Size = MAP_APPFONT ( 40 , 10 ) ;
         TabStop = TRUE ;
         Text = "~Relativ" ;
         Text [ ENGLISH ] = "Relativ" ;
@@ -935,7 +935,7 @@ TabPage TP_FRM_STD
     FixedText FT_HEIGHT
     {
         Pos = MAP_APPFONT ( 12 , 46 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Size = MAP_APPFONT ( 50 , 8 ) ;
         Left = TRUE ;
         Text = "H�h~e" ;
         Text [ ENGLISH ] = "H~eight" ;
@@ -964,7 +964,7 @@ TabPage TP_FRM_STD
     MetricField ED_HEIGHT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 77 , 44 ) ;
+        Pos = MAP_APPFONT ( 65 , 44 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -980,8 +980,8 @@ TabPage TP_FRM_STD
     };
     CheckBox CB_REL_HEIGHT
     {
-        Pos = MAP_APPFONT ( 12 , 60 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
+        Pos = MAP_APPFONT ( 70 , 60 ) ;
+        Size = MAP_APPFONT ( 40 , 10 ) ;
         TabStop = TRUE ;
         Text = "Re~lativ" ;
         Text [ ENGLISH ] = "Relativ" ;
@@ -1011,57 +1011,16 @@ TabPage TP_FRM_STD
         Pos = MAP_APPFONT ( 12 , 74 ) ;
         Size = MAP_APPFONT ( 50, 10 ) ;
         TabStop = TRUE ;
-        Text = "Abglei~ch" ;
+        Text = "Proportionen abgleichen" ;
         Text [ ENGLISH ] = "Fixed ratio" ;
-        Text [ english_us ] = "~Keep ratio" ;
-        Text [ dutch ] = "~Synchroniseren" ;
-        Text [ italian ] = "Proporz." ;
-        Text [ spanish ] = "Prop~orcional" ;
-        Text [ french ] = "~Proportionnel" ;
-        Text [ swedish ] = "pr~oportionellt" ;
-        Text [ danish ] = "Proport." ;
-        Text [ portuguese_brazilian ] = "Abgle~ich" ;
-        Text [ portuguese ] = "Pr~oporcional" ;
-        Text[ chinese_simplified ] = "ͬ����(~K)";
-        Text[ russian ] = "�������������";
-        Text[ polish ] = "Synchronizacja";
-        Text[ japanese ] = "�䗦��ۂ�(~K)";
-        Text[ chinese_traditional ] = "�P�B��(~K)";
-        Text[ arabic ] = "�����";
-        Text[ greek ] = "���������";
-        Text[ korean ] = "���� ����(~K)";
-        Text[ turkish ] = "Orant~�";
-        Text[ catalan ] = "Prop~orcional";
-        Text[ finnish ] = "~Keep ratio";
     };
     CheckBox CB_AUTOHEIGHT
     {
         Pos = MAP_APPFONT ( 12 , 88 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
-        Text = "auto. H~�he" ;
+        Text = "Automatische H�he" ;
         Text [ ENGLISH ] = "auto. Hei~ght" ;
-        Text [ norwegian ] = "auto. Hei~ght" ;
-        Text [ italian ] = "Altezza. ~auto" ;
-        Text [ portuguese_brazilian ] = "Altura autom?tica" ;
-        Text [ portuguese ] = "Altura autom�tica" ;
-        Text [ finnish ] = "~Automaattinen korkeus" ;
-        Text [ danish ] = "Auto. h�jde" ;
-        Text [ french ] = "Hau~teur auto." ;
-        Text [ swedish ] = "auto. h~�jd" ;
-        Text [ dutch ] = "Autom. h~oogte" ;
-        Text [ spanish ] = "Altura auto~m." ;
-        Text [ english_us ] = "AutoHei~ght" ;
-        Text[ chinese_simplified ] = "�Զ��߶�(~G)";
-        Text[ russian ] = "���������� ������";
-        Text[ polish ] = "~Autom. wys.";
-        Text[ japanese ] = "������������(~G)";
-        Text[ chinese_traditional ] = "�۰ʰ���(~G)";
-        Text[ arabic ] = "������ ������";
-        Text[ greek ] = "�������� ����";
-        Text[ korean ] = "�ڵ� ����(~G)";
-        Text[ turkish ] = "otom. ~y�ksekl.";
-        Text[ catalan ] = "Altura auto~m.";
     };
     PushButton BT_REALSIZE
     {
@@ -1093,10 +1052,10 @@ TabPage TP_FRM_STD
         Text[ turkish ] = "�lk b~oyut";
         Text[ catalan ] = "Ta~ma�o original";
     };
-    GroupBox GB_SIZE
+    FixedLine FL_SIZE
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 114 , 98 ) ;
+        Size = MAP_APPFONT ( 104 , 8 ) ;
         Text = "Gr��e" ;
         Text [ ENGLISH ] = "Size" ;
         Text [ norwegian ] = "St�rrelse" ;
@@ -1121,9 +1080,14 @@ TabPage TP_FRM_STD
         Text[ turkish ] = "Boyut";
         Text[ catalan ] = "Tama�o";
     };
+    FixedLine FL_TYPE_SEP
+    {
+        Pos = MAP_APPFONT ( 111 , 10 ) ;
+        Size = MAP_APPFONT ( 4 , 87 ) ;
+    };
     RadioButton RB_ANCHOR_PAGE
     {
-        Pos = MAP_APPFONT ( 132 , 14 ) ;
+        Pos = MAP_APPFONT ( 122 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text = "An ~der Seite" ;
         Text [ ENGLISH ] = "At page" ;
@@ -1150,7 +1114,7 @@ TabPage TP_FRM_STD
     };
     RadioButton RB_ANCHOR_PARA
     {
-        Pos = MAP_APPFONT ( 132 , 28 ) ;
+        Pos = MAP_APPFONT ( 122 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text = "Am Ab~satz" ;
         Text [ ENGLISH ] = "At paragraph" ;
@@ -1177,7 +1141,7 @@ TabPage TP_FRM_STD
     };
     RadioButton RB_ANCHOR_AT_CHAR
     {
-        Pos = MAP_APPFONT ( 132 , 42 ) ;
+        Pos = MAP_APPFONT ( 122 , 42 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text = "Am Zeiche~n" ;
         Text [ ENGLISH ] = "At character" ;
@@ -1204,7 +1168,7 @@ TabPage TP_FRM_STD
     };
     RadioButton RB_ANCHOR_AS_CHAR
     {
-        Pos = MAP_APPFONT ( 132 , 56 ) ;
+        Pos = MAP_APPFONT ( 122 , 56 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text = "Als Ze~ichen" ;
         Text [ ENGLISH ] = "~As character" ;
@@ -1232,7 +1196,7 @@ TabPage TP_FRM_STD
     };
     RadioButton RB_ANCHOR_FRAME
     {
-        Pos = MAP_APPFONT ( 132 , 70 ) ;
+        Pos = MAP_APPFONT ( 122 , 70 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text = "~Am Rahmen" ;
         Text [ ENGLISH ] = "At frame" ;
@@ -1257,10 +1221,10 @@ TabPage TP_FRM_STD
         Text[ catalan ] = "~Al marco";
         Text[ finnish ] = "~Am Rahmen";
     };
-    GroupBox GB_TYPE
+    FixedLine FL_TYPE
     {
-        Pos = MAP_APPFONT ( 126 , 3 ) ;
-        Size = MAP_APPFONT ( 79 , 98 ) ;
+        Pos = MAP_APPFONT ( 116 , 3 ) ;
+        Size = MAP_APPFONT ( 79 , 8 ) ;
         Text = "Verankerung" ;
         Text [ ENGLISH ] = "Type" ;
         Text [ norwegian ] = "Type" ;
@@ -1287,8 +1251,8 @@ TabPage TP_FRM_STD
     };
     Window WN_BSP
     {
-        Pos = MAP_APPFONT ( 212 , 6 ) ;
-        Size = MAP_APPFONT ( 44 , 95 ) ;
+        Pos = MAP_APPFONT ( 202 , 14 ) ;
+        Size = MAP_APPFONT ( 54 , 84 ) ;
     };
     FixedText FT_HORIZONTAL
     {
@@ -1554,10 +1518,10 @@ TabPage TP_FRM_STD
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
-    GroupBox GB_POSITION
+    FixedLine FL_POSITION
     {
         Pos = MAP_APPFONT ( 6 , 104 ) ;
-        Size = MAP_APPFONT ( 248 , 56 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Position" ;
         Text [ ENGLISH ] = "Position" ;
         Text [ norwegian ] = "Posisjon" ;
@@ -1950,7 +1914,7 @@ TabPage TP_FRM_URL
     Edit ED_URL
     {
         Pos = MAP_APPFONT ( 45 , 14 ) ;
-        Size = MAP_APPFONT ( 89 , 12 ) ;
+        Size = MAP_APPFONT ( 151 , 12 ) ;
         Left = TRUE ;
         Border = TRUE ;
     };
@@ -1984,7 +1948,7 @@ TabPage TP_FRM_URL
     Edit ED_NAME
     {
         Pos = MAP_APPFONT ( 45 , 30 ) ;
-        Size = MAP_APPFONT ( 89 , 12 ) ;
+        Size = MAP_APPFONT ( 151 , 12 ) ;
         Left = TRUE ;
         Border = TRUE ;
     };
@@ -2025,7 +1989,7 @@ TabPage TP_FRM_URL
     };
     PushButton PB_SEARCH
     {
-        Pos = MAP_APPFONT ( 140 , 13 ) ;
+        Pos = MAP_APPFONT ( 200 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         Text = "A~usw�hlen..." ;
@@ -2051,91 +2015,30 @@ TabPage TP_FRM_URL
         Text[ catalan ] = "Selecc~ionar...";
         Text[ finnish ] = "~Selaa";
     };
-    GroupBox GB_HYPERLINK
+    FixedLine FL_HYPERLINK
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 190 , 58 ) ;
-        Text = "Hyperlink" ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Link zu" ;
         Text [ ENGLISH ] = "Hyperlink" ;
-        Text [ english_us ] = "Hyperlink" ;
-        Text [ italian ] = "Hyperlink" ;
-        Text [ spanish ] = "Hiperenlace" ;
-        Text [ french ] = "Hyperlien" ;
-        Text [ dutch ] = "Hyperlink" ;
-        Text [ swedish ] = "Hyperl�nk" ;
-        Text [ danish ] = "Hyperlink" ;
-        Text [ portuguese_brazilian ] = "Hyperlink" ;
-        Text [ portuguese ] = "Hiperliga��o" ;
-        Text[ chinese_simplified ] = "������";
-        Text[ russian ] = "�����������";
-        Text[ polish ] = "Hiper��cze";
-        Text[ japanese ] = "ʲ�߰�ݸ";
-        Text[ chinese_traditional ] = "�W���|";
-        Text[ arabic ] = "������ �����";
-        Text[ greek ] = "����-�������";
-        Text[ korean ] = "�����۸�ũ";
-        Text[ turkish ] = "Hyperlink";
-        Text[ catalan ] = "Hiperenlace";
-        Text[ finnish ] = "Hyperlinkki";
     };
     CheckBox CB_SERVER
     {
-        Pos = MAP_APPFONT ( 208 , 14 ) ;
-        Size = MAP_APPFONT ( 44 , 10 ) ;
-        Text = "~Server" ;
-        Text [ ENGLISH ] = "Server" ;
-        Text [ english_us ] = "~Server" ;
-        Text [ italian ] = "~Server" ;
-        Text [ spanish ] = "~Servidor" ;
-        Text [ french ] = "~Serveur" ;
-        Text [ dutch ] = "~Server" ;
-        Text [ swedish ] = "~Server" ;
-        Text [ danish ] = "Server" ;
-        Text [ portuguese_brazilian ] = "~Server" ;
-        Text [ portuguese ] = "~Servidor" ;
-        Text[ chinese_simplified ] = "������(~S)";
-        Text[ russian ] = "������";
-        Text[ polish ] = "Serwer";
-        Text[ japanese ] = "���ް(~S)";
-        Text[ chinese_traditional ] = "���A��(~S)";
-        Text[ arabic ] = "�������";
-        Text[ greek ] = "�����������";
-        Text[ korean ] = "����(~S)";
-        Text[ turkish ] = "~Sunucu";
-        Text[ catalan ] = "~Servidor";
-        Text[ finnish ] = "~Palvelin";
+        Pos = MAP_APPFONT ( 12 , 72 ) ;
+        Size = MAP_APPFONT ( 200 , 10 ) ;
+        Text = "~Server Site Image Map" ;
     };
     CheckBox CB_CLIENT
     {
-        Pos = MAP_APPFONT ( 208 , 28 ) ;
-        Size = MAP_APPFONT ( 44 , 10 ) ;
-        Text = "~Client" ;
+        Pos = MAP_APPFONT ( 12 , 86 ) ;
+        Size = MAP_APPFONT ( 200 , 10 ) ;
+        Text = "~Client Site Image Map" ;
         Text [ ENGLISH ] = "Client" ;
-        Text [ dutch ] = "~Cli�nt" ;
-        Text [ english_us ] = "~Client" ;
-        Text [ italian ] = "~Client" ;
-        Text [ spanish ] = "~Cliente" ;
-        Text [ french ] = "~Client" ;
-        Text [ swedish ] = "~Klient" ;
-        Text [ danish ] = "Klient" ;
-        Text [ portuguese ] = "~Cliente" ;
-        Text [ portuguese_brazilian ] = "~Client" ;
-        Text[ chinese_simplified ] = "�ͻ���(~C)";
-        Text[ russian ] = "������";
-        Text[ polish ] = "Klient";
-        Text[ japanese ] = "�ײ���(~C)";
-        Text[ chinese_traditional ] = "���(~C)";
-        Text[ arabic ] = "������";
-        Text[ greek ] = "�������";
-        Text[ korean ] = "Ŭ���̾�Ʈ(~C)";
-        Text[ turkish ] = "~�stemci";
-        Text[ catalan ] = "~Cliente";
-        Text[ finnish ] = "~Ty�asema";
-    };
-    GroupBox GB_IMAGE
-    {
-        Pos = MAP_APPFONT ( 202 , 3 ) ;
-        Size = MAP_APPFONT ( 52 , 58 ) ;
+    };
+    FixedLine FL_IMAGE
+    {
+        Pos = MAP_APPFONT ( 6 , 61 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Image Map" ;
         Text [ ENGLISH ] = "Image Map" ;
         Text [ dutch ] = "Image Map" ;
@@ -2305,10 +2208,10 @@ TabPage TP_FRM_ADD
         TabStop = TRUE ;
         ReadOnly = TRUE ;
     };
-    GroupBox GB_NAME
+    FixedLine FL_NAME
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 74 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Namen" ;
         Text [ English ] = "Names" ;
         Text [ english_us ] = "Names" ;
@@ -2416,10 +2319,10 @@ TabPage TP_FRM_ADD
         Text[ catalan ] = "~Tama�o";
         Text[ finnish ] = "~Koko";
     };
-    GroupBox GB_PROTECT
+    FixedLine FL_PROTECT
     {
         Pos = MAP_APPFONT ( 6 , 80 ) ;
-        Size = MAP_APPFONT ( 62 , 53 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Sch�tzen" ;
         Text [ English ] = "Protect" ;
         Text [ english_us ] = "Protect" ;
@@ -2445,7 +2348,7 @@ TabPage TP_FRM_ADD
     };
     CheckBox CB_EDIT_IN_READONLY
     {
-        Pos = MAP_APPFONT ( 80 , 91 ) ;
+        Pos = MAP_APPFONT ( 12 , 143 ) ;
         Size = MAP_APPFONT ( 162 , 10 ) ;
         Text = "~Editierbar in schreibgesch�tztem Dokument" ;
         Text [ ENGLISH ] = "Edit in readonly Document" ;
@@ -2472,7 +2375,7 @@ TabPage TP_FRM_ADD
     };
     CheckBox CB_PRINT_FRAME
     {
-        Pos = MAP_APPFONT ( 80 , 105 ) ;
+        Pos = MAP_APPFONT ( 12 , 157 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text = "Dru~cken" ;
         Text [ ENGLISH ] = "Print ~frame" ;
@@ -2498,31 +2401,11 @@ TabPage TP_FRM_ADD
         Text[ turkish ] = "~Yazd�r";
         Text[ catalan ] = "Im~primir";
     };
-    GroupBox GB_EXT
+    FixedLine FL_EXT
     {
-        Pos = MAP_APPFONT ( 74 , 80 ) ;
-        Size = MAP_APPFONT ( 180 , 53 ) ;
-        Text = "Zus�tze" ;
+        Pos = MAP_APPFONT ( 6 , 132 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Eigenschaften" ;
         Text [ ENGLISH ] = "Additional Setting" ;
-        Text [ english_us ] = "Options" ;
-        Text [ italian ] = "Extra" ;
-        Text [ spanish ] = "Opciones" ;
-        Text [ french ] = "Options" ;
-        Text [ dutch ] = "Overige" ;
-        Text [ swedish ] = "Till�gg" ;
-        Text [ danish ] = "Indstillinger" ;
-        Text [ portuguese_brazilian ] = "Zus?tze" ;
-        Text [ portuguese ] = "Op��es" ;
-        Text[ chinese_simplified ] = "����";
-        Text[ russian ] = "���������";
-        Text[ polish ] = "Dodatki";
-        Text[ japanese ] = "��߼��";
-        Text[ chinese_traditional ] = "��L";
-        Text[ arabic ] = "������";
-        Text[ greek ] = "��������";
-        Text[ korean ] = "�ɼ�";
-        Text[ turkish ] = "Se�enekler";
-        Text[ catalan ] = "Opciones";
-        Text[ finnish ] = "Asetukset";
     };
 };
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index a817643ad563..45f8709dcb41 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrap.cxx,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:38:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -151,7 +151,7 @@ SwWrapDlg::~SwWrapDlg()
 SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
     SfxTabPage(pParent, SW_RES(TP_FRM_WRAP), rSet),
 
-    aWrapBoxC           (this, SW_RES(C_WRAP_BOX)),
+    aWrapFLC           (this, SW_RES(C_WRAP_FL)),
     aNoWrapRB           (this, SW_RES(RB_NO_WRAP)),
     aWrapLeftRB         (this, SW_RES(RB_WRAP_LEFT)),
     aWrapRightRB        (this, SW_RES(RB_WRAP_RIGHT)),
@@ -162,7 +162,8 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
     aWrapTransparentCB  (this, SW_RES(CB_TRANSPARENT)),
     aWrapOutlineCB      (this, SW_RES(CB_OUTLINE)),
     aWrapOutsideCB      (this, SW_RES(CB_ONLYOUTSIDE)),
-    aOptionsGB          (this, SW_RES(GB_OPTION)),
+    aOptionsFL          (this, SW_RES(FL_OPTION)),
+    aOptionsSepFL       (this, SW_RES(FL_OPTION_SEP)),
     aLeftMarginFT       (this, SW_RES(FT_LEFT_MARGIN)),
     aLeftMarginED       (this, SW_RES(ED_LEFT_MARGIN)),
     aRightMarginFT      (this, SW_RES(FT_RIGHT_MARGIN)),
@@ -171,7 +172,7 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
     aTopMarginED        (this, SW_RES(ED_TOP_MARGIN)),
     aBottomMarginFT     (this, SW_RES(FT_BOTTOM_MARGIN)),
     aBottomMarginED     (this, SW_RES(ED_BOTTOM_MARGIN)),
-    aMarginGB           (this, SW_RES(GB_MARGIN)),
+    aMarginFL           (this, SW_RES(FL_MARGIN)),
 
     aWrapIL             (SW_RES(IL_WRAP)),
     nHtmlMode(0),
@@ -184,6 +185,7 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
     FreeResource();
     SetExchangeSupport();
 
+    aOptionsSepFL.SetStyle( aOptionsSepFL.GetStyle() | WB_VERT );
 
     Link aLk = LINK(this, SwWrapTabPage, RangeModifyHdl);
     aLeftMarginED.SetUpHdl(aLk);
@@ -782,6 +784,9 @@ USHORT* SwWrapTabPage::GetRanges()
 /*--------------------------------------------------------------------
 
    $Log: not supported by cvs2svn $
+   Revision 1.1.1.1  2000/09/18 17:14:38  hr
+   initial import
+
    Revision 1.61  2000/09/18 16:05:35  willem.vandorp
    OpenOffice header added.
 
diff --git a/sw/source/ui/frmdlg/wrap.hrc b/sw/source/ui/frmdlg/wrap.hrc
index ffa36adfc834..7108631650a3 100644
--- a/sw/source/ui/frmdlg/wrap.hrc
+++ b/sw/source/ui/frmdlg/wrap.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrap.hrc,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:38:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,12 +73,13 @@
 #define ED_TOP_MARGIN       18
 #define ED_BOTTOM_MARGIN    19
 #define FT_BOTTOM_MARGIN    20
-#define GB_MARGIN           21
+#define FL_MARGIN                       21
 #define CB_TRANSPARENT      22
 #define CB_OUTLINE          23
-#define GB_OPTION           24
+#define FL_OPTION                       24
 #define CB_ONLYOUTSIDE      25
-#define C_WRAP_BOX          31
+#define FL_OPTION_SEP                       26
+#define C_WRAP_FL                      31
 
 #define IL_WRAP             32
 // nur fuer die ImageList
diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src
index 48bcff138334..d9b726034821 100644
--- a/sw/source/ui/frmdlg/wrap.src
+++ b/sw/source/ui/frmdlg/wrap.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrap.src,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:27:54 $
+ *  last change: $Author: fme $ $Date: 2001-05-30 16:38:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,14 +70,15 @@ TabPage TP_FRM_WRAP
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     Hide = TRUE;
-    GroupBox C_WRAP_BOX
+    FixedLine C_WRAP_FL
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 48 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text="Vorgaben";
     };
     ImageRadioButton RB_NO_WRAP
     {
-        Pos = MAP_APPFONT ( 9 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 37 , 37 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Kein : ~Keiner */
         /* ### ACHTUNG: Neuer Text in Resource? ~Kein : ~Keiner */
@@ -109,7 +110,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_LEFT
     {
-        Pos = MAP_APPFONT ( 50 , 10 ) ;
+        Pos = MAP_APPFONT ( 53 , 14 ) ;
         Size = MAP_APPFONT ( 37 , 37 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Links : Links */
         /* ### ACHTUNG: Neuer Text in Resource? ~Links : Links */
@@ -140,7 +141,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_RIGHT
     {
-        Pos = MAP_APPFONT ( 91 , 10 ) ;
+        Pos = MAP_APPFONT ( 94 , 14 ) ;
         Size = MAP_APPFONT ( 37 , 37 ) ;
         Text = "~Rechts" ;
         Text [ ENGLISH ] = "~Right" ;
@@ -168,7 +169,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_PARALLEL
     {
-        Pos = MAP_APPFONT ( 132 , 10 ) ;
+        Pos = MAP_APPFONT ( 135 , 14 ) ;
         Size = MAP_APPFONT ( 37 , 37 ) ;
         Text = "~Parallel" ;
         Text [ ENGLISH ] = "~Parallel" ;
@@ -196,7 +197,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_THROUGH
     {
-        Pos = MAP_APPFONT ( 173 , 10 ) ;
+        Pos = MAP_APPFONT ( 176 , 14 ) ;
         Size = MAP_APPFONT ( 37 , 37 ) ;
         Text = "~Durchlauf" ;
         Text [ ENGLISH ] = "Wrap ~through" ;
@@ -225,7 +226,7 @@ TabPage TP_FRM_WRAP
     };
     ImageRadioButton RB_WRAP_IDEAL
     {
-        Pos = MAP_APPFONT ( 214 , 10 ) ;
+        Pos = MAP_APPFONT ( 217 , 14 ) ;
         Size = MAP_APPFONT ( 37 , 37 ) ;
         Text = "D~ynamisch" ;
         Text [ ENGLISH ] = "D~ynamic Wrap" ;
@@ -251,9 +252,10 @@ TabPage TP_FRM_WRAP
         Text[ catalan ] = "Din�~mico";
         Text[ finnish ] = "~Optimaalinen";
     };
+
     CheckBox CB_ANCHOR_ONLY
     {
-        Pos = MAP_APPFONT ( 12 , 65 ) ;
+        Pos = MAP_APPFONT ( 139 , 65 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "Er~ster Absatz" ;
         Text [ ENGLISH ] = "First paragraph only" ;
@@ -280,7 +282,7 @@ TabPage TP_FRM_WRAP
     };
     CheckBox CB_TRANSPARENT
     {
-        Pos = MAP_APPFONT ( 12 , 79 ) ;
+        Pos = MAP_APPFONT ( 139 , 79 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "Im Hin~tergrund" ;
         Text [ ENGLISH ] = "To background" ;
@@ -307,7 +309,7 @@ TabPage TP_FRM_WRAP
     };
     CheckBox CB_OUTLINE
     {
-        Pos = MAP_APPFONT ( 12 , 93 ) ;
+        Pos = MAP_APPFONT ( 139 , 93 ) ;
         Size = MAP_APPFONT ( 109 , 10 ) ;
         Text = "Kont~ur" ;
         Text [ ENGLISH ] = "Contou~r" ;
@@ -335,7 +337,7 @@ TabPage TP_FRM_WRAP
     };
     CheckBox CB_ONLYOUTSIDE
     {
-        Pos = MAP_APPFONT ( 18 , 107 ) ;
+        Pos = MAP_APPFONT ( 139 , 107 ) ;
         Size = MAP_APPFONT ( 99 , 10 ) ;
         Text = "~Nur au�en" ;
         Text [ ENGLISH ] = "Only outside" ;
@@ -361,10 +363,10 @@ TabPage TP_FRM_WRAP
         Text[ catalan ] = "Solo en el exterior";
         Text[ finnish ] = "Vain ulkopuoli";
     };
-    GroupBox GB_OPTION
+    FixedLine FL_OPTION
     {
-        Pos = MAP_APPFONT ( 6 , 54 ) ;
-        Size = MAP_APPFONT ( 121 , 71 ) ;
+        Pos = MAP_APPFONT ( 133 , 54 ) ;
+        Size = MAP_APPFONT ( 121 , 8 ) ;
         Text = "Optionen" ;
         Text [ ENGLISH ] = "Options" ;
         Text [ dutch ] = "Opties" ;
@@ -388,9 +390,14 @@ TabPage TP_FRM_WRAP
         Text[ catalan ] = "Opciones";
         Text[ finnish ] = "Asetukset";
     };
+    FixedLine FL_OPTION_SEP
+    {
+        Pos = MAP_APPFONT ( 128 , 61 ) ;
+        Size = MAP_APPFONT ( 4 , 64 ) ;
+    };
     FixedText FT_LEFT_MARGIN
     {
-        Pos = MAP_APPFONT ( 139 , 66 ) ;
+        Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text = "L~inks" ;
         Text [ ENGLISH ] = "~Left" ;
@@ -420,7 +427,7 @@ TabPage TP_FRM_WRAP
     MetricField ED_LEFT_MARGIN
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 208 , 65 ) ;
+        Pos = MAP_APPFONT ( 81 , 65 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -434,7 +441,7 @@ TabPage TP_FRM_WRAP
     };
     FixedText FT_RIGHT_MARGIN
     {
-        Pos = MAP_APPFONT ( 139 , 81 ) ;
+        Pos = MAP_APPFONT ( 12 , 81 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text = "Re~chts" ;
         Text [ ENGLISH ] = "~Right" ;
@@ -464,7 +471,7 @@ TabPage TP_FRM_WRAP
     MetricField ED_RIGHT_MARGIN
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 208 , 80 ) ;
+        Pos = MAP_APPFONT ( 81 , 80 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -478,7 +485,7 @@ TabPage TP_FRM_WRAP
     };
     FixedText FT_TOP_MARGIN
     {
-        Pos = MAP_APPFONT ( 139 , 96 ) ;
+        Pos = MAP_APPFONT ( 12 , 96 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text = "O~ben" ;
         Text [ ENGLISH ] = "~Top" ;
@@ -508,7 +515,7 @@ TabPage TP_FRM_WRAP
     MetricField ED_TOP_MARGIN
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 208 , 95 ) ;
+        Pos = MAP_APPFONT ( 81 , 95 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -522,7 +529,7 @@ TabPage TP_FRM_WRAP
     };
     FixedText FT_BOTTOM_MARGIN
     {
-        Pos = MAP_APPFONT ( 139 , 111 ) ;
+        Pos = MAP_APPFONT ( 12 , 111 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text = "Unt~en" ;
         Text [ ENGLISH ] = "~Bottom" ;
@@ -552,7 +559,7 @@ TabPage TP_FRM_WRAP
     MetricField ED_BOTTOM_MARGIN
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 208 , 110 ) ;
+        Pos = MAP_APPFONT ( 81 , 110 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -564,10 +571,10 @@ TabPage TP_FRM_WRAP
         Last = 9999 ;
         SpinSize = 10 ;
     };
-    GroupBox GB_MARGIN
+    FixedLine FL_MARGIN
     {
-        Pos = MAP_APPFONT ( 133 , 54 ) ;
-        Size = MAP_APPFONT ( 121 , 71 ) ;
+        Pos = MAP_APPFONT ( 6 , 54 ) ;
+        Size = MAP_APPFONT ( 121 , 8 ) ;
         Text = "Abst�nde" ;
         Text [ ENGLISH ] = "Margins" ;
         Text [ norwegian ] = "Margins" ;