#86988# dialog redesign

9 files changed, 643 insertions, 703 deletions

diff --git a/svx/source/dialog/chardlg.cxx b/svx/source/dialog/chardlg.cxx
index d215c77bcfd6..cd110decd1d4 100644
--- a/svx/source/dialog/chardlg.cxx
+++ b/svx/source/dialog/chardlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chardlg.cxx,v $
  *
- *  $Revision: 1.37 $
+ *  $Revision: 1.38 $
  *
- *  last change: $Author: os $ $Date: 2001-05-08 08:55:18 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2973,12 +2973,10 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) :
     m_aEastFontLanguageFT   ( this, ResId( FT_EAST_LANG ) ),
     m_aEastFontLanguageLB   ( this, ResId( LB_EAST_LANG )),
 
-    m_aPreviewLine          ( this, ResId( FL_CHAR_PREVIEW ) ),
     m_aPreviewWin           ( this, ResId( WIN_CHAR_PREVIEW ) ),
     m_aFontTypeFT           ( this, ResId( FT_CHAR_FONTTYPE ) ),
 
-    m_aSeparateLine         ( this, ResId( FL_SEPARATE ) ),
-
+    m_aColorFL              ( this, ResId( FL_COLOR2 ) ),
     m_aColorFT              ( this, ResId( FT_COLOR2 ) ),
     m_aColorLB              ( this, ResId( LB_COLOR2 ) ),
 
@@ -3094,7 +3092,6 @@ void SvxCharNamePage::Initialize()
     if ( bKillTable )
         delete pColorTable;
 
-    m_aSeparateLine.SetStyle( m_aSeparateLine.GetStyle() | WB_VERT );
     m_aColorLB.SetSelectHdl( LINK( this, SvxCharNamePage, ColorBoxSelectHdl_Impl ) );
 
     Link aLink = LINK( this, SvxCharNamePage, FontModifyHdl_Impl );
@@ -3947,7 +3944,6 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSe
     m_aShadowBtn            ( this, ResId( CB_SHADOW ) ),
     m_aBlinkingBtn          ( this, ResId( CB_BLINKING ) ),
 
-    m_aPreviewLine          ( this, ResId( FL_EFFECTS_PREVIEW ) ),
     m_aPreviewWin           ( this, ResId( WIN_EFFECTS_PREVIEW ) ),
     m_aFontTypeFT           ( this, ResId( FT_EFFECTS_FONTTYPE ) )
 
diff --git a/svx/source/dialog/chardlg.hrc b/svx/source/dialog/chardlg.hrc
index 1d6bbf8e2fec..6f316121847f 100644
--- a/svx/source/dialog/chardlg.hrc
+++ b/svx/source/dialog/chardlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chardlg.hrc,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: jp $ $Date: 2001-03-28 12:01:29 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -158,11 +158,10 @@
 #define FT_ARABIAN_LANG         127
 #define LB_ARABIAN_LANG         128
 
-#define FL_CHAR_PREVIEW         130
 #define WIN_CHAR_PREVIEW        131
 #define FT_CHAR_FONTTYPE        132
 
-#define FL_SEPARATE             140
+#define FL_COLOR2               140
 #define FT_COLOR2               141
 #define LB_COLOR2               142
 
@@ -192,7 +191,6 @@
 #define FT_RELIEF               226
 #define LB_RELIEF               227
 
-#define FL_EFFECTS_PREVIEW      230
 #define WIN_EFFECTS_PREVIEW     231
 #define FT_EFFECTS_FONTTYPE     232
 
diff --git a/svx/source/dialog/chardlg.src b/svx/source/dialog/chardlg.src
index d7d0ac2138b5..d38ca04624bb 100644
--- a/svx/source/dialog/chardlg.src
+++ b/svx/source/dialog/chardlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chardlg.src,v $
  *
- *  $Revision: 1.41 $
+ *  $Revision: 1.42 $
  *
- *  last change: $Author: hjs $ $Date: 2001-05-11 05:18:30 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1844,19 +1844,19 @@ TabPage RID_SVXPAGE_CHAR_EXT
             < "Yksitt�inen" ; CHRDLG_UNDERLINE_SINGLE ; > ;
             < "Kaksinkertainen" ; CHRDLG_UNDERLINE_DOUBLE ; > ;
             < "Lihavointi"; CHRDLG_UNDERLINE_BOLD; > ;
