layout changed

3 files changed, 274 insertions, 272 deletions

diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index dc7fa714522e..a6034badfe76 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hdft.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2000-10-24 12:20:14 $
+ *  last change: $Author: ma $ $Date: 2001-03-26 11:39:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -203,9 +203,9 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U
     aRMLbl          ( this, ResId( FT_RMARGIN ) ),
     aRMEdit         ( this, ResId( ED_RMARGIN ) ),
     aCntSharedBox   ( this, ResId( CB_SHARED ) ),
-    aFrm            ( this, ResId( GB_FRAME ) ),
+    aFrm            ( this, ResId( FL_FRAME ) ),
     aBspWin         ( this, ResId( WN_BSP ) ),
-    aBspFrm         ( this, ResId( GB_BSP ) ),
+    aBspFrm         ( this, ResId( FL_BSP ) ),
     aBackgroundBtn  ( this, ResId( BTN_EXTRAS ) ),
 
     pBBSet                      ( NULL ),
diff --git a/svx/source/dialog/hdft.hrc b/svx/source/dialog/hdft.hrc
index 001f87e59813..14d1a181d0e9 100644
--- a/svx/source/dialog/hdft.hrc
+++ b/svx/source/dialog/hdft.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hdft.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:08 $
+ *  last change: $Author: ma $ $Date: 2001-03-26 11:39:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,10 +74,10 @@
 #define FT_RMARGIN      18
 #define ED_RMARGIN      19
 #define CB_SHARED       20
-#define GB_FRAME        21
+#define FL_FRAME        21
 
 #define WN_BSP          30
-#define GB_BSP          31
+#define FL_BSP          31
 
 #define BTN_EXTRAS      40
 
diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src
index cbdf66beadf6..dbf6efd0514e 100644
--- a/svx/source/dialog/hdft.src
+++ b/svx/source/dialog/hdft.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hdft.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: kz $ $Date: 2001-03-09 20:48:45 $
+ *  last change: $Author: ma $ $Date: 2001-03-26 11:39:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,7 +85,7 @@ TabPage RID_SVXPAGE_HEADER
     Size = MAP_APPFONT ( 260 , 185 ) ;
     CheckBox CB_TURNON
     {
-        Pos = MAP_APPFONT ( 12 , 15 ) ;
+        Pos = MAP_APPFONT ( 7 , 14 ) ;
         Size = MAP_APPFONT ( 145 , 10 ) ;
         Text = "~Kopfzeile einschalten" ;
         Text [ ENGLISH ] = "~Turn on header" ;
@@ -111,9 +111,126 @@ TabPage RID_SVXPAGE_HEADER
         Text[ turkish ] = "~�stbilgi olu�tur";
         Text[ language_user1 ] = " ";
     };