-            < "Pisteet" ; CHRDLG_UNDERLINE_DOTTED ; >
-            < "Pisteet (lihavointi)" ; CHRDLG_UNDERLINE_BOLDDOTTED; >
-            < "V�liviiva"; CHRDLG_UNDERLINE_DASH; >
-            < "V�liviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDDASH; >
-            < "Pitk� ajatusviiva"; CHRDLG_UNDERLINE_LONGDASH; >
-            < "Pitk� ajatusviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDLONGDASH; >
-            < "Pisteyhdysviiva"; CHRDLG_UNDERLINE_DASHDOT; >
-            < "Pisteyhdysviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASHDOT; >
-            < "Piste piste viiva"; CHRDLG_UNDERLINE_DASHDOTDOT; >
-            < "Piste piste viiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; >
-            < "Aalto"; CHRDLG_UNDERLINE_WAVE; >
-            < "Aaltoviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDWAVE; >
-            < "Kaksinkertainen aalto"; CHRDLG_UNDERLINE_DOUBLEWAVE; >
+            < "Pisteet" ; CHRDLG_UNDERLINE_DOTTED ; > ;
+            < "Pisteet (lihavointi)" ; CHRDLG_UNDERLINE_BOLDDOTTED; > ;
+            < "V�liviiva"; CHRDLG_UNDERLINE_DASH; > ;
+            < "V�liviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDDASH; > ;
+            < "Pitk� ajatusviiva"; CHRDLG_UNDERLINE_LONGDASH; > ;
+            < "Pitk� ajatusviiva (lihavoitu)"; CHRDLG_UNDERLINE_BOLDLONGDASH; > ;
+            < "Pisteyhdysviiva"; CHRDLG_UNDERLINE_DASHDOT; > ;
+            < "Pisteyhdysviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASHDOT; > ;
+            < "Piste piste viiva"; CHRDLG_UNDERLINE_DASHDOTDOT; > ;
+            < "Piste piste viiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDDASHDOTDOT; > ;
+            < "Aalto"; CHRDLG_UNDERLINE_WAVE; > ;
+            < "Aaltoviiva (lihavointi)"; CHRDLG_UNDERLINE_BOLDWAVE; > ;
+            < "Kaksinkertainen aalto"; CHRDLG_UNDERLINE_DOUBLEWAVE; > ;
         };
         StringList [ danish ] =
         {
@@ -2266,9 +2266,9 @@ TabPage RID_SVXPAGE_CHAR_EXT
         {
             < "Yksitt�inen" ; CHRDLG_STRIKEOUT_SINGLE ; > ;
             < "Kaksinkertainen" ; CHRDLG_STRIKEOUT_DOUBLE ; > ;
-            < "Lihavointi" ; CHRDLG_STRIKEOUT_BOLD ; >
-            < "kenoviivoilla (/)" ; CHRDLG_STRIKEOUT_SLASH ; >
-            < "X-merkeill�" ; CHRDLG_STRIKEOUT_X ; >
+            < "Lihavointi" ; CHRDLG_STRIKEOUT_BOLD ; > ;
+            < "kenoviivoilla (/)" ; CHRDLG_STRIKEOUT_SLASH ; > ;
+            < "X-merkeill�" ; CHRDLG_STRIKEOUT_X ; > ;
         };
         StringList [ danish ] =
         {
@@ -2541,8 +2541,8 @@ TabPage RID_SVXPAGE_CHAR_NAME
     Hide = TRUE ;
     FixedLine FL_WEST
     {
-        Pos = MAP_APPFONT ( 4 , 3  );
-        Size = MAP_APPFONT ( 252 , 8 );
+        Pos = MAP_APPFONT ( 6 , 3  );
+        Size = MAP_APPFONT ( 248 , 8 );
         Text = "Schriftart f�r westlichen Text";
         Text [ english_us ] = "Western text font";
         Text[ portuguese ] = "Tipo de letra para texto ocidental";
@@ -2567,8 +2567,8 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     FixedText FT_WEST_NAME
     {
-        Pos = MAP_APPFONT ( 7 , 14  );
-        Size = MAP_APPFONT ( 65 , 10 );
+        Pos = MAP_APPFONT ( 12 , 14  );
+        Size = MAP_APPFONT ( 80 , 10 );
         Text = "~Schriftart";
         Text [ english_us ] = "Font";
         Text[ portuguese ] = "~Tipo de letra";
@@ -2594,15 +2594,15 @@ TabPage RID_SVXPAGE_CHAR_NAME
     ComboBox LB_WEST_NAME
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 7 , 26  );
-        Size = MAP_APPFONT ( 65 , 48 );
+        Pos = MAP_APPFONT ( 12 , 25  );
+        Size = MAP_APPFONT ( 80 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
     };
     FixedText FT_WEST_STYLE
     {
-        Pos = MAP_APPFONT ( 78 , 14  );
-        Size = MAP_APPFONT ( 65 , 10 );
+        Pos = MAP_APPFONT ( 98 , 14  );
+        Size = MAP_APPFONT ( 40 , 10 );
         Text = "S~chriftschnitt";
         Text [ english_us ] = "~Typeface";
         Text[ portuguese ] = "Estilo";
@@ -2628,8 +2628,8 @@ TabPage RID_SVXPAGE_CHAR_NAME
     ComboBox LB_WEST_STYLE
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 78 , 26  );
-        Size = MAP_APPFONT ( 65 , 48 );
+        Pos = MAP_APPFONT ( 98 , 25  );
+        Size = MAP_APPFONT ( 40 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
         StringList =
@@ -2646,151 +2646,151 @@ TabPage RID_SVXPAGE_CHAR_NAME
             "Bold" ;
             "Bold italic" ;
         };
-    StringList [ language_user1 ] =
-    {
-         "Normal" ;
-         "Kursiv" ;
-         "Fett" ;
-         "Fett Kursiv" ;
-    };
-    StringList [ portuguese ] =
-    {
-         "Normal" ;
-         "It�lico" ;
-         "Negrito" ;
-         "It�lico negrito" ;
-    };
-    StringList [ russian ] =
-    {
-         "�������" ;
-         "������" ;
-         "������" ;
-         "������ ������" ;
-    };
-    StringList [ greek ] =
-    {
-         "��������" ;
-         "������" ;
-         "������" ;
-         "������ ������" ;
-    };
-    StringList [ dutch ] =
-    {
-         "Normaal" ;
-         "Cursief" ;
-         "Vet" ;
-         "Vet cursief" ;
-    };
-    StringList [ french ] =
-    {
-         "Normal" ;
-         "Italique" ;
-         "Gras" ;
-         "Italique gras" ;
-    };
-    StringList [ spanish ] =
-    {
-         "Normal" ;
-         "Cursiva" ;
-         "Negrita" ;
-         "Negrita cursiva" ;
-    };
-    StringList [ italian ] =
-    {
-         "Normale" ;
-         "Corsivo" ;
-         "Grassetto" ;
-         "Grassetto corsivo" ;
-    };
-    StringList [ danish ] =
-    {
-         "Normal" ;
-         "Kursiv" ;
-         "Fed" ;
-         "Fed kursiv" ;
-    };
-    StringList [ swedish ] =
-    {
-         "Normal" ;
-         "Kursiv" ;
-         "Fet" ;
-         "Fet kursiv" ;
-    };
-    StringList [ polish ] =
-    {
-         "Zwyk�a" ;
-         "Kursywa" ;
-         "Pogrubienie" ;
-         "Kursywa pogrubiona" ;
-    };
-    StringList [ portuguese_brazilian ] =
-    {
-         "Normal" ;
-         "Kursiv" ;
-         "Fett" ;
-         "Fett Kursiv" ;
-    };
-    StringList [ japanese ] =
-    {
-         "�W��" ;
-         "�Α�" ;
-         "����" ;
-         "�����Α�" ;
-    };
-    StringList [ korean ] =
-    {
-         "����" ;
-         "���Ÿ�ü" ;
-         "����" ;
-         "���Ÿ�ü (����)" ;
-    };
-    StringList [ chinese_simplified ] =
-    {
-         "��ͨ" ;
-         "�" ;
-         "����" ;
-         "���" ;
-    };
-    StringList [ chinese_traditional ] =
-    {
-         "���q" ;
-         "����" ;
-         "����" ;
-         "�ʱ���" ;
-    };
-    StringList [ turkish ] =
-    {
-         "Normal" ;
-         "�talik" ;
-         "Kal�n" ;
-         "Kal�n italik" ;
-    };
-    StringList [ arabic ] =
-    {
-         "����" ;
-         "����" ;
-         "����" ;
-         "���� ����" ;
-    };
-    StringList [ catalan ] =
-    {
-         "Normal" ;
-         "Cursiva" ;
-         "Negrita" ;
-         "Negrita cursiva" ;
-    };
-    StringList [ finnish ] =
-    {
-            < "Normaali" ;
-        < "Kursivointi" ;
-        < "Lihavointi" ;
-        < "Lihavointi ja kursivointi" ;
-    };
+        StringList [ language_user1 ] =
+        {
+            "Normal" ;
+            "Kursiv" ;
+            "Fett" ;
+            "Fett Kursiv" ;
+        };
+        StringList [ portuguese ] =
+        {
+            "Normal" ;
+            "It�lico" ;
+            "Negrito" ;
+            "It�lico negrito" ;
+        };
+        StringList [ russian ] =
+        {
+            "�������" ;
+            "������" ;
+            "������" ;
+            "������ ������" ;
+        };
+        StringList [ greek ] =
+        {
+            "��������" ;
+            "������" ;
+            "������" ;
+            "������ ������" ;
+        };
+        StringList [ dutch ] =
+        {
+            "Normaal" ;
+            "Cursief" ;
+            "Vet" ;
+            "Vet cursief" ;
+        };
+        StringList [ french ] =
+        {
+            "Normal" ;
+            "Italique" ;
+            "Gras" ;
+            "Italique gras" ;
+        };
+        StringList [ spanish ] =
+        {
+            "Normal" ;
+            "Cursiva" ;
+            "Negrita" ;
+            "Negrita cursiva" ;
+        };
+        StringList [ italian ] =
+        {
+            "Normale" ;
+            "Corsivo" ;
+            "Grassetto" ;
+            "Grassetto corsivo" ;
+        };
+        StringList [ danish ] =
+        {
+            "Normal" ;
+            "Kursiv" ;
+            "Fed" ;
+            "Fed kursiv" ;
+        };
+        StringList [ swedish ] =
+        {
+            "Normal" ;
+            "Kursiv" ;
+            "Fet" ;
+            "Fet kursiv" ;
+        };
+        StringList [ polish ] =
+        {
+            "Zwyk�a" ;
+            "Kursywa" ;
+            "Pogrubienie" ;
+            "Kursywa pogrubiona" ;
+        };
+        StringList [ portuguese_brazilian ] =
+        {
+            "Normal" ;
+            "Kursiv" ;
+            "Fett" ;
+            "Fett Kursiv" ;
+        };
+        StringList [ japanese ] =
+        {
+            "�W��" ;
+            "�Α�" ;
+            "����" ;
+            "�����Α�" ;
+        };
+        StringList [ korean ] =
+        {
+            "����" ;
+            "���Ÿ�ü" ;
+            "����" ;
+            "���Ÿ�ü (����)" ;
+        };
+        StringList [ chinese_simplified ] =
+        {
+            "��ͨ" ;
+            "�" ;
+            "����" ;
+            "���" ;
+        };
+        StringList [ chinese_traditional ] =
+        {
+            "���q" ;
+            "����" ;
+            "����" ;
+            "�ʱ���" ;
+        };
+        StringList [ turkish ] =
+        {
+            "Normal" ;
+            "�talik" ;
+            "Kal�n" ;
+            "Kal�n italik" ;
+        };
+        StringList [ arabic ] =
+        {
+            "����" ;
+            "����" ;
+            "����" ;
+            "���� ����" ;
+        };
+        StringList [ catalan ] =
+        {
+            "Normal" ;
+            "Cursiva" ;
+            "Negrita" ;
+            "Negrita cursiva" ;
+        };
+        StringList [ finnish ] =
+        {
+            "Normaali" ;
+            "Kursivointi" ;
+            "Lihavointi" ;
+            "Lihavointi ja kursivointi" ;
+        };
     };
     FixedText FT_WEST_SIZE
     {
-        Pos = MAP_APPFONT ( 149 , 14  );
-        Size = MAP_APPFONT ( 40 , 10 );
+        Pos = MAP_APPFONT ( 144 , 14  );
+        Size = MAP_APPFONT ( 38 , 10 );
         Text = "Sch~riftgrad";
         Text [ english_us ] = "Size";
         Text[ portuguese ] = "~Tamanho";
@@ -2816,15 +2816,15 @@ TabPage RID_SVXPAGE_CHAR_NAME
     MetricBox LB_WEST_SIZE
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 149 , 26  );
-        Size = MAP_APPFONT ( 40 , 48 );
+        Pos = MAP_APPFONT ( 144 , 25  );
+        Size = MAP_APPFONT ( 38 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
     };
     FixedText FT_WEST_LANG
     {
-        Pos = MAP_APPFONT ( 195 , 14  );
-        Size = MAP_APPFONT ( 58 , 10 );
+        Pos = MAP_APPFONT ( 188 , 14  );
+        Size = MAP_APPFONT ( 66 , 10 );
         Text = "S~prache";
         Text [ english_us ] = "Language";
         Text[ portuguese ] = "~L�ngua";
@@ -2850,16 +2850,16 @@ TabPage RID_SVXPAGE_CHAR_NAME
     ListBox LB_WEST_LANG
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 195 , 26  );
-        Size = MAP_APPFONT ( 58 , 48 );
+        Pos = MAP_APPFONT ( 188 , 25  );
+        Size = MAP_APPFONT ( 66 , 48 );
         TabStop = TRUE;
         Sort = TRUE ;
         DropDown = TRUE;
     };
     FixedLine FL_EAST
     {
-        Pos = MAP_APPFONT ( 4 , 51  );
-        Size = MAP_APPFONT ( 252 , 8 );
+        Pos = MAP_APPFONT ( 6 , 43  );
+        Size = MAP_APPFONT ( 248 , 8 );
         Text = "Schriftart f�r asiatischen Text";
         Text [ english_us ] = "Asian text font";
         Text[ portuguese ] = "Tipo de letra para texto asi�tico";
@@ -2884,8 +2884,8 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     FixedText FT_EAST_NAME
     {
-        Pos = MAP_APPFONT ( 7 , 62  );
-        Size = MAP_APPFONT ( 65 , 10 );
+        Pos = MAP_APPFONT ( 12 , 54  );
+        Size = MAP_APPFONT ( 80 , 10 );
         Text = "Schr~iftart";
         Text [ english_us ] = "Font";
         Text[ portuguese ] = "Ti~po de letra";
@@ -2911,15 +2911,15 @@ TabPage RID_SVXPAGE_CHAR_NAME
     ComboBox LB_EAST_NAME
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 7 , 74  );
-        Size = MAP_APPFONT ( 65 , 48 );
+        Pos = MAP_APPFONT ( 12 , 65  );
+        Size = MAP_APPFONT ( 80 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
     };
     FixedText FT_EAST_STYLE
     {
-        Pos = MAP_APPFONT ( 78 , 62  );
-        Size = MAP_APPFONT ( 65 , 10 );
+        Pos = MAP_APPFONT ( 98 , 54  );
+        Size = MAP_APPFONT ( 40 , 10 );
         Text = "Schri~ftschnitt";
         Text [ english_us ] = "T~ypeface";
         Text[ portuguese ] = "~Estilo";
@@ -2945,8 +2945,8 @@ TabPage RID_SVXPAGE_CHAR_NAME
     ComboBox LB_EAST_STYLE
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 78 , 74  );
-        Size = MAP_APPFONT ( 65 , 48 );
+        Pos = MAP_APPFONT ( 98 , 65  );
+        Size = MAP_APPFONT ( 40 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
         StringList =
@@ -2963,151 +2963,151 @@ TabPage RID_SVXPAGE_CHAR_NAME
             "Bold" ;
             "Bold italic" ;
         };
-    StringList [ language_user1 ] =
-    {
-         "Normal" ;
-         "Kursiv" ;
-         "Fett" ;
-         "Fett Kursiv" ;
-    };
-    StringList [ portuguese ] =
-    {
-         "Normal" ;
-         "It�lico" ;
-         "Negrito" ;
-         "It�lico negrito" ;
-    };
-    StringList [ russian ] =
-    {
-         "�������" ;
-         "������" ;
-         "������" ;
-         "������ ������" ;
-    };
-    StringList [ greek ] =
-    {
-         "��������" ;
-         "������" ;
-         "������" ;
-         "������ ������" ;
-    };
-    StringList [ dutch ] =
-    {
-         "Normaal" ;
-         "Cursief" ;
-         "Vet" ;
-         "Vet cursief" ;
-    };
-    StringList [ french ] =
-    {
-         "Normal" ;
-         "Italique" ;
-         "Gras" ;
-         "Italique gras" ;
-    };
-    StringList [ spanish ] =
-    {
-         "Normal" ;
-         "Cursiva" ;
-         "Negrita" ;
-         "Negrita cursiva" ;
-    };
-    StringList [ italian ] =
-    {
-         "Normale" ;
-         "Corsivo" ;
-         "Grassetto" ;
-         "Grassetto corsivo" ;
-    };
-    StringList [ danish ] =
-    {
-         "Normal" ;
-         "Kursiv" ;
-         "Fed" ;
-         "Fed kursiv" ;
-    };
-    StringList [ swedish ] =
-    {
-         "Normal" ;
-         "Kursiv" ;
-         "Fet" ;
-         "Fet kursiv" ;
-    };
-    StringList [ polish ] =
-    {
-         "Zwyk�a" ;
-         "Kursywa" ;
-         "Pogrubienie" ;
-         "Pogrubiona kursywa" ;
-    };
-    StringList [ portuguese_brazilian ] =
-    {
-         "Normal" ;
-         "Kursiv" ;
-         "Fett" ;
-         "Fett Kursiv" ;
-    };
-    StringList [ japanese ] =
-    {
-         "�W��" ;
-         "�Α�" ;
-         "����" ;
-         "�����Α�" ;
-    };
-    StringList [ korean ] =
-    {
-         "����" ;
-         "���Ÿ�ü" ;
-         "����" ;
-         "���Ÿ�ü (����)" ;
-    };
-    StringList [ chinese_simplified ] =
-    {
-         "��ͨ" ;
-         "�" ;
-         "����" ;
-         "���" ;
-    };
-    StringList [ chinese_traditional ] =
-    {
-         "���q" ;
-         "����" ;
-         "����" ;
-         "�ʱ���" ;
-    };
-    StringList [ turkish ] =
-    {
-         "Normal" ;
-         "�talik" ;
-         "Kal�n" ;
-         "Kal�n italik" ;
-    };
-    StringList [ arabic ] =
-    {
-         "����" ;
-         "����" ;
-         "����" ;
-         "���� ����" ;
-    };
-    StringList [ catalan ] =
-    {
-         "Normal" ;
-         "Cursiva" ;
-         "Negrita" ;
-         "Negrita cursiva" ;
-    };
-    StringList [ finnish ] =
-    {
-            < "Normaali" ;
-        < "Kursivointi" ;
-        < "Lihavointi" ;
-        < "Lihavointi ja kursivointi" ;
-    };
+        StringList [ language_user1 ] =
+        {
+            "Normal" ;
+            "Kursiv" ;
+            "Fett" ;
+            "Fett Kursiv" ;
+        };
+        StringList [ portuguese ] =
+        {
+            "Normal" ;
+            "It�lico" ;
+            "Negrito" ;
+            "It�lico negrito" ;
+        };
+        StringList [ russian ] =
+        {
+            "�������" ;
+            "������" ;
+            "������" ;
+            "������ ������" ;
+        };
+        StringList [ greek ] =
+        {
+            "��������" ;
+            "������" ;
+            "������" ;
+            "������ ������" ;
+        };
+        StringList [ dutch ] =
+        {
+            "Normaal" ;
+            "Cursief" ;
+            "Vet" ;
+            "Vet cursief" ;
+        };
+        StringList [ french ] =
+        {
+            "Normal" ;
+            "Italique" ;
+            "Gras" ;
+            "Italique gras" ;
+        };
+        StringList [ spanish ] =
+        {
+            "Normal" ;
+            "Cursiva" ;
+            "Negrita" ;
+            "Negrita cursiva" ;
+        };
+        StringList [ italian ] =
+        {
+            "Normale" ;
+            "Corsivo" ;
+            "Grassetto" ;
+            "Grassetto corsivo" ;
+        };
+        StringList [ danish ] =
+        {
+            "Normal" ;
+            "Kursiv" ;
+            "Fed" ;
+            "Fed kursiv" ;
+        };
+        StringList [ swedish ] =
+        {
+            "Normal" ;
+            "Kursiv" ;
+            "Fet" ;
+            "Fet kursiv" ;
+        };
+        StringList [ polish ] =
+        {
+            "Zwyk�a" ;
+            "Kursywa" ;
+            "Pogrubienie" ;
+            "Pogrubiona kursywa" ;
+        };
+        StringList [ portuguese_brazilian ] =
+        {
+            "Normal" ;
+            "Kursiv" ;
+            "Fett" ;
+            "Fett Kursiv" ;
+        };
+        StringList [ japanese ] =
+        {
+            "�W��" ;
+            "�Α�" ;
+            "����" ;
+            "�����Α�" ;
+        };
+        StringList [ korean ] =
+        {
+            "����" ;
+            "���Ÿ�ü" ;
+            "����" ;
+            "���Ÿ�ü (����)" ;
+        };
+        StringList [ chinese_simplified ] =
+        {
+            "��ͨ" ;
+            "�" ;
+            "����" ;
+            "���" ;
+        };
+        StringList [ chinese_traditional ] =
+        {
+            "���q" ;
+            "����" ;
+            "����" ;
+            "�ʱ���" ;
+        };
+        StringList [ turkish ] =
+        {
+            "Normal" ;
+            "�talik" ;
+            "Kal�n" ;
+            "Kal�n italik" ;
+        };
+        StringList [ arabic ] =
+        {
+            "����" ;
+            "����" ;
+            "����" ;
+            "���� ����" ;
+        };
+        StringList [ catalan ] =
+        {
+            "Normal" ;
+            "Cursiva" ;
+            "Negrita" ;
+            "Negrita cursiva" ;
+        };
+        StringList [ finnish ] =
+        {
+            "Normaali" ;
+            "Kursivointi" ;
+            "Lihavointi" ;
+            "Lihavointi ja kursivointi" ;
+        };
     };
     FixedText FT_EAST_SIZE
     {
-        Pos = MAP_APPFONT ( 149 , 62  );
-        Size = MAP_APPFONT ( 40 , 10 );
+        Pos = MAP_APPFONT ( 144 , 54  );
+        Size = MAP_APPFONT ( 38 , 10 );
         Text = "Schrif~tgrad";
         Text [ english_us ] = "Size";
         Text[ portuguese ] = "~Tamanho";
@@ -3133,15 +3133,15 @@ TabPage RID_SVXPAGE_CHAR_NAME
     MetricBox LB_EAST_SIZE
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 149 , 74  );
-        Size = MAP_APPFONT ( 40 , 48 );
+        Pos = MAP_APPFONT ( 144 , 65  );
+        Size = MAP_APPFONT ( 38 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
     };
     FixedText FT_EAST_LANG
     {
-        Pos = MAP_APPFONT ( 195 , 62  );
-        Size = MAP_APPFONT ( 58 , 10 );
+        Pos = MAP_APPFONT ( 188 , 54  );
+        Size = MAP_APPFONT ( 66 , 10 );
         Text = "Sprach~e";
         Text [ english_us ] = "Language";
         Text[ portuguese ] = "~L�ngua";
@@ -3167,43 +3167,17 @@ TabPage RID_SVXPAGE_CHAR_NAME
     ListBox LB_EAST_LANG
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 195 , 74  );
-        Size = MAP_APPFONT ( 58 , 48 );
+        Pos = MAP_APPFONT ( 188 , 65  );
+        Size = MAP_APPFONT ( 66 , 48 );
         TabStop = TRUE;
         Sort = TRUE ;
         DropDown = TRUE;
     };
-    FixedLine FL_CHAR_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 4 , 97  );
-        Size = MAP_APPFONT ( 252 , 8 );
-        Text = "Vorschau";
-        Text [ english_us ] = "Preview";
-        Text[ portuguese ] = "Previsualizar";
-        Text[ russian ] = "��������";
-        Text[ greek ] = "�������������";
-        Text[ dutch ] = "Voorbeeld";
-        Text[ french ] = "Aper�u";
-        Text[ spanish ] = "Previsualizaci�n";
-        Text[ italian ] = "Anteprima";
-        Text[ danish ] = "Preview";
-        Text[ swedish ] = "F�rhandsvisning";
-        Text[ polish ] = "Podgl�d";
-        Text[ portuguese_brazilian ] = "Preview";
-        Text[ japanese ] = "����ޭ�";
-        Text[ korean ] = "�̸�����";
-        Text[ chinese_simplified ] = "Ԥ��";
-        Text[ chinese_traditional ] = "�w��";
-        Text[ turkish ] = "Preview";
-        Text[ arabic ] = "��������";
-        Text[ catalan ] = "Previsualizaci�n";
-        Text[ finnish ] = "Esikatselu";
-    };
     Window WIN_CHAR_PREVIEW
     {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 7 , 108  ) ;
-        Size = MAP_APPFONT ( 181 , 59 ) ;
+        Border = FALSE ;
+        Pos = MAP_APPFONT ( 6 , 129  ) ;
+        Size = MAP_APPFONT ( 248 , 39 ) ;
         Text = "Beispiel";
         Text [ english_us ] = "Example";
         Text[ portuguese ] = "Exemplo";