+    CheckBox CB_SHARED
+    {
+        Pos = MAP_APPFONT ( 7 , 31 ) ;
+        Size = MAP_APPFONT ( 145 , 10 ) ;
+        Text = "~Inhalt links/rechts gleich" ;
+        Text [ ENGLISH ] = "Same ~content left/right" ;
+        Text [ norwegian ] = "Same ~content left/right" ;
+        Text [ italian ] = "~Contenuto uguale destra/sinistra" ;
+        Text [ portuguese_brazilian ] = "Mesmo ~conte�do esquerda/direita" ;
+        Text [ portuguese ] = "Mesmo ~conte�do esquerda/direita" ;
+        Text [ finnish ] = "Sama ~sis�lt� vasemmalla/oikealla" ;
+        Text [ danish ] = "Ens indhold venstre/h�jre" ;
+        Text [ french ] = "~Contenu identique gauche/droite" ;
+        Text [ swedish ] = "Samma ~inneh�ll h�ger/v�nster" ;
+        Text [ dutch ] = "Links/rechts dezelfde ~inhoud" ;
+        Text [ spanish ] = "~Contenido a la izquierda/derecha igual" ;
+        Text [ english_us ] = "Same ~content left/right" ;
+        Text[ chinese_simplified ] = "����������ͬ(~C)";
+        Text[ russian ] = "���������� ���������� �����/������";
+        Text[ polish ] = "Zawarto~�� z lewej i z prawej jest taka sama";
+        Text[ japanese ] = "���E�߰�ޓ��ꍀ��(~C)";
+        Text[ chinese_traditional ] = "���e���k�ۦP(~C)";
+        Text[ arabic ] = "��� ��������� ��� ������/������";
+        Text[ greek ] = "���� ����������� ��������/�����";
+        Text[ korean ] = "���� ����/������ ����(~C)";
+        Text[ turkish ] = "Sol/sa� i�erik ay~n�";
+        Text[ language_user1 ] = " ";
+    };
+    FixedText FT_LMARGIN
+    {
+        Pos = MAP_APPFONT ( 7 , 50 ) ;
+        Size = MAP_APPFONT ( 102 , 8 ) ;
+        Text = "~Linker Rand" ;
+        Text [ ENGLISH ] = "~Left Margin" ;
+        Text [ norwegian ] = "~Left Margin" ;
+        Text [ italian ] = "Margine sinistro" ;
+        Text [ portuguese_brazilian ] = "~Cabe�alho da Margem Esquerda" ;
+        Text [ portuguese ] = "Margem ~esquerda" ;
+        Text [ finnish ] = "~Vasemman reunan yl�teksti" ;
+        Text [ danish ] = "Venstre margen" ;
+        Text [ french ] = "Marge ~gauche" ;
+        Text [ swedish ] = "V�nstermargina~l" ;
+        Text [ dutch ] = "~Linker marge" ;
+        Text [ spanish ] = "Margen ~izquierdo" ;
+        Text [ english_us ] = "~Left margin" ;
+        Left = TRUE ;
+        Text[ chinese_simplified ] = "��ҳ�߾�(~L)";
+        Text[ russian ] = "���� �����";
+        Text[ polish ] = "Lewy margines";
+        Text[ japanese ] = "���]��(~L)";
+        Text[ chinese_traditional ] = "����ť�(~L)";
+        Text[ arabic ] = "������ ������";
+        Text[ greek ] = "�������� ���������";
+        Text[ korean ] = "���� ����(~L)";
+        Text[ turkish ] = "S~ol kenar";
+        Text[ language_user1 ] = " ";
+    };
+    MetricField ED_LMARGIN
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 117 , 48 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Left = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Maximum = 9999 ;
+        Minimum = 0 ;
+        DecimalDigits = 2 ;
+        Unit = FUNIT_CM ;
+        Last = 9999 ;
+        SpinSize = 10 ;
+    };
+    FixedText FT_RMARGIN
+    {
+        Pos = MAP_APPFONT ( 7 , 66 ) ;
+        Size = MAP_APPFONT ( 102 , 8 ) ;
+        Text = "~Rechter Rand" ;
+        Text [ ENGLISH ] = "R~ight Margin" ;
+        Text [ norwegian ] = "R~ight Margin" ;
+        Text [ italian ] = "~Margine destro" ;
+        Text [ portuguese_brazilian ] = "Margem Direita Cabe�alho" ;
+        Text [ portuguese ] = "Margem ~direita" ;
+        Text [ finnish ] = "~Oikean reunan yl�teksti" ;
+        Text [ danish ] = "H�jre margen" ;
+        Text [ french ] = "Marge ~droite" ;
+        Text [ swedish ] = "H�ge~rmarginal" ;
+        Text [ dutch ] = "~Rechter marge" ;
+        Text [ spanish ] = "Margen ~derecho" ;
+        Text [ english_us ] = "R~ight margin" ;
+        Left = TRUE ;
+        Text[ chinese_simplified ] = "�ҷ�ҳ�߾�(~I)";
+        Text[ russian ] = "���� ������";
+        Text[ polish ] = "Prawy margines";
+        Text[ japanese ] = "�E�]��(~I)";
+        Text[ chinese_traditional ] = "�k��ť�(~I)";
+        Text[ arabic ] = "������ ������";
+        Text[ greek ] = "����� ���������";
+        Text[ korean ] = "������ ����(~I)";
+        Text[ turkish ] = "~Sa� kenar";
+        Text[ language_user1 ] = " ";
+    };
+    MetricField ED_RMARGIN
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 117 , 64 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Left = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        Maximum = 9999 ;
+        DecimalDigits = 2 ;
+        Unit = FUNIT_CM ;
+        Last = 9999 ;
+        SpinSize = 10 ;
+    };
+
     FixedText FT_DIST
     {
-        Pos = MAP_APPFONT ( 12 , 31 ) ;
+        Pos = MAP_APPFONT ( 7 , 85 ) ;
         Size = MAP_APPFONT ( 102 , 8 ) ;
         Text = "A~bstand" ;
         Text [ English ] = "~Distance" ;
@@ -141,7 +258,7 @@ TabPage RID_SVXPAGE_HEADER
     {
         Disable = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 30 ) ;
+        Pos = MAP_APPFONT ( 117 , 83 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -154,7 +271,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     FixedText FT_HEIGHT
     {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
+        Pos = MAP_APPFONT ( 7 , 101 ) ;
         Size = MAP_APPFONT ( 102 , 8 ) ;
         Text = "~H�he" ;
         Text [ ENGLISH ] = "~Height" ;
@@ -182,7 +299,7 @@ TabPage RID_SVXPAGE_HEADER
     {
         Disable = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 45 ) ;
+        Pos = MAP_APPFONT ( 117 , 99 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -197,7 +314,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     CheckBox CB_HEIGHT_DYN
     {
-        Pos = MAP_APPFONT ( 12 , 63 ) ;
+        Pos = MAP_APPFONT ( 7 , 115 ) ;
         Size = MAP_APPFONT ( 145 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? H�he ~dynamisch anpassen : H�he ~dynamisch anpassen */
         /* ### ACHTUNG: Neuer Text in Resource? H�he ~dynamisch anpassen : H�he ~dynamisch anpassen */
@@ -223,126 +340,10 @@ TabPage RID_SVXPAGE_HEADER
         Text[ turkish ] = "Y�ksekli�i oto~matik olarak ayarla";
         Text[ language_user1 ] = " ";
     };
-    FixedText FT_LMARGIN
-    {
-        Pos = MAP_APPFONT ( 12 , 80 ) ;
-        Size = MAP_APPFONT ( 102 , 8 ) ;
-        Text = "~Linker Rand" ;
-        Text [ ENGLISH ] = "~Left Margin" ;
-        Text [ norwegian ] = "~Left Margin" ;
-        Text [ italian ] = "Margine sinistro" ;
-        Text [ portuguese_brazilian ] = "~Cabe�alho da Margem Esquerda" ;
-        Text [ portuguese ] = "Margem ~esquerda" ;
-        Text [ finnish ] = "~Vasemman reunan yl�teksti" ;
-        Text [ danish ] = "Venstre margen" ;
-        Text [ french ] = "Marge ~gauche" ;
-        Text [ swedish ] = "V�nstermargina~l" ;
-        Text [ dutch ] = "~Linker marge" ;
-        Text [ spanish ] = "Margen ~izquierdo" ;
-        Text [ english_us ] = "~Left margin" ;
-        Left = TRUE ;
-        Text[ chinese_simplified ] = "��ҳ�߾�(~L)";
-        Text[ russian ] = "���� �����";
-        Text[ polish ] = "Lewy margines";
-        Text[ japanese ] = "���]��(~L)";
-        Text[ chinese_traditional ] = "����ť�(~L)";
-        Text[ arabic ] = "������ ������";
-        Text[ greek ] = "�������� ���������";
-        Text[ korean ] = "���� ����(~L)";
-        Text[ turkish ] = "S~ol kenar";
-        Text[ language_user1 ] = " ";
-    };
-    MetricField ED_LMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 79 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Maximum = 9999 ;
-        Minimum = 0 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    FixedText FT_RMARGIN
-    {
-        Pos = MAP_APPFONT ( 12 , 95 ) ;
-        Size = MAP_APPFONT ( 102 , 8 ) ;
-        Text = "~Rechter Rand" ;
-        Text [ ENGLISH ] = "R~ight Margin" ;
-        Text [ norwegian ] = "R~ight Margin" ;
-        Text [ italian ] = "~Margine destro" ;
-        Text [ portuguese_brazilian ] = "Margem Direita Cabe�alho" ;
-        Text [ portuguese ] = "Margem ~direita" ;
-        Text [ finnish ] = "~Oikean reunan yl�teksti" ;
-        Text [ danish ] = "H�jre margen" ;
-        Text [ french ] = "Marge ~droite" ;
-        Text [ swedish ] = "H�ge~rmarginal" ;
-        Text [ dutch ] = "~Rechter marge" ;
-        Text [ spanish ] = "Margen ~derecho" ;
-        Text [ english_us ] = "R~ight margin" ;
-        Left = TRUE ;
-        Text[ chinese_simplified ] = "�ҷ�ҳ�߾�(~I)";
-        Text[ russian ] = "���� ������";
-        Text[ polish ] = "Prawy margines";
-        Text[ japanese ] = "�E�]��(~I)";
-        Text[ chinese_traditional ] = "�k��ť�(~I)";
-        Text[ arabic ] = "������ ������";
-        Text[ greek ] = "����� ���������";
-        Text[ korean ] = "������ ����(~I)";
-        Text[ turkish ] = "~Sa� kenar";
-        Text[ language_user1 ] = " ";
-    };
-    MetricField ED_RMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 94 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    CheckBox CB_SHARED
-    {
-        Pos = MAP_APPFONT ( 12 , 112 ) ;
-        Size = MAP_APPFONT ( 145 , 10 ) ;
-        Text = "~Inhalt links/rechts gleich" ;
-        Text [ ENGLISH ] = "Same ~content left/right" ;
-        Text [ norwegian ] = "Same ~content left/right" ;
-        Text [ italian ] = "~Contenuto uguale destra/sinistra" ;
-        Text [ portuguese_brazilian ] = "Mesmo ~conte�do esquerda/direita" ;
-        Text [ portuguese ] = "Mesmo ~conte�do esquerda/direita" ;
-        Text [ finnish ] = "Sama ~sis�lt� vasemmalla/oikealla" ;
-        Text [ danish ] = "Ens indhold venstre/h�jre" ;
-        Text [ french ] = "~Contenu identique gauche/droite" ;
-        Text [ swedish ] = "Samma ~inneh�ll h�ger/v�nster" ;
-        Text [ dutch ] = "Links/rechts dezelfde ~inhoud" ;
-        Text [ spanish ] = "~Contenido a la izquierda/derecha igual" ;
-        Text [ english_us ] = "Same ~content left/right" ;
-        Text[ chinese_simplified ] = "����������ͬ(~C)";
-        Text[ russian ] = "���������� ���������� �����/������";
-        Text[ polish ] = "Zawarto~�� z lewej i z prawej jest taka sama";
-        Text[ japanese ] = "���E�߰�ޓ��ꍀ��(~C)";
-        Text[ chinese_traditional ] = "���e���k�ۦP(~C)";
-        Text[ arabic ] = "��� ��������� ��� ������/������";
-        Text[ greek ] = "���� ����������� ��������/�����";
-        Text[ korean ] = "���� ����/������ ����(~C)";
-        Text[ turkish ] = "Sol/sa� i�erik ay~n�";
-        Text[ language_user1 ] = " ";
-    };
-    GroupBox GB_FRAME
+    FixedLine FL_FRAME
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 157 , 146 ) ;
+        Pos = MAP_APPFONT ( 4 , 3 ) ;
+        Size = MAP_APPFONT ( 157 , 8 ) ;
         Text = "Kopfzeile" ;
         Text [ ENGLISH ] = "Header" ;
         Text [ norwegian ] = "Header" ;
@@ -369,13 +370,13 @@ TabPage RID_SVXPAGE_HEADER
     };
     Window WN_BSP
     {
-        Pos = MAP_APPFONT ( 176 , 14 ) ;
-        Size = MAP_APPFONT ( 72 , 129 ) ;
+        Pos = MAP_APPFONT ( 176 , 12 ) ;
+        Size = MAP_APPFONT ( 72 , 41 ) ;
     };
-    GroupBox GB_BSP
+    FixedLine FL_BSP
     {
         Pos = MAP_APPFONT ( 171 , 3 ) ;
-        Size = MAP_APPFONT ( 83 , 146 ) ;
+        Size = MAP_APPFONT ( 83 , 8 ) ;
         Text = "Vorschau" ;
         Text [ ENGLISH ] = "Example" ;
         Text [ norwegian ] = "Eksempel" ;
@@ -402,7 +403,7 @@ TabPage RID_SVXPAGE_HEADER
     };
     PushButton BTN_EXTRAS
     {
-        Pos = MAP_APPFONT ( 12 , 129 ) ;
+        Pos = MAP_APPFONT ( 7 , 140 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text = "Zus~�tze..." ;
         Text [ ENGLISH ] = "Option~s..." ;
@@ -460,7 +461,7 @@ TabPage RID_SVXPAGE_FOOTER
     Size = MAP_APPFONT ( 260 , 185 ) ;
     CheckBox CB_TURNON
     {
-        Pos = MAP_APPFONT ( 12 , 15 ) ;
+        Pos = MAP_APPFONT ( 7 , 14 ) ;
         Size = MAP_APPFONT ( 145 , 10 ) ;
         Text = "~Fu�zeile einschalten" ;
         Text [ ENGLISH ] = "~Turn on Footer" ;
@@ -486,9 +487,125 @@ TabPage RID_SVXPAGE_FOOTER
         Text[ turkish ] = "A~ltbilgi olu�tur";
         Text[ language_user1 ] = " ";
     };
+    CheckBox CB_SHARED
+    {
+        Pos = MAP_APPFONT ( 7 , 31 ) ;
+        Size = MAP_APPFONT ( 145 , 10 ) ;
+        Text = "~Inhalt links/rechts gleich" ;
+        Text [ ENGLISH ] = "Same ~content left/right" ;
+        Text [ norwegian ] = "Same ~content left/right" ;
+        Text [ italian ] = "~Contenuto uguale destra/sinistra" ;
+        Text [ portuguese_brazilian ] = "Mesmo ~conte�do esquerda/direita" ;
+        Text [ portuguese ] = "Mesmo ~conte�do esquerda/direita" ;
+        Text [ finnish ] = "Sama ~sis�lt� vasemmalla/oikealla" ;
+        Text [ danish ] = "Ens indhold venstre/h�jre" ;
+        Text [ french ] = "~Contenu identique gauche/droite" ;
+        Text [ swedish ] = "Samma ~inneh�ll h�ger/v�nster" ;
+        Text [ dutch ] = "Links/rechts dezelfde ~inhoud" ;
+        Text [ spanish ] = "Igual ~contenido a la izquierda/derecha" ;
+        Text [ english_us ] = "Same ~content left/right" ;
+        Text[ chinese_simplified ] = "����������ͬ(~C)";
+        Text[ russian ] = "���������� ���������� �����/������";
+        Text[ polish ] = "Zawarto�� z prawej i z lewej jest ta~ka sama";
+        Text[ japanese ] = "���E�߰�ޓ��ꍀ��(~C)";
+        Text[ chinese_traditional ] = "���e���k�ۦP(~C)";
+        Text[ arabic ] = "��� ��������� ��� ������/������";
+        Text[ greek ] = "���� ����������� ��������/�����";
+        Text[ korean ] = "���� ����/������ ����(~C)";
+        Text[ turkish ] = "Sol/sa� i�erik ay~n�";
+        Text[ language_user1 ] = " ";
+    };
+    FixedText FT_LMARGIN
+    {
+        Pos = MAP_APPFONT ( 7 , 50 ) ;
+        Size = MAP_APPFONT ( 102 , 8 ) ;
+        Text = "~Linker Rand" ;
+        Text [ ENGLISH ] = "~Left Margin" ;
+        Text [ norwegian ] = "~Left Margin" ;
+        Text [ italian ] = "Margine sinistro" ;
+        Text [ portuguese_brazilian ] = "~Rodap� da Margem Esquerda" ;
+        Text [ portuguese ] = "Margem ~esquerda" ;
+        Text [ finnish ] = "~Vasemman reunan alateksti" ;
+        Text [ danish ] = "Venstre margen" ;
+        Text [ french ] = "Marge ~gauche" ;
+        Text [ swedish ] = "V�nstermargina~l" ;
+        Text [ dutch ] = "~Linker marge" ;
+        Text [ spanish ] = "Margen ~izquierdo" ;
+        Text [ english_us ] = "~Left margin" ;
+        Left = TRUE ;
+        Text[ chinese_simplified ] = "��߿հ�(~L)";
+        Text[ russian ] = "���� �����";
+        Text[ polish ] = "Lewy margines";
+        Text[ japanese ] = "���]��(~L)";
+        Text[ chinese_traditional ] = "����ť�(~L)";
+        Text[ arabic ] = "������ ������";
+        Text[ greek ] = "�������� ���������";
+        Text[ korean ] = "���� ����(~L)";
+        Text[ turkish ] = "S~ol kenar";
+        Text[ language_user1 ] = " ";
+    };
+    MetricField ED_LMARGIN
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 117 , 48 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Left = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        Maximum = 9999 ;
+        DecimalDigits = 2 ;
+        Unit = FUNIT_CM ;
+        Last = 9999 ;
+        SpinSize = 10 ;
+    };
+    FixedText FT_RMARGIN
+    {
+        Pos = MAP_APPFONT ( 7 , 66 ) ;
+        Size = MAP_APPFONT ( 102 , 8 ) ;
+        Text = "~Rechter Rand" ;
+        Text [ ENGLISH ] = "R~ight Margin" ;
+        Text [ norwegian ] = "R~ight Margin" ;
+        Text [ italian ] = "Margine destro" ;
+        Text [ portuguese_brazilian ] = "M~argem Direita Rodap�" ;
+        Text [ portuguese ] = "Margem ~direita" ;
+        Text [ finnish ] = "~Oikean reunan alateksti" ;
+        Text [ danish ] = "H�jre margen" ;
+        Text [ french ] = "Marge dro~ite" ;
+        Text [ swedish ] = "H�ge~rmarginal" ;
+        Text [ dutch ] = "~Rechter marge" ;
+        Text [ spanish ] = "Margen ~derecho" ;
+        Text [ english_us ] = "R~ight margin" ;
+        Left = TRUE ;
+        Text[ chinese_simplified ] = "�ұ߿հ�(~I)";
+        Text[ russian ] = "���� ������";
+        Text[ polish ] = "Prawy margines";
+        Text[ japanese ] = "�E�]��(~I)";
+        Text[ chinese_traditional ] = "�k��ť�(~I)";
+        Text[ arabic ] = "������ ������";
+        Text[ greek ] = "����� ���������";
+        Text[ korean ] = "������ ����(~I)";
+        Text[ turkish ] = "~Sa� kenar";
+        Text[ language_user1 ] = " ";
+    };
+    MetricField ED_RMARGIN
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 117 , 64 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Left = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Minimum = 0 ;
+        Maximum = 9999 ;
+        DecimalDigits = 2 ;
+        Unit = FUNIT_CM ;
+        Last = 9999 ;
+        SpinSize = 10 ;
+    };
     FixedText FT_DIST
     {
-        Pos = MAP_APPFONT ( 12 , 31 ) ;
+        Pos = MAP_APPFONT ( 7 , 85 ) ;
         Size = MAP_APPFONT ( 102 , 8 ) ;
         Text = "A~bstand" ;
         Text [ English ] = "~Distance" ;
@@ -516,7 +633,7 @@ TabPage RID_SVXPAGE_FOOTER
     {
         Disable = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 30 ) ;
+        Pos = MAP_APPFONT ( 117 , 83 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -529,7 +646,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     FixedText FT_HEIGHT
     {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
+        Pos = MAP_APPFONT ( 7 , 101 ) ;
         Size = MAP_APPFONT ( 102 , 8 ) ;
         Text = "~H�he" ;
         Text [ ENGLISH ] = "~Height" ;
@@ -558,7 +675,7 @@ TabPage RID_SVXPAGE_FOOTER
     {
         Disable = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 45 ) ;
+        Pos = MAP_APPFONT ( 117 , 99 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -573,7 +690,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     CheckBox CB_HEIGHT_DYN
     {
-        Pos = MAP_APPFONT ( 12 , 63 ) ;
+        Pos = MAP_APPFONT ( 7 , 115 ) ;
         Size = MAP_APPFONT ( 145 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? H�he ~dynamisch anpassen : H�he ~dynamisch anpassen */
         /* ### ACHTUNG: Neuer Text in Resource? H�he ~dynamisch anpassen : H�he ~dynamisch anpassen */
@@ -601,126 +718,11 @@ TabPage RID_SVXPAGE_FOOTER
         Text[ turkish ] = "Y�ksekli�i oto~matik olarak ayarla";
         Text[ language_user1 ] = " ";
     };
-    FixedText FT_LMARGIN
-    {
-        Pos = MAP_APPFONT ( 12 , 80 ) ;
-        Size = MAP_APPFONT ( 102 , 8 ) ;
-        Text = "~Linker Rand" ;
-        Text [ ENGLISH ] = "~Left Margin" ;
-        Text [ norwegian ] = "~Left Margin" ;
-        Text [ italian ] = "Margine sinistro" ;
-        Text [ portuguese_brazilian ] = "~Rodap� da Margem Esquerda" ;
-        Text [ portuguese ] = "Margem ~esquerda" ;
-        Text [ finnish ] = "~Vasemman reunan alateksti" ;
-        Text [ danish ] = "Venstre margen" ;
-        Text [ french ] = "Marge ~gauche" ;
-        Text [ swedish ] = "V�nstermargina~l" ;
-        Text [ dutch ] = "~Linker marge" ;
-        Text [ spanish ] = "Margen ~izquierdo" ;
-        Text [ english_us ] = "~Left margin" ;
-        Left = TRUE ;
-        Text[ chinese_simplified ] = "��߿հ�(~L)";
-        Text[ russian ] = "���� �����";
-        Text[ polish ] = "Lewy margines";
-        Text[ japanese ] = "���]��(~L)";
-        Text[ chinese_traditional ] = "����ť�(~L)";
-        Text[ arabic ] = "������ ������";
-        Text[ greek ] = "�������� ���������";
-        Text[ korean ] = "���� ����(~L)";
-        Text[ turkish ] = "S~ol kenar";
-        Text[ language_user1 ] = " ";
-    };
-    MetricField ED_LMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 79 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    FixedText FT_RMARGIN
-    {
-        Pos = MAP_APPFONT ( 12 , 95 ) ;
-        Size = MAP_APPFONT ( 102 , 8 ) ;
-        Text = "~Rechter Rand" ;
-        Text [ ENGLISH ] = "R~ight Margin" ;
-        Text [ norwegian ] = "R~ight Margin" ;
-        Text [ italian ] = "Margine destro" ;
-        Text [ portuguese_brazilian ] = "M~argem Direita Rodap�" ;
-        Text [ portuguese ] = "Margem ~direita" ;
-        Text [ finnish ] = "~Oikean reunan alateksti" ;
-        Text [ danish ] = "H�jre margen" ;
-        Text [ french ] = "Marge dro~ite" ;
-        Text [ swedish ] = "H�ge~rmarginal" ;
-        Text [ dutch ] = "~Rechter marge" ;
-        Text [ spanish ] = "Margen ~derecho" ;
-        Text [ english_us ] = "R~ight margin" ;
-        Left = TRUE ;
-        Text[ chinese_simplified ] = "�ұ߿հ�(~I)";
-        Text[ russian ] = "���� ������";
-        Text[ polish ] = "Prawy margines";
-        Text[ japanese ] = "�E�]��(~I)";
-        Text[ chinese_traditional ] = "�k��ť�(~I)";
-        Text[ arabic ] = "������ ������";
-        Text[ greek ] = "����� ���������";
-        Text[ korean ] = "������ ����(~I)";
-        Text[ turkish ] = "~Sa� kenar";
-        Text[ language_user1 ] = " ";
-    };
-    MetricField ED_RMARGIN
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 117 , 94 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 9999 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-        Last = 9999 ;
-        SpinSize = 10 ;
-    };
-    CheckBox CB_SHARED
-    {
-        Pos = MAP_APPFONT ( 12 , 112 ) ;
-        Size = MAP_APPFONT ( 145 , 10 ) ;
-        Text = "~Inhalt links/rechts gleich" ;
-        Text [ ENGLISH ] = "Same ~content left/right" ;
-        Text [ norwegian ] = "Same ~content left/right" ;
-        Text [ italian ] = "~Contenuto uguale destra/sinistra" ;
-        Text [ portuguese_brazilian ] = "Mesmo ~conte�do esquerda/direita" ;
-        Text [ portuguese ] = "Mesmo ~conte�do esquerda/direita" ;
-        Text [ finnish ] = "Sama ~sis�lt� vasemmalla/oikealla" ;
-        Text [ danish ] = "Ens indhold venstre/h�jre" ;
-        Text [ french ] = "~Contenu identique gauche/droite" ;
-        Text [ swedish ] = "Samma ~inneh�ll h�ger/v�nster" ;
-        Text [ dutch ] = "Links/rechts dezelfde ~inhoud" ;
-        Text [ spanish ] = "Igual ~contenido a la izquierda/derecha" ;
-        Text [ english_us ] = "Same ~content left/right" ;
-        Text[ chinese_simplified ] = "����������ͬ(~C)";
-        Text[ russian ] = "���������� ���������� �����/������";
-        Text[ polish ] = "Zawarto�� z prawej i z lewej jest ta~ka sama";
-        Text[ japanese ] = "���E�߰�ޓ��ꍀ��(~C)";
-        Text[ chinese_traditional ] = "���e���k�ۦP(~C)";
-        Text[ arabic ] = "��� ��������� ��� ������/������";
-        Text[ greek ] = "���� ����������� ��������/�����";
-        Text[ korean ] = "���� ����/������ ����(~C)";
-        Text[ turkish ] = "Sol/sa� i�erik ay~n�";
-        Text[ language_user1 ] = " ";
-    };
-    GroupBox GB_FRAME
+
+    FixedLine FL_FRAME
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 157 , 146 ) ;
+        Pos = MAP_APPFONT ( 4 , 3 ) ;
+        Size = MAP_APPFONT ( 157 , 8 ) ;
         Text = "Fu�zeile" ;
         Text [ ENGLISH ] = "Footer" ;
         Text [ norwegian ] = "Footer" ;
@@ -747,13 +749,13 @@ TabPage RID_SVXPAGE_FOOTER
     };
     Window WN_BSP
     {
-        Pos = MAP_APPFONT ( 176 , 14 ) ;
-        Size = MAP_APPFONT ( 72 , 129 ) ;
+        Pos = MAP_APPFONT ( 176 , 12 ) ;
+        Size = MAP_APPFONT ( 72 , 41 ) ;
     };
-    GroupBox GB_BSP
+    FixedLine FL_BSP
     {
         Pos = MAP_APPFONT ( 171 , 3 ) ;
-        Size = MAP_APPFONT ( 83 , 146 ) ;
+        Size = MAP_APPFONT ( 83 , 8 ) ;
         Text = "Vorschau" ;
         Text [ ENGLISH ] = "Example" ;
         Text [ norwegian ] = "Eksempel" ;
@@ -780,7 +782,7 @@ TabPage RID_SVXPAGE_FOOTER
     };
     PushButton BTN_EXTRAS
     {
-        Pos = MAP_APPFONT ( 12 , 129 ) ;
+        Pos = MAP_APPFONT ( 7 , 140 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text = "Zus~�tze..." ;
         Text [ ENGLISH ] = "~Options..." ;
@@ -822,8 +824,8 @@ QueryBox RID_SVXQBX_DELETE_HEADFOOT
     Buttons = WB_YES_NO ;
     DefButton = WB_DEF_NO ;
     /* ### ACHTUNG: Neuer Text in Resource? Das Ausschalten der Kopf- oder Fu�zeilen l�scht vorhandenen Text.\nM�chten Sie den Inhalt l�schen? : Das Ausschalten der Kopf- oder Fu�zeilen l�scht vorhandenen Text.\nM�chten Sie den Inhalt l�schen? */
-    Message = "Das Ausschalten der Kopf- oder Fu�zeilen l�scht vorhandenen Text.\nM�chten Sie den Inhalt l�schen?" ;
-    Message [ English ] = "Turn off the header or footer delete its contents.\nAre you sure you want to delete this text?" ;
+    Message = "Das Ausschalten der Kopf- oder Fu�zeilen l�scht vorhandenen Inhalt.\nM�chten Sie den Inhalt l�schen?" ;
+    Message [ English ] = "Turn off the header or footer delete its contents.\nAre you sure you want to delete this content?" ;
     Message [ norwegian ] = "Turn off the header or footer delete its contents.\nAre you sure you want to delete this text?" ;
     Message [ italian ] = "Disattivando l'intestazione o il pi� di pagina il testo esistente verr� cancellato.\nCancellare il contenuto?" ;
     Message [ portuguese_brazilian ] = "Desativar o cabe�alho ou o rodap� apagar seu conte�do.\nTem certeza que deseja apagar este texto?" ;