@@ -3228,17 +3202,41 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     FixedText FT_CHAR_FONTTYPE
     {
-        Pos = MAP_APPFONT ( 7 , 169  ) ;
-        Size = MAP_APPFONT ( 246 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 171  ) ;
+        Size = MAP_APPFONT ( 248 , 10 ) ;
     };
-    FixedLine FL_SEPARATE
+    FixedLine FL_COLOR2
     {
-        Pos = MAP_APPFONT ( 190 , 108  );
-        Size = MAP_APPFONT ( 3 , 55 );
+        Pos = MAP_APPFONT ( 6 , 83 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Farbe" ;
+        Text [ ENGLISH ] = "Color" ;
+        Text [ norwegian ] = "Color" ;
+        Text [ italian ] = "Colore" ;
+        Text [ portuguese_brazilian ] = "Cor" ;
+        Text [ portuguese ] = "Cor" ;
+        Text [ finnish ] = "V�ri" ;
+        Text [ danish ] = "Farve" ;
+        Text [ french ] = "Couleur" ;
+        Text [ swedish ] = "F�rg" ;
+        Text [ dutch ] = "Kleur" ;
+        Text [ spanish ] = "Color" ;
+        Text [ english_us ] = "Color" ;
+        Text[ chinese_simplified ] = "��ɫ";
+        Text[ russian ] = "����";
+        Text[ polish ] = "Kolor";
+        Text[ japanese ] = "�F";
+        Text[ chinese_traditional ] = "�C��";
+        Text[ arabic ] = "�����";
+        Text[ greek ] = "�����";
+        Text[ korean ] = "��";
+        Text[ turkish ] = "Renk";
+        Text[ language_user1 ] = " ";
+        Text[ catalan ] = "Color";
     };
     FixedText FT_COLOR2
     {
-        Pos = MAP_APPFONT ( 195 , 108  );
+        Pos = MAP_APPFONT ( 12 , 94  );
         Size = MAP_APPFONT ( 58 , 10 );
         Text = "Schriftfar~be";
         Text [ english_us ] = "Font ~Color" ;
@@ -3265,7 +3263,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     ListBox LB_COLOR2
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 195 , 120  );
+        Pos = MAP_APPFONT ( 12 , 105  );
         Size = MAP_APPFONT ( 58 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
@@ -3358,7 +3356,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     ListBox LB_UNDERLINE
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 15  );
+        Pos = MAP_APPFONT ( 6 , 14  );
         Size = MAP_APPFONT ( 68 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
@@ -3832,14 +3830,14 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     ListBox LB_UNDERLINE_COLOR
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 80 , 15  );
+        Pos = MAP_APPFONT ( 80 , 14  );
         Size = MAP_APPFONT ( 68 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
     };
     FixedText FT_STRIKEOUT
     {
-        Pos = MAP_APPFONT ( 6 , 31  );
+        Pos = MAP_APPFONT ( 6 , 32  );
         Size = MAP_APPFONT ( 68 , 10 );
         Text = "~Durchstreichung";
         Text [ english_us ] = "Strikethrough" ;
@@ -4071,7 +4069,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     CheckBox CB_INDIVIDUALWORDS
     {
-        Pos = MAP_APPFONT ( 80 , 43  );
+        Pos = MAP_APPFONT ( 80 , 45  );
         Size = MAP_APPFONT ( 68 , 10 );
         Text = "~Wortweise";
         Text [ english_us ] = "Individual ~words" ;
@@ -4098,7 +4096,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     FixedText FT_EMPHASIS
     {
-        Pos = MAP_APPFONT ( 6 , 59  );
+        Pos = MAP_APPFONT ( 6 , 61  );
         Size = MAP_APPFONT ( 68 , 10 );
         Text = "~Betonungszeichen";
         Text [ english_us ] = "Emp~hasis mark" ;
@@ -4125,7 +4123,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     ListBox LB_EMPHASIS
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 71  );
+        Pos = MAP_APPFONT ( 6 , 72  );
         Size = MAP_APPFONT ( 68 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
@@ -4316,7 +4314,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     FixedText FT_POSITION
     {
-        Pos = MAP_APPFONT ( 80 , 59  );
+        Pos = MAP_APPFONT ( 80 , 61  );
         Size = MAP_APPFONT ( 68 , 10 );
         Text = "~Position";
         Text [ english_us ] = "Position" ;
@@ -4343,7 +4341,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     ListBox LB_POSITION
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 80 , 71  );
+        Pos = MAP_APPFONT ( 80 , 72  );
         Size = MAP_APPFONT ( 68 , 48 );
         TabStop = TRUE;
         DropDown = TRUE;
@@ -4486,7 +4484,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_EFFECTS2
     {
-        Pos = MAP_APPFONT ( 166 , 15  ) ;
+        Pos = MAP_APPFONT ( 166 , 14  ) ;
         Size = MAP_APPFONT ( 88 , 56 ) ;
         DropDown = TRUE;
         StringList =
@@ -4668,7 +4666,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     FixedText FT_RELIEF
     {
-        Pos = MAP_APPFONT ( 166 , 31  );
+        Pos = MAP_APPFONT ( 166 , 32  );
         Size = MAP_APPFONT ( 88 , 8 );
         Text = "~Relief" ;
         Text [ ENGLISH ] = "Relief" ;
@@ -4839,7 +4837,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     TriStateBox CB_OUTLINE
     {
-        Pos = MAP_APPFONT ( 166 , 59  ) ;
+        Pos = MAP_APPFONT ( 166 , 61  ) ;
         Size = MAP_APPFONT ( 88 , 10 ) ;
         Text = "~Kontur" ;
         Text [ english_us ] = "Outline" ;
@@ -4865,7 +4863,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     TriStateBox CB_SHADOW
     {
-        Pos = MAP_APPFONT ( 166 , 72  ) ;
+        Pos = MAP_APPFONT ( 166 , 75  ) ;
         Size = MAP_APPFONT ( 88 , 10 ) ;
         Text = "~Schatten" ;
         Text [ english_us ] = "Shadow" ;
@@ -4891,7 +4889,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     CheckBox CB_BLINKING
     {
-        Pos = MAP_APPFONT ( 166 , 85  ) ;
+        Pos = MAP_APPFONT ( 166 , 89  ) ;
         Size = MAP_APPFONT ( 88 , 10 ) ;
         Hide = TRUE;
         Text = "B~linkend" ;
@@ -4916,37 +4914,11 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
         Text[ catalan ] = "Intermitente";
         Text[ finnish ] = "~Vilkkuva";
     };
-    FixedLine FL_EFFECTS_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 4 , 97  );
-        Size = MAP_APPFONT ( 252 , 8 );
-        Text = "Vorschau";
-        Text [ english_us ] = "Preview" ;
-        Text[ portuguese ] = "Previsualizar";
-        Text[ russian ] = "��������";
-        Text[ greek ] = "�������������";
-        Text[ dutch ] = "Voorbeeld";
-        Text[ french ] = "Aper�u";
-        Text[ spanish ] = "Previsualizaci�n";
-        Text[ italian ] = "Anteprima";
-        Text[ danish ] = "Preview";
-        Text[ swedish ] = "F�rhandsvisning";
-        Text[ polish ] = "Podgl�d";
-        Text[ portuguese_brazilian ] = "Preview";
-        Text[ japanese ] = "����ޭ�";
-        Text[ korean ] = "�̸�����";
-        Text[ chinese_simplified ] = "Ԥ��";
-        Text[ chinese_traditional ] = "�w��";
-        Text[ turkish ] = "Preview";
-        Text[ arabic ] = "��������";
-        Text[ catalan ] = "Previsualizaci�n";
-        Text[ finnish ] = "Esikatselu";
-    };
     Window WIN_EFFECTS_PREVIEW
     {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 7 , 108  ) ;
-        Size = MAP_APPFONT ( 246 , 59 ) ;
+        Border = FALSE ;
+        Pos = MAP_APPFONT ( 6 , 129  ) ;
+        Size = MAP_APPFONT ( 248 , 39 ) ;
         Text = "Beispiel";
         Text [ english_us ] = "Example";
         Text[ portuguese ] = "Exemplo";
@@ -4971,8 +4943,8 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     FixedText FT_EFFECTS_FONTTYPE
     {
-        Pos = MAP_APPFONT ( 7 , 169  ) ;
-        Size = MAP_APPFONT ( 246 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 171  ) ;
+        Size = MAP_APPFONT ( 248 , 10 ) ;
     };
     String STR_EFFECTS_CAPITALS
     {
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 84d8b08e2037..e75c2284a883 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fntctrl.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-12-04 15:34:19 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -145,6 +145,11 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) :
     aFont.SetTransparent(TRUE);
     aFont.SetAlign(ALIGN_BASELINE);
     InitSettings( TRUE, TRUE );
+
+    aWinSize = PixelToLogic( GetOutputSizePixel() );
+    Size aTemp( PixelToLogic( Size( 1, 1 ) ) );
+    aWinSize.Width() -= aTemp.Width() / 2;
+    aWinSize.Height() -= aTemp.Height() / 2;
 }
 
 // -----------------------------------------------------------------------
@@ -321,6 +326,9 @@ void SvxFontPrevWindow::Paint( const Rectangle& rRect )
         aFont.DrawPrev( this, pPrinter, Point( nX, nY ), pImpl->aText );
     }
 
+    SetLineColor( Color( COL_BLACK ) );
+    SetFillColor( Color( COL_TRANSPARENT ) );
+    DrawRect( Rectangle( Point(), aWinSize ) );
 }
 /* -----------------------------04.12.00 16:26--------------------------------
 
diff --git a/svx/source/dialog/numfmt.cxx b/svx/source/dialog/numfmt.cxx
index 3a2df5d10493..c86ad837ccd5 100644
--- a/svx/source/dialog/numfmt.cxx
+++ b/svx/source/dialog/numfmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmt.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: er $ $Date: 2001-03-28 10:34:49 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -201,6 +201,9 @@ void SvxNumberPreviewImpl::Paint( const Rectangle& rRect )
     aDrawFont.SetColor( aPrevCol );
     SetFont( aDrawFont );
     DrawText( aPosText, aPrevStr );
+    SetLineColor( Color( COL_BLACK ) );
+    SetFillColor( Color( COL_TRANSPARENT ) );
+    DrawRect( Rectangle( Point(), aSzWnd ) );
 }
 
 // -----------------------------------------------------------------------
@@ -282,7 +285,6 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
 
     :   SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_NUMBERFORMAT ), rCoreAttrs ),
 
-        aFtPreview      ( this, ResId( FT_PREVIEW ) ),
         aWndPreview     ( this, ResId( WND_NUMBER_PREVIEW ) ),
         aFtCategory     ( this, ResId( FT_CATEGORY ) ),
         aLbCategory     ( this, ResId( LB_CATEGORY ) ),
@@ -303,7 +305,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
         aEdDecimals     ( this, ResId( ED_DECIMALS ) ),
         aFtLanguage     ( this, ResId( FT_LANGUAGE ) ),
         aLbLanguage     ( this, ResId( LB_LANGUAGE ), FALSE ),
-        aGbOptions      ( this, ResId( GB_OPTIONS ) ),
+        aFlOptions      ( this, ResId( FL_OPTIONS ) ),
         aFtComment      ( this, ResId( FT_COMMENT ) ),
         aStrEurope      ( ResId( STR_EUROPE) ),
         aIconList       ( ResId( IL_ICON ) ),
@@ -674,7 +676,7 @@ void SvxNumberFormatTabPage::Obstructing()
     aFtDecimals     .Disable();
     aEdLeadZeroes   .Disable();
     aEdDecimals     .Disable();
-    aGbOptions      .Disable();
+    aFlOptions      .Disable();
     aEdDecimals     .SetText( String() );
     aEdLeadZeroes   .SetText( String() );
     aBtnNegRed      .Check( FALSE );
@@ -1100,7 +1102,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE*
         case CAT_NUMBER:
         case CAT_PERCENT:
         case CAT_CURRENCY:
-            aGbOptions.Enable();
+            aFlOptions.Enable();
             aFtDecimals.Enable();
             aEdDecimals.Enable();
             aFtLeadZeroes.Enable();
@@ -1126,7 +1128,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE*
         case CAT_SCIENTIFIC:
         case CAT_FRACTION:
         default:
-            aGbOptions      .Disable();
+            aFlOptions      .Disable();
             aFtDecimals     .Disable();
             aEdDecimals     .Disable();
             aFtLeadZeroes   .Disable();
diff --git a/svx/source/dialog/numfmt.hrc b/svx/source/dialog/numfmt.hrc
index fe9c63718c8a..3dcfc7cf9c6a 100644
--- a/svx/source/dialog/numfmt.hrc
+++ b/svx/source/dialog/numfmt.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmt.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:10 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,10 +64,6 @@
 // defines ------------------------------------------------------------------
 
 //================================================
-// allgemein:
-#define FT_PREVIEW              100
-
-//================================================
 // Zahlen-TabPage:
 #define WND_NUMBER_PREVIEW      2
 #define FT_CATEGORY             3
@@ -76,7 +72,7 @@
 #define FT_EDFORMAT             6
 #define LB_CATEGORY             9
 #define LB_FORMAT               10
-#define GB_OPTIONS              11
+#define FL_OPTIONS              11
 #define FT_LANGUAGE             12
 #define LB_LANGUAGE             13
 #define ED_FORMAT               14
diff --git a/svx/source/dialog/numfmt.src b/svx/source/dialog/numfmt.src
index da98c9e35ad6..a58a9708078e 100644
--- a/svx/source/dialog/numfmt.src
+++ b/svx/source/dialog/numfmt.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmt.src,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-10 07:09:58 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,8 +115,8 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     ListBox LB_CATEGORY
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 13  ) ;
-        Size = MAP_APPFONT ( 70 , 72 ) ;
+        Pos = MAP_APPFONT ( 6 , 14 ) ;
+        Size = MAP_APPFONT ( 70 , 71 ) ;
         AutoHScroll = TRUE ;
         StringList =
         {
@@ -357,109 +357,109 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
             < "�_���l" ; Default ; > ;
             < "÷��" ; Default ; > ;
         };
-    StringList [ chinese_traditional ] =
-    {
-            < "����" ; Default ; > ;
-        < "�ϥΪ̦ۭq" ; Default ; > ;
-        < "�Ʀr" ; Default ; > ;
-        < "�ʤ���" ; Default ; > ;
-        < "�f��" ; Default ; > ;
-        < "���" ; Default ; > ;
-        < "�ɶ�" ; Default ; > ;
-        < "���" ; Default ; > ;
-        < "����" ; Default ; > ;
-        < "�����" ; Default ; > ;
-        < "��r" ; Default ; > ;
-    };
-    StringList [ arabic ] =
-    {
-            < "����" ; Default ; > ;
-        < "���� �� ��� ��������" ; Default ; > ;
-        < "���" ; Default ; > ;
-        < "�� �����" ; Default ; > ;
-        < "����" ; Default ; > ;
-        < "�������" ; Default ; > ;
-        < "�����" ; Default ; > ;
-        < "���" ; Default ; > ;
-        < "���" ; Default ; > ;
-        < "���� ������" ; Default ; > ;
-        < "��" ; Default ; > ;
-    };
-    StringList [ greek ] =
-    {
-            < "���" ; Default ; > ;
-        < "�������������" ; Default ; > ;
-        < "�������" ; Default ; > ;
-        < "������� (%)" ; Default ; > ;
-        < "�������" ; Default ; > ;
-        < "����������" ; Default ; > ;
-        < "���" ; Default ; > ;
-        < "��������" ; Default ; > ;
-        < "������" ; Default ; > ;
-        < "������ ����" ; Default ; > ;
-        < "�������" ; Default ; > ;
-    };
-    StringList [ korean ] =
-    {
-            < "���" ; Default ; > ;
-        < "����� ����" ; Default ; > ;
-        < "��" ; Default ; > ;
-        < "�ۼ�Ʈ" ; Default ; > ;
-        < "��ȭ" ; Default ; > ;
-        < "��¥" ; Default ; > ;
-        < "�ð�" ; Default ; > ;
-        < "����" ; Default ; > ;
-        < "�м�" ; Default ; > ;
-        < "�� ��" ; Default ; > ;
-        < "�ؽ�Ʈ" ; Default ; > ;
-    };
-    StringList [ turkish ] =
-    {
-            < "T�m�" ; Default ; > ;
-        < "Kullan�c� tan�ml�" ; Default ; > ;
-        < "Say�" ; Default ; > ;
-        < "Y�zde" ; Default ; > ;
-        < "Para birimi" ; Default ; > ;
-        < "Tarih" ; Default ; > ;
-        < "Saat" ; Default ; > ;
-        < "Bilimsel" ; Default ; > ;
-        < "Kesir" ; Default ; > ;
-        < "Mant�ksal de�er" ; Default ; > ;
-        < "Metin" ; Default ; > ;
-    };
-    StringList [ language_user1 ] =
-    {
+        StringList [ chinese_traditional ] =
+        {
+                < "����" ; Default ; > ;
+            < "�ϥΪ̦ۭq" ; Default ; > ;
+            < "�Ʀr" ; Default ; > ;
+            < "�ʤ���" ; Default ; > ;
+            < "�f��" ; Default ; > ;
+            < "���" ; Default ; > ;
+            < "�ɶ�" ; Default ; > ;
+            < "���" ; Default ; > ;
+            < "����" ; Default ; > ;
+            < "�����" ; Default ; > ;
+            < "��r" ; Default ; > ;
+        };
+        StringList [ arabic ] =
+        {
+                < "����" ; Default ; > ;
+            < "���� �� ��� ��������" ; Default ; > ;
+            < "���" ; Default ; > ;
+            < "�� �����" ; Default ; > ;
+            < "����" ; Default ; > ;
+            < "�������" ; Default ; > ;
+            < "�����" ; Default ; > ;
+            < "���" ; Default ; > ;
+            < "���" ; Default ; > ;
+            < "���� ������" ; Default ; > ;
+            < "��" ; Default ; > ;
+        };
+        StringList [ greek ] =
+        {
+                < "���" ; Default ; > ;
+            < "�������������" ; Default ; > ;
+            < "�������" ; Default ; > ;
+            < "������� (%)" ; Default ; > ;
+            < "�������" ; Default ; > ;
+            < "����������" ; Default ; > ;
+            < "���" ; Default ; > ;
+            < "��������" ; Default ; > ;
+            < "������" ; Default ; > ;
+            < "������ ����" ; Default ; > ;
+            < "�������" ; Default ; > ;
+        };
+        StringList [ korean ] =
+        {
+                < "���" ; Default ; > ;
+            < "����� ����" ; Default ; > ;
+            < "��" ; Default ; > ;
+            < "�ۼ�Ʈ" ; Default ; > ;
+            < "��ȭ" ; Default ; > ;
+            < "��¥" ; Default ; > ;
+            < "�ð�" ; Default ; > ;
+            < "����" ; Default ; > ;
+            < "�м�" ; Default ; > ;
+            < "�� ��" ; Default ; > ;
+            < "�ؽ�Ʈ" ; Default ; > ;
+        };
+        StringList [ turkish ] =
+        {
+                < "T�m�" ; Default ; > ;
+            < "Kullan�c� tan�ml�" ; Default ; > ;
+            < "Say�" ; Default ; > ;
+            < "Y�zde" ; Default ; > ;
+            < "Para birimi" ; Default ; > ;
+            < "Tarih" ; Default ; > ;
+            < "Saat" ; Default ; > ;
+            < "Bilimsel" ; Default ; > ;
+            < "Kesir" ; Default ; > ;
+            < "Mant�ksal de�er" ; Default ; > ;
+            < "Metin" ; Default ; > ;
+        };
+        StringList [ language_user1 ] =
+        {
+                < " " ; Default ; > ;
             < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-        < " " ; Default ; > ;
-    };
-    StringList [ catalan ] =
-    {
-            < "Todos" ; Default ; > ;
-        < "Definido por el usuario" ; Default ; > ;
-        < "N�mero" ; Default ; > ;
-        < "Porcentaje" ; Default ; > ;
-        < "Moneda" ; Default ; > ;
-        < "Fecha" ; Default ; > ;
-        < "Hora" ; Default ; > ;
-        < "Ciencia" ; Default ; > ;
-        < "Fracci�n" ; Default ; > ;
-        < "Valor l�gico" ; Default ; > ;
-        < "Texto" ; Default ; > ;
-    };
+            < " " ; Default ; > ;
+            < " " ; Default ; > ;
+            < " " ; Default ; > ;
+            < " " ; Default ; > ;
+            < " " ; Default ; > ;
+            < " " ; Default ; > ;
+            < " " ; Default ; > ;
+            < " " ; Default ; > ;
+            < " " ; Default ; > ;
+        };
+        StringList [ catalan ] =
+        {
+                < "Todos" ; Default ; > ;
+            < "Definido por el usuario" ; Default ; > ;
+            < "N�mero" ; Default ; > ;
+            < "Porcentaje" ; Default ; > ;
+            < "Moneda" ; Default ; > ;
+            < "Fecha" ; Default ; > ;
+            < "Hora" ; Default ; > ;
+            < "Ciencia" ; Default ; > ;
+            < "Fracci�n" ; Default ; > ;
+            < "Valor l�gico" ; Default ; > ;
+            < "Texto" ; Default ; > ;
+        };
     };
     FixedText FT_EDFORMAT
     {
-        Pos = MAP_APPFONT ( 6 , 141  ) ;
-        Size = MAP_APPFONT ( 167 , 8 ) ;
+        Pos = MAP_APPFONT ( 6 , 136 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Format-~Code" ;
         Text [ ENGLISH ] = "Format-~Description" ;
         Text [ norwegian ] = "Format-~Beskrivelse" ;
@@ -488,12 +488,12 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     Edit ED_FORMAT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 151  ) ;
-        Size = MAP_APPFONT ( 199 , 12 ) ;
+        Pos = MAP_APPFONT ( 6 , 147 ) ;
+        Size = MAP_APPFONT ( 200 , 12 ) ;
     };
     FixedText FT_COMMENT
     {
-        Pos = MAP_APPFONT ( 6 , 167  ) ;
+        Pos = MAP_APPFONT ( 6 , 163 ) ;
         Size = MAP_APPFONT ( 248 , 16 ) ;
         WordBreak = TRUE ;
     };
@@ -501,13 +501,13 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     {
         Hide = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 167  ) ;
+        Pos = MAP_APPFONT ( 6 , 163 ) ;
         Size = MAP_APPFONT ( 248 , 12 ) ;
     };
     FixedText FT_FORMAT
     {
         Pos = MAP_APPFONT ( 82 , 3 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Size = MAP_APPFONT ( 90 , 8 ) ;
         Text = "~Format" ;
         Text [ ENGLISH ] = "~Format" ;
         Text [ norwegian ] = "~Format" ;
@@ -537,119 +537,116 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     ListBox LB_CURRENCY
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 82 , 13  ) ;
+        Pos = MAP_APPFONT ( 82 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 71 ) ;
         DropDown = TRUE ;
         TabStop = TRUE ;
-
         StringList=
         {
             < "Automatisch" ; Default ; > ;
         };
-
         StringList[ENGLISH]=
         {
             < "Automatisch" ; Default ; > ;
         };
-
-    StringList [ language_user1 ] =
-    {
-             < " " ; Default ; > ;
-    };
-    StringList [ english_us ] =
-    {
-             < "Automatically" ; Default ; > ;
-    };
-    StringList [ portuguese ] =
-    {
-             < "Autom�tico" ; Default ; > ;
-    };
-    StringList [ russian ] =
-    {
-             < "�������������" ; Default ; > ;
-    };
-    StringList [ dutch ] =
-    {
-             < "Automatisch" ; Default ; > ;
-    };
-    StringList [ french ] =
-    {
-             < "Automatique" ; Default ; > ;
-    };
-    StringList [ spanish ] =
-    {
-             < "Autom�tico" ; Default ; > ;
-    };
-    StringList [ italian ] =
-    {
-             < "Automatico" ; Default ; > ;
-    };
-    StringList [ danish ] =
-    {
-             < "Automatisk" ; Default ; > ;
-    };
-    StringList [ swedish ] =
-    {
-             < "Automatisk" ; Default ; > ;
-    };
-    StringList [ polish ] =
-    {
-             < "Automatycznie" ; Default ; > ;
-    };
-    StringList [ portuguese_brazilian ] =
-    {
-             < "Automatisch" ; Default ; > ;
-    };
-    StringList [ japanese ] =
-    {
-             < "����" ; Default ; > ;
-    };
-    StringList [ chinese_simplified ] =
-    {
-             < "�Զ�" ; Default ; > ;
-    };
-    StringList [ chinese_traditional ] =
-    {
-             < "�۰�" ; Default ; > ;
-    };
-    StringList [ arabic ] =
-    {
-             < "������" ; Default ; > ;
-    };
-    StringList [ greek ] =
-    {
-             < "��������" ; Default ; > ;
-    };
-    StringList [ korean ] =
-    {
-             < "�ڵ�����" ; Default ; > ;
-    };
-    StringList [ turkish ] =
-    {
-             < "Otomatik" ; Default ; > ;
-    };
-    StringList [ catalan ] =
-    {
-             < "Autom�tico" ; Default ; > ;
-    };
-    StringList [ finnish ] =
-    {
-             < "Automaattisesti" ; Default ; > ;
-    };
+        StringList [ language_user1 ] =
+        {
+                < " " ; Default ; > ;
+        };
+        StringList [ english_us ] =
+        {
+                < "Automatically" ; Default ; > ;
+        };
+        StringList [ portuguese ] =
+        {
+                < "Autom�tico" ; Default ; > ;
+        };
+        StringList [ russian ] =
+        {
+                < "�������������" ; Default ; > ;
+        };
+        StringList [ dutch ] =
+        {
+                < "Automatisch" ; Default ; > ;
+        };
+        StringList [ french ] =
+        {
+                < "Automatique" ; Default ; > ;
+        };
+        StringList [ spanish ] =
+        {
+                < "Autom�tico" ; Default ; > ;
+        };
+        StringList [ italian ] =
+        {
+                < "Automatico" ; Default ; > ;
+        };
+        StringList [ danish ] =
+        {
+                < "Automatisk" ; Default ; > ;
+        };
+        StringList [ swedish ] =
+        {
+                < "Automatisk" ; Default ; > ;
+        };
+        StringList [ polish ] =
+        {
+                < "Automatycznie" ; Default ; > ;
+        };
+        StringList [ portuguese_brazilian ] =
+        {
+                < "Automatisch" ; Default ; > ;
+        };
+        StringList [ japanese ] =
+        {
+                < "����" ; Default ; > ;
+        };
+        StringList [ chinese_simplified ] =
+        {
+                < "�Զ�" ; Default ; > ;
+        };
+        StringList [ chinese_traditional ] =
+        {
+                < "�۰�" ; Default ; > ;
+        };
+        StringList [ arabic ] =
+        {
+                < "������" ; Default ; > ;
+        };
+        StringList [ greek ] =
+        {
+                < "��������" ; Default ; > ;
+        };
+        StringList [ korean ] =
+        {
+                < "�ڵ�����" ; Default ; > ;
+        };
+        StringList [ turkish ] =
+        {
+                < "Otomatik" ; Default ; > ;
+        };
+        StringList [ catalan ] =
+        {
+                < "Autom�tico" ; Default ; > ;
+        };
+        StringList [ finnish ] =
+        {
+                < "Automaattisesti" ; Default ; > ;
+        };
     };
 
     Control LB_FORMAT
     {
         HelpId = HID_NUMBERFORMAT_LB_FORMAT ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 82 , 29  ) ;
-        Size = MAP_APPFONT ( 90 , 56 ) ;
+        Pos = MAP_APPFONT ( 82 , 27 ) ;
+        Size = MAP_APPFONT ( 90 , 58 ) ;
         TabStop = TRUE ;
     };
 
     FixedText FT_DECIMALS
     {
-        Pos = MAP_APPFONT ( 12 , 103  ) ;
+        Pos = MAP_APPFONT ( 12 , 104 ) ;
         Size = MAP_APPFONT ( 69 , 8 ) ;
         Text = "N~achkommastellen" ;
         Text [ ENGLISH ] = "~Precision" ;
@@ -679,7 +676,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     NumericField ED_DECIMALS
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 84 , 101  ) ;
+        Pos = MAP_APPFONT ( 84 , 102 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Spin = TRUE ;
         Maximum = 20 ;
@@ -691,7 +688,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     FixedText FT_LEADZEROES
     {
-        Pos = MAP_APPFONT ( 12 , 119  ) ;
+        Pos = MAP_APPFONT ( 12 , 120 ) ;
         Size = MAP_APPFONT ( 69 , 8 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? F�hrende ~Nullen : F�hrende ~Nullen */
         Text = "F�hrende ~Nullen" ;
@@ -722,7 +719,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     NumericField ED_LEADZEROES
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 84 , 117  ) ;
+        Pos = MAP_APPFONT ( 84 , 118 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Spin = TRUE ;
         Maximum = 20 ;
@@ -734,7 +731,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     CheckBox BTN_NEGRED
     {
-        Pos = MAP_APPFONT ( 133 , 102  ) ;
+        Pos = MAP_APPFONT ( 133 , 104 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text = "Negativ in ~Rot" ;
         Text [ ENGLISH ] = "~Mark negative red" ;
@@ -763,7 +760,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     CheckBox BTN_THOUSAND
     {
-        Pos = MAP_APPFONT ( 133 , 118  ) ;
+        Pos = MAP_APPFONT ( 133 , 120 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text = "~Tausenderpunkt" ;
         Text [ ENGLISH ] = "~Thousands point" ;
@@ -790,10 +787,10 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "~Separador de miles";
     };
-    GroupBox GB_OPTIONS
+    FixedLine FL_OPTIONS
     {
-        Pos = MAP_APPFONT ( 6 , 90  ) ;
-        Size = MAP_APPFONT ( 248 , 45 ) ;
+        Pos = MAP_APPFONT ( 6 , 91 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
         Text = "Optionen" ;
         Text [ ENGLISH ] = "Options" ;
         Text [ norwegian ] = "Options" ;
@@ -821,8 +818,8 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     FixedText FT_LANGUAGE
     {
-        Pos = MAP_APPFONT ( 178 , 3  ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 178 , 3 ) ;
+        Size = MAP_APPFONT ( 76 , 8 ) ;
         Text = "S~prache" ;
         Text [ ENGLISH ] = "~Language" ;
         Text [ norwegian ] = "~Language" ;
@@ -852,50 +849,21 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     {
         Border = TRUE ;
         Sort = TRUE ;
-        Pos = MAP_APPFONT ( 178 , 13  ) ;
-        Size = MAP_APPFONT ( 76 , 80 ) ;
+        Pos = MAP_APPFONT ( 178 , 14 ) ;
+        Size = MAP_APPFONT ( 76 , 71 ) ;
         DropDown = TRUE ;
     };
-    FixedText FT_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 178 , 32  ) ;
-        Size = MAP_APPFONT ( 76 , 8 ) ;
-        Text = "Vorschau" ;
-        Text [ ENGLISH ] = "Preview" ;
-        Text [ norwegian ] = "Preview" ;
-        Text [ italian ] = "Anteprima" ;
-        Text [ portuguese_brazilian ] = "Examinar" ;
-        Text [ portuguese ] = "Previsualizar" ;
-        Text [ finnish ] = "Esikatselu" ;
-        Text [ danish ] = "Eksempel" ;
-        Text [ french ] = "Aper�u" ;
-        Text [ swedish ] = "F�rhandsvisning" ;
-        Text [ dutch ] = "Voorbeeld" ;
-        Text [ spanish ] = "Previsualizaci�n" ;
-        Text [ english_us ] = "Preview" ;
-        Text[ chinese_simplified ] = "Ԥ��";
-        Text[ russian ] = "��������";
-        Text[ polish ] = "Podgl�d";
-        Text[ japanese ] = "����ޭ�";
-        Text[ chinese_traditional ] = "�w��";
-        Text[ arabic ] = "������";
-        Text[ greek ] = "�������������";
-        Text[ korean ] = "�̸� ����";
-        Text[ turkish ] = "�nizleme";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Previsualizaci�n";
-    };
     Window WND_NUMBER_PREVIEW
     {
-        Border = TRUE ;
+        Border = FALSE ;
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( 178 , 42  ) ;
+        Pos = MAP_APPFONT ( 178 , 67 ) ;
         Size = MAP_APPFONT ( 76 , 18 ) ;
     };
     ImageButton IB_ADD
     {
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( 209 , 151  ) ;
+        Pos = MAP_APPFONT ( 210 , 147 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         HelpId = HID_NUMBERFORMAT_TBI_ADD ;
         QuickHelpText = "Hinzuf�gen" ;
@@ -930,7 +898,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     ImageButton IB_REMOVE
     {
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( 242 , 151  ) ;
+        Pos = MAP_APPFONT ( 242 , 147 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         HelpId = HID_NUMBERFORMAT_TBI_REMOVE ;
         QuickHelpText = "Entfernen" ;
@@ -964,7 +932,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     ImageButton IB_INFO
     {
         SVLook = TRUE ;
-        Pos = MAP_APPFONT ( 226 , 151  ) ;
+        Pos = MAP_APPFONT ( 226 , 147 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         HelpId = HID_NUMBERFORMAT_TBI_INFO ;
         QuickHelpText = "Kommentar �ndern" ;
diff --git a/svx/source/dialog/paragrph.src b/svx/source/dialog/paragrph.src
index 57e5977df4e8..fdc2902c3ef1 100644
--- a/svx/source/dialog/paragrph.src
+++ b/svx/source/dialog/paragrph.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paragrph.src,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: os $ $Date: 2001-05-11 07:41:52 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2225,7 +2225,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     TriStateBox CB_AS_FORBIDDEN
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 240 , 10 ) ;
+        Size = MAP_APPFONT ( 242 , 10 ) ;
         Text = "~Liste der verbotenen Zeichen an Zeilenanfang und -ende ber�cksichtigen" ;
         Text [ ENGLISH ] = "Apply list of forbidden characters at line end and line start" ;
         Text[ english_us ] = "Apply list of forbidden characters to the beginning and end of lines";
@@ -2252,7 +2252,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     TriStateBox CB_AS_ALLOW_WORD_BREAK
     {
         Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 240 , 10 ) ;
+        Size = MAP_APPFONT ( 242 , 10 ) ;
         Text = "~Textumbruch innerhalb von W�tern im lateinischen Text zulassen" ;
         Text [ ENGLISH ] = "Allow break inside of words in latin text" ;
         Text[ english_us ] = "Allow ~breaks in words in Latin text";
@@ -2279,7 +2279,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     TriStateBox CB_AS_HANG_PUNC
     {
         Pos = MAP_APPFONT ( 12 , 42 ) ;
-        Size = MAP_APPFONT ( 240 , 10 ) ;
+        Size = MAP_APPFONT ( 242 , 10 ) ;
         Text = "H�ngende ~Interpunktion zulassen" ;
         Text [ ENGLISH ] = "Hanging punctuation" ;
         Text[ english_us ] = "Allow hanging punctuation";
@@ -2333,7 +2333,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     TriStateBox CB_AS_PUNCTUATION
     {
         Pos = MAP_APPFONT ( 12, 69 ) ;
-        Size = MAP_APPFONT ( 240 , 10 ) ;
+        Size = MAP_APPFONT ( 242 , 10 ) ;
         Text = "I~nterpunktion am Zeilenbeginn zum Komprimieren zulassen" ;
         Text [ ENGLISH ] = "Allow punctuation at line start" ;
         Text[ english_us ] = "Allow punctuation at line start";
@@ -2359,8 +2359,8 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     };
     TriStateBox CB_AS_SCRIPT_SPACE
     {
-        Pos = MAP_APPFONT ( 12 , 84 ) ;
-        Size = MAP_APPFONT ( 240 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 83 ) ;
+        Size = MAP_APPFONT ( 242 , 10 ) ;
         Text = "~Abstand zwischen asiatischem, lateinischem und komplexem Text anwenden" ;
         Text [ ENGLISH ] = "Apply distance between asian, latin and complex text" ;
         Text[ english_us ] = "Apply spacing between Asian, Latin and Complex text";
@@ -2387,7 +2387,7 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     TriStateBox CB_AS_ADJUST_NUMBERS
     {
         Pos = MAP_APPFONT ( 12 , 97 ) ;
-        Size = MAP_APPFONT ( 240 , 10 ) ;
+        Size = MAP_APPFONT ( 242 , 10 ) ;
         Text = "Abstan~d zwischen asiatischem Text und Zahlen automatisch anpassen" ;
         Text [ ENGLISH ] = "Automatically adjust distance between asian text and numbers" ;
         Text[ english_us ] = "Automatically adjust space between Asian text and numbers";
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 58be72225327..18a80fdafd35 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paraprev.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-05-10 14:11:10 $
+ *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,12 +114,8 @@ void SvxParaPrevWindow::Paint( const Rectangle& rRect )
 void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
 {
     SetFillColor( Color( COL_WHITE ) );
-
-    if ( bAll )
-    {
-        SetLineColor(Color( COL_BLACK) );
+    if( bAll )
         DrawRect( Rectangle( Point(), aWinSize ) );
-    }
 
     SetLineColor();
 
@@ -229,6 +225,10 @@ void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
         aPnt.X() = DEF_MARGIN / 2;
         aSiz = aLineSiz;
     }
+
+    SetLineColor( Color( COL_BLACK ) );
+    SetFillColor( Color( COL_TRANSPARENT ) );
+    DrawRect( Rectangle( Point(), aWinSize ) );
 }
 
 #undef DEF_MARGIN