#86988# dialog redesign

8 files changed, 314 insertions, 668 deletions

diff --git a/svx/source/dialog/align.cxx b/svx/source/dialog/align.cxx
index 99aee7582f4e..20ffe5d026b2 100644
--- a/svx/source/dialog/align.cxx
+++ b/svx/source/dialog/align.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: align.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-23 09:31:05 $
+ *  last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,25 +113,19 @@ SvxAlignmentTabPage::SvxAlignmentTabPage( Window* pParent,
 
     SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_ALIGNMENT ), rCoreAttrs ),
 
-    aBtnHorStd      ( this, ResId( BTN_HORSTD ) ),
-    aBtnHorLeft     ( this, ResId( BTN_HORLEFT ) ),
-    aBtnHorCenter   ( this, ResId( BTN_HORCENTER ) ),
-    aBtnHorRight    ( this, ResId( BTN_HORRIGHT ) ),
-    aBtnHorBlock    ( this, ResId( BTN_HORBLOCK ) ),
-    aIndentFT       ( this, ResId( FT_INDENT ) ),
-    aIndentED       ( this, ResId( ED_INDENT ) ),
-    aGbHorAlign     ( this, ResId( GB_HORALIGN ) ),
-
-    aBtnVerStd      ( this, ResId( BTN_VERSTD ) ),
-    aBtnVerTop      ( this, ResId( BTN_VERTOP ) ),
-    aBtnVerMid      ( this, ResId( BTN_VERMID ) ),
-    aBtnVerBot      ( this, ResId( BTN_VERBOT ) ),
-    aGbVerAlign     ( this, ResId( GB_VERALIGN ) ),
+    aFlAlignment    ( this, ResId( FL_ALIGNMENT ) ),
+    aFtHorAlign     ( this, ResId( FT_HORALIGN ) ),
+    aLbHorAlign     ( this, ResId( LB_HORALIGN ) ),
+    aFtIndent       ( this, ResId( FT_INDENT ) ),
+    aEdIndent       ( this, ResId( ED_INDENT ) ),
+    aFtVerAlign     ( this, ResId( FT_VERALIGN ) ),
+    aLbVerAlign     ( this, ResId( LB_VERALIGN ) ),
 
     aWinOrient      ( this,ResId(CTR_DIAL),ResId(BTN_TXTSTACKED),
-                        ResId(FT_DEGREES),ResId(NF_ORIENT),ResId(FT_BORDER_LOCK),
-                        ResId(CTR_BORDER_LOCK),ResId( GB_ALIGN)),   //@ 12.09.97
+                        ResId(FT_DEGREES),ResId(NF_DEGREES),ResId(FT_BORDER_LOCK),
+                        ResId(CTR_BORDER_LOCK),ResId(FL_ORIENTATION)),   //@ 12.09.97
 
+    aFlSpace        ( this, ResId( FL_SPACE ) ),
     aFtLeftSpace    ( this, ResId( FT_LEFTSPACE ) ),
     aEdLeftSpace    ( this, ResId( ED_LEFTSPACE ) ),
     aFtRightSpace   ( this, ResId( FT_RIGHTSPACE ) ),
@@ -140,18 +134,12 @@ SvxAlignmentTabPage::SvxAlignmentTabPage( Window* pParent,
     aEdTopSpace     ( this, ResId( ED_TOPSPACE ) ),
     aFtBottomSpace  ( this, ResId( FT_BOTTOMSPACE ) ),
     aEdBottomSpace  ( this, ResId( ED_BOTTOMSPACE ) ),
-    aGbSpace        ( this, ResId( GB_SPACE ) ),
 
-    aBtnWrap        ( this, ResId( BTN_WRAP ) ),
-    aWrapGB         ( this, ResId( GB_WRAP ) )
+    aFlWrap         ( this, ResId( FL_WRAP ) ),
+    aBtnWrap        ( this, ResId( BTN_WRAP ) )
 
 {
-    Link aLink = LINK( this, SvxAlignmentTabPage, HorizontalClickHdl_Impl );
-    aBtnHorStd.SetClickHdl( aLink );
-    aBtnHorLeft.SetClickHdl( aLink );
-    aBtnHorCenter.SetClickHdl( aLink );
-    aBtnHorRight.SetClickHdl( aLink );
-    aBtnHorBlock.SetClickHdl( aLink );
+    aLbHorAlign.SetSelectHdl( LINK( this, SvxAlignmentTabPage, HorAlignSelectHdl_Impl ) );
 
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
@@ -224,64 +212,45 @@ SfxTabPage* SvxAlignmentTabPage::Create( Window* pParent,
 
 void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
 {
-    // erstmal alles zur"ucksetzen
-    aBtnHorStd.Check( FALSE );
-    aBtnHorLeft.Check( FALSE );
-    aBtnHorCenter.Check( FALSE );
-    aBtnHorRight.Check( FALSE );
-    aBtnHorBlock.Check( FALSE );
-
-    aBtnVerStd.Check( FALSE );
-    aBtnVerTop.Check( FALSE );
-    aBtnVerMid.Check( FALSE );
-    aBtnVerBot.Check( FALSE );
-
-    // und dann einstellen
-    const SfxPoolItem* pItem =
-        GetItem( rCoreAttrs, SID_ATTR_ALIGN_HOR_JUSTIFY );
-
+    USHORT nPos = ALIGNDLG_HORALIGN_STD;
+    const SfxPoolItem* pItem = GetItem( rCoreAttrs, SID_ATTR_ALIGN_HOR_JUSTIFY );
     if ( pItem )
     {
         switch ( (SvxCellHorJustify)
             ( (const SvxHorJustifyItem*)pItem )->GetValue() )
         {
-            case SVX_HOR_JUSTIFY_STANDARD:  aBtnHorStd.Check();     break;
-            case SVX_HOR_JUSTIFY_LEFT:      aBtnHorLeft.Check();    break;
-            case SVX_HOR_JUSTIFY_CENTER:    aBtnHorCenter.Check();  break;
-            case SVX_HOR_JUSTIFY_RIGHT:     aBtnHorRight.Check();   break;
-            case SVX_HOR_JUSTIFY_BLOCK:     aBtnHorBlock.Check();   break;
-            default:                        aBtnHorStd.Check();
+            case SVX_HOR_JUSTIFY_LEFT:      nPos = ALIGNDLG_HORALIGN_LEFT;      break;
+            case SVX_HOR_JUSTIFY_CENTER:    nPos = ALIGNDLG_HORALIGN_CENTER;    break;
+            case SVX_HOR_JUSTIFY_RIGHT:     nPos = ALIGNDLG_HORALIGN_RIGHT;     break;
+            case SVX_HOR_JUSTIFY_BLOCK:     nPos = ALIGNDLG_HORALIGN_BLOCK;     break;
         }
     }
-    // else DON'T-KNOW
+    aLbHorAlign.SelectEntryPos( nPos );
 
     pItem = GetItem( rCoreAttrs, SID_ATTR_ALIGN_INDENT );
-
     if ( pItem )
     {
         // Einzug in Twips -> umrechnen in Point
         USHORT nVal = (USHORT)( (const SfxUInt16Item*)pItem )->GetValue();
         nVal /= 20;
-        aIndentED.SetValue( nVal );
+        aEdIndent.SetValue( nVal );
     }
     else
-        aIndentED.SetText( String() );
+        aEdIndent.SetText( String() );
 
+    nPos = ALIGNDLG_VERALIGN_STD;
     pItem = GetItem( rCoreAttrs, SID_ATTR_ALIGN_VER_JUSTIFY );
-
     if ( pItem )
     {
         switch ( (SvxCellVerJustify)
                     ( (const SvxVerJustifyItem*)pItem )->GetValue() )
         {
-            case SVX_VER_JUSTIFY_STANDARD:  aBtnVerStd.Check(); break;
-            case SVX_VER_JUSTIFY_TOP:       aBtnVerTop.Check(); break;
-            case SVX_VER_JUSTIFY_CENTER:    aBtnVerMid.Check(); break;
-            case SVX_VER_JUSTIFY_BOTTOM:    aBtnVerBot.Check(); break;
-            default:                        aBtnVerStd.Check();
+            case SVX_VER_JUSTIFY_TOP:       nPos = ALIGNDLG_VERALIGN_TOP;       break;
+            case SVX_VER_JUSTIFY_CENTER:    nPos = ALIGNDLG_VERALIGN_MID;       break;
+            case SVX_VER_JUSTIFY_BOTTOM:    nPos = ALIGNDLG_VERALIGN_BOTTOM;    break;
         }
     }
-    // else DON'T-KNOW
+    aLbVerAlign.SelectEntryPos( nPos );
 
     pItem = GetItem( rCoreAttrs, SID_ATTR_ALIGN_ORIENTATION );
 
@@ -359,18 +328,9 @@ void SvxAlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
         aBtnWrap.SetState( TriState( STATE_DONTKNOW ) );
     }
 
-    HorizontalClickHdl_Impl( NULL );
-
-    aBtnHorStd       .SaveValue();  // RadioButton
-    aBtnHorLeft      .SaveValue();
-    aBtnHorCenter    .SaveValue();
-    aBtnHorRight     .SaveValue();
-    aBtnHorBlock     .SaveValue();
-    aBtnVerStd       .SaveValue();
-    aBtnVerTop       .SaveValue();
-    aBtnVerMid       .SaveValue();
-    aBtnVerBot       .SaveValue();
-    aBtnWrap         .SaveValue();  // TriStateButton
+    HorAlignSelectHdl_Impl( NULL );
+
+    aBtnWrap.SaveValue();  // TriStateButton
 }
 
 // -----------------------------------------------------------------------
@@ -387,18 +347,16 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     nWhich = GetWhich( SID_ATTR_ALIGN_HOR_JUSTIFY );
     USHORT nTmp = USHRT_MAX;
 
-    if ( aBtnHorStd.IsChecked() )
-        nTmp = SVX_HOR_JUSTIFY_STANDARD;
-    else if ( aBtnHorLeft.IsChecked() )
-        nTmp = SVX_HOR_JUSTIFY_LEFT;
-    else if ( aBtnHorCenter.IsChecked() )
-        nTmp = SVX_HOR_JUSTIFY_CENTER;
-    else if ( aBtnHorRight.IsChecked() )
-        nTmp = SVX_HOR_JUSTIFY_RIGHT;
-    else if ( aBtnHorBlock.IsChecked() )
-        nTmp = SVX_HOR_JUSTIFY_BLOCK;
-    DBG_ASSERT( (USHRT_MAX != nTmp) || !aBtnHorStd.IsEnabled(), "no button checked" );
-        // if aBtnHorStd is disabled SetFlags was called with the WBA_NO_HORIZONTAL flag set
+    switch( aLbHorAlign.GetSelectEntryPos() )
+    {
+        case ALIGNDLG_HORALIGN_STD:     nTmp = SVX_HOR_JUSTIFY_STANDARD;    break;
+        case ALIGNDLG_HORALIGN_LEFT:    nTmp = SVX_HOR_JUSTIFY_LEFT;        break;
+        case ALIGNDLG_HORALIGN_CENTER:  nTmp = SVX_HOR_JUSTIFY_CENTER;      break;
+        case ALIGNDLG_HORALIGN_RIGHT:   nTmp = SVX_HOR_JUSTIFY_RIGHT;       break;
+        case ALIGNDLG_HORALIGN_BLOCK:   nTmp = SVX_HOR_JUSTIFY_BLOCK;       break;
+    }
+    DBG_ASSERT( (USHRT_MAX != nTmp) || !aLbHorAlign.IsEnabled(), "no button checked" );
+        // if aLbHorAlign is disabled SetFlags was called with the WBA_NO_HORIZONTAL flag set
         // 67977 - 30.07.99 - FS
     pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_HOR_JUSTIFY );
 
@@ -412,7 +370,7 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
 
     nWhich = GetWhich( SID_ATTR_ALIGN_INDENT );
     pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_INDENT );
-    nTmp = aIndentED.GetValue() * 20; // Point in twips
+    nTmp = aEdIndent.GetValue() * 20; // Point in twips
 
     if ( !pOld || ( (const SfxUInt16Item*)pOld )->GetValue() != nTmp )
     {
@@ -426,16 +384,15 @@ BOOL SvxAlignmentTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     nWhich = GetWhich( SID_ATTR_ALIGN_VER_JUSTIFY );
     nTmp = USHRT_MAX;
 
-    if ( aBtnVerStd.IsChecked() )
-        nTmp = SVX_VER_JUSTIFY_STANDARD;
-    else if ( aBtnVerTop.IsChecked() )
-        nTmp = SVX_VER_JUSTIFY_TOP;
-    else if ( aBtnVerMid.IsChecked() )
-        nTmp = SVX_VER_JUSTIFY_CENTER;
-    else if ( aBtnVerBot.IsChecked() )
-        nTmp = SVX_VER_JUSTIFY_BOTTOM;
-    DBG_ASSERT( (USHRT_MAX != nTmp) || !aBtnVerStd.IsEnabled(), "no button checked" );
-        // if aBtnVerStd is disabled SetFlags was called with the WBA_NO_VERTICAL flag set
+    switch( aLbVerAlign.GetSelectEntryPos() )
+    {
+        case ALIGNDLG_VERALIGN_STD:     nTmp = SVX_VER_JUSTIFY_STANDARD;    break;
+        case ALIGNDLG_VERALIGN_TOP:     nTmp = SVX_VER_JUSTIFY_TOP;         break;
+        case ALIGNDLG_VERALIGN_MID:     nTmp = SVX_VER_JUSTIFY_CENTER;      break;
+        case ALIGNDLG_VERALIGN_BOTTOM:  nTmp = SVX_VER_JUSTIFY_BOTTOM;      break;
+    }
+    DBG_ASSERT( (USHRT_MAX != nTmp) || !aLbVerAlign.IsEnabled(), "no button checked" );
+        // if aLbVerAlign is disabled SetFlags was called with the WBA_NO_VERTICAL flag set
         // 67977 - 30.07.99 - FS
     pOld = GetOldItem( rCoreAttrs, SID_ATTR_ALIGN_VER_JUSTIFY );
 
@@ -554,11 +511,11 @@ int SvxAlignmentTabPage::DeactivatePage( SfxItemSet* pSet )
 
 //------------------------------------------------------------------------
 
-IMPL_LINK( SvxAlignmentTabPage, HorizontalClickHdl_Impl, RadioButton *, EMPTYARG )
+IMPL_LINK( SvxAlignmentTabPage, HorAlignSelectHdl_Impl, ListBox *, EMPTYARG )
 {
-    BOOL bChecked = aBtnHorLeft.IsChecked();
-    aIndentFT.Enable( bChecked );
-    aIndentED.Enable( bChecked );
+    BOOL bChecked = (aLbHorAlign.GetSelectEntryPos() == ALIGNDLG_HORALIGN_LEFT);
+    aFtIndent.Enable( bChecked );
+    aEdIndent.Enable( bChecked );
     return 0;
 }
 
@@ -579,39 +536,33 @@ void SvxAlignmentTabPage::SetFlags( USHORT nFlags )
 
     if ( ( nFlags & WBA_NO_LINEBREAK ) == WBA_NO_LINEBREAK )
     {
+        aFlWrap.Disable();
         aBtnWrap.Disable();
-        aWrapGB.Disable();
     }
 
     if ( ( nFlags & WBA_NO_HORIZONTAL ) == WBA_NO_HORIZONTAL )
     {
-        aBtnHorStd.Disable();
-        aBtnHorLeft.Disable();
-        aBtnHorRight.Disable();
-        aBtnHorCenter.Disable();
-        aBtnHorBlock.Disable();
-        aIndentFT.Disable();
-        aIndentED.Disable();
-        aGbHorAlign.Disable();
+        aFtHorAlign.Disable();
+        aLbHorAlign.Disable();
+        aFtIndent.Disable();
+        aEdIndent.Disable();
     }
 
     if ( ( nFlags & WBA_NO_LEFTINDENT ) == WBA_NO_LEFTINDENT )
     {
-        aIndentFT.Hide();
-        aIndentED.Hide();
+        aFtIndent.Hide();
+        aEdIndent.Hide();
     }
 
     if ( ( nFlags & WBA_NO_VERTICAL ) == WBA_NO_VERTICAL )
     {
-        aBtnVerStd.Disable();
-        aBtnVerTop.Disable();
-        aBtnVerBot.Disable();
-        aBtnVerMid.Disable();
-        aGbVerAlign.Disable();
+        aFtVerAlign.Disable();
+        aLbVerAlign.Disable();
     }
 
     if ( ( nFlags & WBA_NO_GRIDLINES ) == WBA_NO_GRIDLINES )
     {
+        aFlSpace.Disable();
         aFtLeftSpace.Disable();
         aEdLeftSpace.Disable();
         aFtRightSpace.Disable();
@@ -620,7 +571,6 @@ void SvxAlignmentTabPage::SetFlags( USHORT nFlags )
         aEdTopSpace.Disable();
         aFtBottomSpace.Disable();
         aEdBottomSpace.Disable();
-        aGbSpace.Disable();
     }
 }
 
diff --git a/svx/source/dialog/align.hrc b/svx/source/dialog/align.hrc
index 211f259263db..81cf2b3b73c1 100644
--- a/svx/source/dialog/align.hrc
+++ b/svx/source/dialog/align.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: align.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:06 $
+ *  last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,57 +63,59 @@
 
 // defines ------------------------------------------------------------------
 
-#define BTN_HORSTD              10
-#define BTN_HORLEFT             11
-#define BTN_HORCENTER           12
-#define BTN_HORRIGHT            13
-#define BTN_HORBLOCK            14
-#define FT_INDENT               15
-#define ED_INDENT               16
-#define ED_INDENT               16
-#define GB_HORALIGN             17
-//
-#define BTN_VERSTD              20
-#define BTN_VERTOP              21
-#define BTN_VERMID              23
-#define BTN_VERBOT              24
-#define GB_VERALIGN             25
+// resource id's
+#define FL_ALIGNMENT                10
+#define FT_HORALIGN                 11
+#define LB_HORALIGN                 12
+#define FT_INDENT                   13
+#define ED_INDENT                   14
+#define FT_VERALIGN                 15
+#define LB_VERALIGN                 16
 
-// ID's fuer Ausrichtung
-#define CTR_DIAL                30
-#define BTN_TXTSTACKED          31
-#define FT_DEGREES              32
-#define NF_ORIENT               33
-#define CTR_BORDER_LOCK         34
-#define FT_BORDER_LOCK          35
-#define GB_ALIGN                37
+#define FL_ORIENTATION              20
+#define BTN_TXTSTACKED              21
+#define CTR_DIAL                    22
+#define FT_DEGREES                  23
+#define NF_DEGREES                  24
+#define FT_BORDER_LOCK              25
+#define CTR_BORDER_LOCK             26
 
-//
-#define FT_LEFTSPACE            40
-#define ED_LEFTSPACE            41
-#define FT_RIGHTSPACE           42
-#define ED_RIGHTSPACE           43
-#define FT_TOPSPACE             44
-#define ED_TOPSPACE             45
-#define FT_BOTTOMSPACE          46
-#define ED_BOTTOMSPACE          47
-#define GB_SPACE                48
-//
-#define BTN_WRAP                50
-#define GB_WRAP                 51
+#define FL_SPACE                    30
+#define FT_LEFTSPACE                31
+#define ED_LEFTSPACE                32
+#define FT_RIGHTSPACE               33
+#define ED_RIGHTSPACE               34
+#define FT_TOPSPACE                 35
+#define ED_TOPSPACE                 36
+#define FT_BOTTOMSPACE              37
+#define ED_BOTTOMSPACE              38
 
-#define ED_INDENT1              100
+#define FL_WRAP                     40
+#define BTN_WRAP                    41
 
-// ImageListe fuer ValueSets:
+//#define ED_INDENT1                  100
 
-#define IL_LOCK_BMPS            1
-#define IID_BOTTOMLOCK          1
-#define IID_TOPLOCK             2
-#define IID_CELLLOCK            3
+// list box indexes
+#define ALIGNDLG_HORALIGN_STD       0
+#define ALIGNDLG_HORALIGN_LEFT      1
+#define ALIGNDLG_HORALIGN_CENTER    2
+#define ALIGNDLG_HORALIGN_RIGHT     3
+#define ALIGNDLG_HORALIGN_BLOCK     4
 
-#define STR_BOTTOMLOCK          1
-#define STR_TOPLOCK             2
-#define STR_CELLLOCK            3
+#define ALIGNDLG_VERALIGN_STD       0
+#define ALIGNDLG_VERALIGN_TOP       1
+#define ALIGNDLG_VERALIGN_MID       2
+#define ALIGNDLG_VERALIGN_BOTTOM    3
+
+// image list for ValueSets:
+#define IL_LOCK_BMPS                1
+#define IID_BOTTOMLOCK              1
+#define IID_TOPLOCK                 2
+#define IID_CELLLOCK                3
+
+#define STR_BOTTOMLOCK              1
+#define STR_TOPLOCK                 2
+#define STR_CELLLOCK                3
 
 #endif
 
diff --git a/svx/source/dialog/align.src b/svx/source/dialog/align.src
index d0a924fb1e85..d881e94015c0 100644
--- a/svx/source/dialog/align.src
+++ b/svx/source/dialog/align.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: align.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-10 05:34:56 $
+ *  last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,165 +89,48 @@ TabPage RID_SVXPAGE_ALIGNMENT
     Text [ english_us ] = "Alignment" ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
-    RadioButton BTN_HORSTD
+    FixedLine FL_ALIGNMENT
     {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text = "Standar~d" ;
-        Text [ ENGLISH ] = "~Standard" ;
-        Text [ norwegian ] = "~Standard" ;
-        Text [ italian ] = "~Standard" ;
-        Text [ portuguese_brazilian ] = "~Padr�o" ;
-        Text [ portuguese ] = "~Padr�o" ;
-        Text [ finnish ] = "~Oletusarvo" ;
-        Text [ danish ] = "Standar~d" ;
-        Text [ french ] = "Standard" ;
-        Text [ swedish ] = "~Standard" ;
-        Text [ dutch ] = "~Standaard" ;
-        Text [ spanish ] = "~Predeterm." ;
-        Text [ english_us ] = "~Default" ;
-        Text[ chinese_simplified ] = "��׼(~D)";
-        Text[ russian ] = "��������";
-        Text[ polish ] = "Domy�lnie";
-        Text[ japanese ] = "�W��(~D)";
-        Text[ chinese_traditional ] = "�з�(~D)";
-        Text[ arabic ] = "�����";
-        Text[ dutch ] = "~Standaard";
-        Text[ chinese_simplified ] = "��׼(~D)";
-        Text[ greek ] = "����������";
-        Text[ korean ] = "�⺻(~D)";
-        Text[ turkish ] = "Standar~t";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Predeterm.";
-    };
-    RadioButton BTN_HORLEFT
-    {
-        Pos = MAP_APPFONT ( 12 , 27 ) ;
-        Size = MAP_APPFONT ( 36 , 10 ) ;
-        Text = "~Links" ;
-        Text [ ENGLISH ] = "Flush ~Left" ;
-        Text [ norwegian ] = "Flush ~Left" ;
-        Text [ italian ] = "A sinistra" ;
-        Text [ portuguese_brazilian ] = "Alinhar ~� Esquerda" ;
-        Text [ portuguese ] = "~Esquerda" ;
-        Text [ finnish ] = "~Vasen" ;
-        Text [ danish ] = "Venstre" ;
-        Text [ french ] = "� gauch~e" ;
-        Text [ swedish ] = "V~�nster" ;
-        Text [ dutch ] = "~Links" ;
-        Text [ spanish ] = "Izq~uierda" ;
-        Text [ english_us ] = "~Left" ;
-        Text[ chinese_simplified ] = "��(~L)";
-        Text[ russian ] = "�����";
-        Text[ polish ] = "Do l~ewej";
-        Text[ japanese ] = "������(~L)";
-        Text[ chinese_traditional ] = "�V��(~L)";
-        Text[ arabic ] = "����";
-        Text[ dutch ] = "~Links";
-        Text[ chinese_simplified ] = "��(~L)";
-        Text[ greek ] = "��������";
-        Text[ korean ] = "����(~L)";
-        Text[ turkish ] = "So~l";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Izq~uierda";
-    };
-    RadioButton BTN_HORCENTER
-    {
-        Pos = MAP_APPFONT ( 12 , 53 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text = "Zen~triert" ;
-        Text [ ENGLISH ] = "~Centered" ;
-        Text [ norwegian ] = "~Centered" ;
-        Text [ italian ] = "Al ~centro" ;
-        Text [ portuguese_brazilian ] = "~Centralizado" ;
-        Text [ portuguese ] = "~Centrado" ;
-        Text [ finnish ] = "Keskit�" ;
-        Text [ danish ] = "Centreret" ;
-        Text [ french ] = "Centr�" ;
-        Text [ swedish ] = "~Centrera" ;
-        Text [ dutch ] = "~Gecentreerd" ;
-        Text [ spanish ] = "~Centrado" ;
-        Text [ english_us ] = "Center" ;
-        Text[ chinese_simplified ] = "����(~C)";
-        Text[ russian ] = "�� ������";
-        Text[ polish ] = "Wy~�rodkuj";
-        Text[ japanese ] = "��������";
-        Text[ chinese_traditional ] = "�m��(~C)";
-        Text[ arabic ] = "�����";
-        Text[ dutch ] = "~Gecentreerd";
-        Text[ chinese_simplified ] = "����(~C)";
-        Text[ greek ] = "�������������";
-        Text[ korean ] = "���";
-        Text[ turkish ] = "Orta~la";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Centrado";
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Textausrichtung" ;
+        Text [ ENGLISH ] = "Text alignment" ;
     };
-    RadioButton BTN_HORRIGHT
+    FixedText FT_HORALIGN
     {
-        Pos = MAP_APPFONT ( 12 , 40 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text = "~Rechts" ;
-        Text [ ENGLISH ] = "Flush ~Right" ;
-        Text [ norwegian ] = "Flush ~Right" ;
-        Text [ italian ] = "A destra" ;
-        Text [ portuguese_brazilian ] = "Alinhar ~� Direita" ;
-        Text [ portuguese ] = "~Direita" ;
-        Text [ finnish ] = "~Oikea" ;
-        Text [ danish ] = "H�jre" ;
-        Text [ french ] = "� dr~oite" ;
-        Text [ swedish ] = "H�~ger" ;
-        Text [ dutch ] = "~Rechts" ;
-        Text [ spanish ] = "~Derecha" ;
-        Text [ english_us ] = "R~ight" ;
-        Text[ chinese_simplified ] = "��(~I)";
-        Text[ russian ] = "������";
-        Text[ polish ] = "Do prawe~j";
-        Text[ japanese ] = "�E����(~I)";
-        Text[ chinese_traditional ] = "�V�k(~I)";
-        Text[ arabic ] = "����";
-        Text[ dutch ] = "~Rechts";
-        Text[ chinese_simplified ] = "��(~I)";
-        Text[ greek ] = "�����";
-        Text[ korean ] = "������(~I)";
-        Text[ turkish ] = "Sa~�";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Derecha";
+        Pos = MAP_APPFONT ( 12 ,14 ) ;
+        Size = MAP_APPFONT ( 100 , 8 ) ;
+        Text = "~Horizontal" ;
+        Text [ ENGLISH ] = "~Horizontal" ;
     };
-    RadioButton BTN_HORBLOCK
+    ListBox LB_HORALIGN
     {
-        Pos = MAP_APPFONT ( 12 , 66 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text = "~Block" ;
-        Text [ ENGLISH ] = "Blo~ck" ;
-        Text [ norwegian ] = "Blo~ck" ;
-        Text [ italian ] = "Giustifica" ;
-        Text [ portuguese_brazilian ] = "Blo~co" ;
-        Text [ portuguese ] = "~Justificado" ;
-        Text [ finnish ] = "~Tasaa" ;
-        Text [ danish ] = "Lige margener" ;
-        Text [ french ] = "~Justifi�" ;
-        Text [ swedish ] = "Marginal~justering" ;
-        Text [ dutch ] = "~Uitgevuld" ;
-        Text [ spanish ] = "~Justificada" ;
-        Text [ english_us ] = "~Justify" ;
-        Text[ chinese_simplified ] = "���˶���(~J)";
-        Text[ russian ] = "�� ������";
-        Text[ polish ] = "Wyj~ustuj";
-        Text[ japanese ] = "�ϓ����t(~J)";
-        Text[ chinese_traditional ] = "��ݹ��(~J)";
-        Text[ arabic ] = "���";
-        Text[ dutch ] = "~Uitgevuld";
-        Text[ chinese_simplified ] = "���˶���(~J)";
-        Text[ greek ] = "������ ��������";
-        Text[ korean ] = "���� ����(~J)";
-        Text[ turkish ] = "~�ki yana yasla";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Justificada";
+        Border = TRUE;
+        Pos = MAP_APPFONT ( 12 , 25  );
+        Size = MAP_APPFONT ( 100 , 48 );
+        TabStop = TRUE;
+        DropDown = TRUE;
+        StringList =
+        {
+            < "Standard" ; ALIGNDLG_HORALIGN_STD ; > ;
+            < "Links" ; ALIGNDLG_HORALIGN_LEFT ; > ;
+            < "Zentriert" ; ALIGNDLG_HORALIGN_CENTER ; > ;
+            < "Rechts" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
+            < "Block" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
+        };
+        StringList [ ENGLISH ] =
+        {
+            < "Deafult" ; ALIGNDLG_HORALIGN_STD ; > ;
+            < "Flush Left" ; ALIGNDLG_HORALIGN_LEFT ; > ;
+            < "Centered" ; ALIGNDLG_HORALIGN_CENTER ; > ;
+            < "Flush Right" ; ALIGNDLG_HORALIGN_RIGHT ; > ;
+            < "Block" ; ALIGNDLG_HORALIGN_BLOCK ; > ;
+        };
     };
     FixedText FT_INDENT
     {
-        Pos = MAP_APPFONT ( 51 , 28 ) ;
-        Size = MAP_APPFONT ( 30 , 8 ) ;
+        Pos = MAP_APPFONT ( 118 , 14 ) ;
+        Size = MAP_APPFONT ( 32 , 8 ) ;
         Text = "Einzu~g" ;
         Text [ English ] = "~Indent" ;
         Text [ english_us ] = "I~ndent" ;
@@ -277,7 +160,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     MetricField ED_INDENT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 84 , 26 ) ;
+        Pos = MAP_APPFONT ( 118 , 25 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -286,202 +169,69 @@ TabPage RID_SVXPAGE_ALIGNMENT
         SpinSize = 10 ;
         Unit = FUNIT_POINT ;
     };
-    GroupBox GB_HORALIGN
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 112 , 76 ) ;
-        Text = "Horizontal" ;
-        Text [ ENGLISH ] = "Horizontal" ;
-        Text [ norwegian ] = "Horisontal" ;
-        Text [ italian ] = "Orizzontale" ;
-        Text [ portuguese_brazilian ] = "Horizontal" ;
-        Text [ portuguese ] = "Horizontal" ;
-        Text [ finnish ] = "Vaakataso" ;
-        Text [ danish ] = "Vandret" ;
-        Text [ french ] = "Horizontal" ;
-        Text [ swedish ] = "Horisontellt" ;
-        Text [ dutch ] = "Horizontaal" ;
-        Text [ spanish ] = "Horizontal" ;
-        Text [ english_us ] = "Horizontal" ;
-        Text[ chinese_simplified ] = "ˮƽ����";
-        Text[ russian ] = "�������������";
-        Text[ polish ] = "Poziomo";
-        Text[ japanese ] = "���ʒu";
-        Text[ chinese_traditional ] = "������V";
-        Text[ arabic ] = "����";
-        Text[ dutch ] = "Horizontaal";
-        Text[ chinese_simplified ] = "ˮƽ����";
-        Text[ greek ] = "���������";
-        Text[ korean ] = "����";
-        Text[ turkish ] = "Yatay";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Horizontal";
-    };
-    RadioButton BTN_VERSTD
+    FixedText FT_VERALIGN
     {
-        Pos = MAP_APPFONT ( 130 , 14 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text = "St~andard" ;
-        Text [ ENGLISH ] = "~Standard" ;
-        Text [ norwegian ] = "~Standard" ;
-        Text [ italian ] = "St~andard" ;
-        Text [ portuguese_brazilian ] = "~Padr�o" ;
-        Text [ portuguese ] = "~Padr�o" ;
-        Text [ finnish ] = "~Vakio" ;
-        Text [ danish ] = "Standard" ;
-        Text [ french ] = "~Standard" ;
-        Text [ swedish ] = "S~tandard" ;
-        Text [ dutch ] = "~Standaard" ;
-        Text [ spanish ] = "~Predeterm." ;
-        Text [ english_us ] = "Defa~ult" ;
-        Text[ chinese_simplified ] = "��׼(~S)";
-        Text[ russian ] = "��������";
-        Text[ polish ] = "Domy�lnie";
-        Text[ japanese ] = "�W��(~S)";
-        Text[ chinese_traditional ] = "�з�(~S)";
-        Text[ arabic ] = "�����";
-        Text[ dutch ] = "~Standaard";
-        Text[ chinese_simplified ] = "��׼(~S)";
-        Text[ greek ] = "����������";
-        Text[ korean ] = "ǥ��(~S)";
-        Text[ turkish ] = "Sta~ndart";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Predeterm.";
-    };
-    RadioButton BTN_VERTOP
-    {
-        Pos = MAP_APPFONT ( 130 , 27 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text = "~Oben" ;
-        Text [ ENGLISH ] = "~Top" ;
-        Text [ norwegian ] = "~Top" ;
-        Text [ italian ] = "In ~alto" ;
-        Text [ portuguese_brazilian ] = "~Topo" ;
-        Text [ portuguese ] = "Em ~cima" ;
-        Text [ finnish ] = "~Yl�osa" ;
-        Text [ danish ] = "�verst" ;
-        Text [ french ] = "En ha~ut" ;
-        Text [ swedish ] = "~�verst" ;
-        Text [ dutch ] = "~Boven" ;
-        Text [ spanish ] = "A~rriba" ;
-        Text [ english_us ] = "T~op" ;
-        Text[ chinese_simplified ] = "��(~T)";
-        Text[ russian ] = "������";
-        Text[ polish ] = "Na ~g�rze";
-        Text[ japanese ] = "��(~T)";
-        Text[ chinese_traditional ] = "�V�W(~T)";
-        Text[ arabic ] = "����";
-        Text[ dutch ] = "~Boven";
-        Text[ chinese_simplified ] = "��(~T)";
-        Text[ greek ] = "����";
-        Text[ korean ] = "��(~T)";
-        Text[ turkish ] = "�~st";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "A~rriba";
-    };
-    RadioButton BTN_VERBOT
-    {
-        Pos = MAP_APPFONT ( 130 , 40 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text = "~Unten" ;
-        Text [ ENGLISH ] = "~Bottom" ;
-        Text [ norwegian ] = "~Bottom" ;
-        Text [ italian ] = "In ~basso" ;
-        Text [ portuguese_brazilian ] = "~Base" ;
-        Text [ portuguese ] = "Em ~baixo" ;
-        Text [ finnish ] = "~Alaosa" ;
-        Text [ danish ] = "Nederst" ;
-        Text [ french ] = "En ~bas" ;
-        Text [ swedish ] = "~Underst" ;
-        Text [ dutch ] = "~Onder" ;
-        Text [ spanish ] = "A~bajo" ;
-        Text [ english_us ] = "~Bottom" ;
-        Text[ chinese_simplified ] = "��(~B)";
-        Text[ russian ] = "�����";
-        Text[ polish ] = "Na dole";
-        Text[ japanese ] = "��(~B)";
-        Text[ chinese_traditional ] = "�V�U(~B)";
-        Text[ arabic ] = "����";
-        Text[ dutch ] = "~Onder";
-        Text[ chinese_simplified ] = "��(~B)";
-        Text[ greek ] = "����";
-        Text[ korean ] = "�Ʒ�(~B)";
-        Text[ turkish ] = "~Alt";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "A~bajo";
+        Pos = MAP_APPFONT ( 154 , 14 ) ;
+        Size = MAP_APPFONT ( 100 , 8 ) ;
+        Text = "~Vertikal" ;
+        Text [ ENGLISH ] = "~Vertical" ;
     };
-    RadioButton BTN_VERMID
+    ListBox LB_VERALIGN
     {
-        Pos = MAP_APPFONT ( 130 , 53 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text = "~Mitte" ;
-        Text [ ENGLISH ] = "~Mid" ;
-        Text [ norwegian ] = "~Mid" ;
-        Text [ italian ] = "Al centro" ;
-        Text [ portuguese_brazilian ] = "~Meio" ;
-        Text [ portuguese ] = "~Centro" ;
-        Text [ finnish ] = "~Keskit�" ;
-        Text [ danish ] = "Centreret" ;
-        Text [ french ] = "~Milieu" ;
-        Text [ swedish ] = "~Mitten" ;
-        Text [ dutch ] = "~Midden" ;
-        Text [ spanish ] = "Ce~ntro" ;
-        Text [ english_us ] = "Middl~e" ;
-        Text[ chinese_simplified ] = "��(~E)";
-        Text[ russian ] = "� ������";
-        Text[ polish ] = "Do �rodka";
-        Text[ japanese ] = "����(~E)";
-        Text[ chinese_traditional ] = "�m��(~E)";
-        Text[ arabic ] = "�����";
-        Text[ dutch ] = "~Midden";
-        Text[ chinese_simplified ] = "��(~E)";
-        Text[ greek ] = "������";
-        Text[ korean ] = "���(~E)";
-        Text[ turkish ] = "O~rta";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Ce~ntro";
+        Border = TRUE;
+        Pos = MAP_APPFONT ( 154 , 25  );
+        Size = MAP_APPFONT ( 100 , 48 );
+        TabStop = TRUE;
+        DropDown = TRUE;
+        StringList =
+        {
+            < "Standard" ; ALIGNDLG_VERALIGN_STD ; > ;
+            < "Oben" ; ALIGNDLG_VERALIGN_TOP ; > ;
+            < "Mitte" ; ALIGNDLG_VERALIGN_MID ; > ;
+            < "Unten" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
+        };
+        StringList [ ENGLISH ] =
+        {
+            < "Default" ; ALIGNDLG_VERALIGN_STD ; > ;
+            < "Top" ; ALIGNDLG_VERALIGN_TOP ; > ;
+            < "Middle" ; ALIGNDLG_VERALIGN_MID ; > ;
+            < "Bottom" ; ALIGNDLG_VERALIGN_BOTTOM ; > ;
+        };
     };
-    GroupBox GB_VERALIGN
+    FixedLine FL_ORIENTATION
     {
-        Pos = MAP_APPFONT ( 124 , 3 ) ;
-        Size = MAP_APPFONT ( 55 , 76 ) ;
-        Text = "Vertikal" ;
-        Text [ ENGLISH ] = "Vertical" ;
-        Text [ norwegian ] = "Vertikal" ;
-        Text [ italian ] = "Verticale" ;
-        Text [ portuguese_brazilian ] = "Vertical" ;
-        Text [ portuguese ] = "Vertical" ;
-        Text [ finnish ] = "Pystysuora" ;
-        Text [ danish ] = "Lodret" ;
-        Text [ french ] = "Vertical" ;
-        Text [ swedish ] = "Vertikalt" ;
-        Text [ dutch ] = "Verticaal" ;
-        Text [ spanish ] = "Vertical" ;
-        Text [ english_us ] = "Vertical" ;
-        Text[ chinese_simplified ] = "��ֱ����";
-        Text[ russian ] = "�����������";
-        Text[ polish ] = "Pionowo";
-        Text[ japanese ] = "�c�ʒu";
-        Text[ chinese_traditional ] = "������V";
-        Text[ arabic ] = "����";
-        Text[ dutch ] = "Verticaal";
-        Text[ chinese_simplified ] = "��ֱ����";
-        Text[ greek ] = "����������";
-        Text[ korean ] = "����";
-        Text[ turkish ] = "Dikey";
+        Pos = MAP_APPFONT ( 6 , 43 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Schreibrichtung" ;
+        Text [ ENGLISH ] = "Orientation" ;
+        Text [ norwegian ] = "Orientation" ;
+        Text [ italian ] = "Orientamento" ;
+        Text [ portuguese_brazilian ] = "Orienta��o" ;
+        Text [ portuguese ] = "Orienta��o" ;
+        Text [ finnish ] = "Tekstin suunta" ;
+        Text [ danish ] = "Skriveretning" ;
+        Text [ french ] = "Sens d'�criture" ;
+        Text [ swedish ] = "Skrivriktning" ;
+        Text [ dutch ] = "Schrijfrichting" ;
+        Text [ spanish ] = "Direcci�n de escritura" ;
+        Text [ english_us ] = "Text direction" ;
+        Text[ chinese_simplified ] = "����";
+        Text[ russian ] = "����������� ������";
+        Text[ polish ] = "Kierunek pisania";
+        Text[ japanese ] = "�����̕���";
+        Text[ chinese_traditional ] = "��V";
+        Text[ arabic ] = "����� �������";
+        Text[ dutch ] = "Schrijfrichting";
+        Text[ chinese_simplified ] = "����";
+        Text[ greek ] = "���������� ������";
+        Text[ korean ] = "�ؽ�Ʈ ����";
+        Text[ turkish ] = "Metin y�n�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Vertical";
-    };
-    Control CTR_DIAL
-    {
-        HelpId = HID_ALIGNMENT_CTR_DIAL ;
-        Pos = MAP_APPFONT ( 191 , 14 ) ;
-        Size = MAP_APPFONT ( 42 , 43 ) ;
-        Text = "ABCD" ;
+        Text[ catalan ] = "Direcci�n de escritura";
     };
     ImageButton BTN_TXTSTACKED
     {
-        Pos = MAP_APPFONT ( 239 , 14 ) ;
+        Pos = MAP_APPFONT ( 12 , 54 ) ;
         Size = MAP_APPFONT ( 12 , 43 ) ;
         TabStop = TRUE ;
         ButtonImage = Image
@@ -490,41 +240,25 @@ TabPage RID_SVXPAGE_ALIGNMENT
             MASKCOLOR ;
         };
     };
+    Control CTR_DIAL
+    {
+        HelpId = HID_ALIGNMENT_CTR_DIAL ;
+        Pos = MAP_APPFONT ( 30 , 54 ) ;
+        Size = MAP_APPFONT ( 42 , 43 ) ;
+        Text = "ABCD" ;
+    };
     FixedText FT_DEGREES
     {
-        Pos = MAP_APPFONT ( 222 , 61 ) ;
-        Size = MAP_APPFONT ( 31 , 10 ) ;
-        Text = "G~rad" ;
-        Text [ ENGLISH ] = "Degrees" ;
-        Text [ english_us ] = "De~grees" ;
-        Text [ portuguese_brazilian ] = "Gra~d" ;
-        Text [ swedish ] = "G~rader" ;
-        Text [ danish ] = "grader" ;
-        Text [ italian ] = "Gra~di" ;
-        Text [ spanish ] = "~Grados" ;
-        Text [ french ] = "~Degr�s" ;
-        Text [ dutch ] = "Gra~den" ;
-        Text [ portuguese ] = "~Graus" ;
-        Text[ chinese_simplified ] = "�Ƕ�(~G)";
-        Text[ russian ] = "������";
-        Text[ polish ] = "Stopie�";
-        Text[ japanese ] = "�x(~G)";
-        Text[ chinese_traditional ] = "����(~G)";
-        Text[ arabic ] = "����/�����";
-        Text[ dutch ] = "Gra~den";
-        Text[ chinese_simplified ] = "�Ƕ�(~G)";
-        Text[ greek ] = "���~���";
-        Text[ korean ] = "��(~G)";
-        Text[ turkish ] = "De~rece";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Grados";
-        Text[ finnish ] = "Degrees";
+        Pos = MAP_APPFONT ( 78 , 59 ) ;
+        Size = MAP_APPFONT ( 34 , 8 ) ;
+        Text = "~Winkel" ;
+        Text [ ENGLISH ] = "Angle" ;
     };
-    NumericField NF_ORIENT
+    NumericField NF_DEGREES
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 191 , 59 ) ;
-        Size = MAP_APPFONT ( 28 , 12 ) ;
+        Pos = MAP_APPFONT ( 78 , 70 ) ;
+        Size = MAP_APPFONT ( 34 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -532,8 +266,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     FixedText FT_BORDER_LOCK
     {
-        Pos = MAP_APPFONT ( 191 , 76 ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 118 , 59 ) ;
+        Size = MAP_APPFONT ( 70 , 8 ) ;
         Text = "Bezugs~kante" ;
         Text [ ENGLISH ] = "Reference edge" ;
         Text [ english_us ] = "Re~ference edge" ;
@@ -564,45 +298,45 @@ TabPage RID_SVXPAGE_ALIGNMENT
     {
         HelpId = HID_ALIGNMENT_CTR_BORDER_LOCK ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 191 , 87 ) ;
+        Pos = MAP_APPFONT ( 118 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 15 ) ;
         TabStop = TRUE ;
     };
-    GroupBox GB_ALIGN
+    FixedLine FL_SPACE
     {
-        Pos = MAP_APPFONT ( 185 , 3 ) ;
-        Size = MAP_APPFONT ( 69 , 100 ) ;
-        Text = "Schreibrichtung" ;
-        Text [ ENGLISH ] = "Orientation" ;
-        Text [ norwegian ] = "Orientation" ;
-        Text [ italian ] = "Orientamento" ;
-        Text [ portuguese_brazilian ] = "Orienta��o" ;
-        Text [ portuguese ] = "Orienta��o" ;
-        Text [ finnish ] = "Tekstin suunta" ;
-        Text [ danish ] = "Skriveretning" ;
-        Text [ french ] = "Sens d'�criture" ;
-        Text [ swedish ] = "Skrivriktning" ;
-        Text [ dutch ] = "Schrijfrichting" ;
-        Text [ spanish ] = "Direcci�n de escritura" ;
-        Text [ english_us ] = "Text direction" ;
-        Text[ chinese_simplified ] = "����";
-        Text[ russian ] = "����������� ������";
-        Text[ polish ] = "Kierunek pisania";
-        Text[ japanese ] = "�����̕���";
-        Text[ chinese_traditional ] = "��V";
-        Text[ arabic ] = "����� �������";
-        Text[ dutch ] = "Schrijfrichting";
-        Text[ chinese_simplified ] = "����";
-        Text[ greek ] = "���������� ������";
-        Text[ korean ] = "�ؽ�Ʈ ����";
-        Text[ turkish ] = "Metin y�n�";
+        Pos = MAP_APPFONT ( 6 , 103 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Abstand zu Gitterlinien" ;
+        Text [ ENGLISH ] = "Margins" ;
+        Text [ norwegian ] = "Margins" ;
+        Text [ italian ] = "Distanza dalle linee della griglia" ;
+        Text [ portuguese_brazilian ] = "Margens" ;
+        Text [ portuguese ] = "Margens da quadr�cula" ;
+        Text [ finnish ] = "V�lit ruudukon viivoihin" ;
+        Text [ danish ] = "Afstand til gitterlinjer" ;
+        Text [ french ] = "�cart des lignes de la grille" ;
+        Text [ swedish ] = "Avst�nd till gitterlinjer" ;
+        Text [ dutch ] = "Afstand tot rasterlijnen" ;
+        Text [ spanish ] = "Distancia a la cuadr�cula" ;
+        Text [ english_us ] = "Spacing to grid lines" ;
+        Text[ chinese_simplified ] = "�������ߵľ���";
+        Text[ russian ] = "���������� �� ����� �����";
+        Text[ polish ] = "Odst�p do linii siatki";
+        Text[ japanese ] = "��د�ސ��܂ł̊Ԋu";
+        Text[ chinese_traditional ] = "�ܺ���u���Z��";
+        Text[ arabic ] = "������� ��� ���� ������";
+        Text[ dutch ] = "Afstand tot rasterlijnen";
+        Text[ chinese_simplified ] = "�������ߵľ���";
+        Text[ greek ] = "�������� ��� ������� ���������";
+        Text[ korean ] = "�������� ����";
+        Text[ turkish ] = "K�lavuz �izgilere uzakl�k";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Direcci�n de escritura";
+        Text[ catalan ] = "Distancia a la cuadr�cula";
     };
     FixedText FT_LEFTSPACE
     {
-        Pos = MAP_APPFONT ( 12 , 99 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 116 ) ;
+        Size = MAP_APPFONT ( 34 , 8 ) ;
         Text = "L~inks" ;
         Text [ ENGLISH ] = "L~eft" ;
         Text [ norwegian ] = "L~eft" ;
@@ -633,8 +367,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
     MetricField ED_LEFTSPACE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 45 , 97 ) ;
-        Size = MAP_APPFONT ( 39 , 12 ) ;
+        Pos = MAP_APPFONT ( 48 , 114 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -646,8 +380,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     FixedText FT_RIGHTSPACE
     {
-        Pos = MAP_APPFONT ( 12 , 114 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 132 ) ;
+        Size = MAP_APPFONT ( 34 , 8 ) ;
         Text = "Recht~s" ;
         Text [ ENGLISH ] = "Rig~ht" ;
         Text [ norwegian ] = "Rig~ht" ;
@@ -678,8 +412,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
     MetricField ED_RIGHTSPACE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 45 , 112 ) ;
-        Size = MAP_APPFONT ( 39 , 12 ) ;
+        Pos = MAP_APPFONT ( 48 , 130 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -691,8 +425,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     FixedText FT_TOPSPACE
     {
-        Pos = MAP_APPFONT ( 97 , 99 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
+        Pos = MAP_APPFONT ( 118 , 116 ) ;
+        Size = MAP_APPFONT ( 34 , 8 ) ;
         Text = "Obe~n" ;
         Text [ ENGLISH ] = "To~p" ;
         Text [ norwegian ] = "To~p" ;
@@ -723,8 +457,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
     MetricField ED_TOPSPACE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 97 ) ;
-        Size = MAP_APPFONT ( 39 , 12 ) ;
+        Pos = MAP_APPFONT ( 154 , 114 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -736,8 +470,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     FixedText FT_BOTTOMSPACE
     {
-        Pos = MAP_APPFONT ( 97 , 114 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
+        Pos = MAP_APPFONT ( 118 , 132 ) ;
+        Size = MAP_APPFONT ( 34 , 8 ) ;
         Text = "Unt~en" ;
         Text [ ENGLISH ] = "Botto~m" ;
         Text [ norwegian ] = "Botto~m" ;
@@ -768,8 +502,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
     MetricField ED_BOTTOMSPACE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 130 , 112 ) ;
-        Size = MAP_APPFONT ( 39 , 12 ) ;
+        Pos = MAP_APPFONT ( 154 , 130 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -779,41 +513,42 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Last = 100 ;
         Unit = FUNIT_MM ;
     };
-    GroupBox GB_SPACE
+    FixedLine FL_WRAP
     {
-        Pos = MAP_APPFONT ( 6 , 86 ) ;
-        Size = MAP_APPFONT ( 173 , 45 ) ;
-        Text = "Abstand zu Gitterlinien" ;
-        Text [ ENGLISH ] = "Margins" ;
-        Text [ norwegian ] = "Margins" ;
-        Text [ italian ] = "Distanza dalle linee della griglia" ;
-        Text [ portuguese_brazilian ] = "Margens" ;
-        Text [ portuguese ] = "Margens da quadr�cula" ;
-        Text [ finnish ] = "V�lit ruudukon viivoihin" ;
-        Text [ danish ] = "Afstand til gitterlinjer" ;
-        Text [ french ] = "�cart des lignes de la grille" ;
-        Text [ swedish ] = "Avst�nd till gitterlinjer" ;
-        Text [ dutch ] = "Afstand tot rasterlijnen" ;
-        Text [ spanish ] = "Distancia a la cuadr�cula" ;
-        Text [ english_us ] = "Spacing to grid lines" ;
-        Text[ chinese_simplified ] = "�������ߵľ���";
-        Text[ russian ] = "���������� �� ����� �����";
-        Text[ polish ] = "Odst�p do linii siatki";
-        Text[ japanese ] = "��د�ސ��܂ł̊Ԋu";
-        Text[ chinese_traditional ] = "�ܺ���u���Z��";
-        Text[ arabic ] = "������� ��� ���� ������";
-        Text[ dutch ] = "Afstand tot rasterlijnen";
-        Text[ chinese_simplified ] = "�������ߵľ���";
-        Text[ greek ] = "�������� ��� ������� ���������";
-        Text[ korean ] = "�������� ����";
-        Text[ turkish ] = "K�lavuz �izgilere uzakl�k";
+        Pos = MAP_APPFONT ( 6 , 148 ) ;
+        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Text = "Textfluss" ;
+        Text [ English ] = "Text Flow" ;
+        Text [ english_us ] = "Text flow" ;
+        Text [ swedish ] = "Textfl�de" ;
+        Text [ danish ] = "Tekstretning" ;
+        Text [ italian ] = "Flusso di testo" ;
+        Text [ spanish ] = "Flujo del texto" ;
+        Text [ french ] = "Encha�nements" ;
+        Text [ dutch ] = "Tekstverloop" ;
+        Text [ portuguese_brazilian ] = "Textflu�" ;
+        Text [ portuguese ] = "Fluxo de texto" ;
+        Text[ chinese_simplified ] = "���кͷ�ҳ";
+        Text[ russian ] = "��������� �� ��������";
+        Text[ polish ] = "Tekst";
+        Text[ japanese ] = "�̍�";
+        Text[ chinese_traditional ] = "����M����";
+        Text[ arabic ] = "������ ����";
+        Text[ dutch ] = "Tekstverloop";
+        Text[ chinese_simplified ] = "���кͷ�ҳ";
+        Text[ greek ] = "��� ��������";
+        Text[ korean ] = "�ؽ�Ʈ �帧";
+        Text[ turkish ] = "Metin ak���";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Distancia a la cuadr�cula";
+        Text[ catalan ] = "Flujo del texto";
+        Text[ finnish ] = "Tekstin rivitys";
+        Text[ language_user1 ] = " ";
+        Text[ catalan ] = "Flujo del texto";
     };
     TriStateBox BTN_WRAP
     {
-        Pos = MAP_APPFONT ( 190 , 117 ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
+        Pos = MAP_APPFONT ( 12 , 159 ) ;
+        Size = MAP_APPFONT ( 100 , 10 ) ;
         Text = "Zeilenumbru~ch" ;
         Text [ ENGLISH ] = "Linebrea~k" ;
         Text [ norwegian ] = "Linebrea~k" ;
@@ -841,37 +576,6 @@ TabPage RID_SVXPAGE_ALIGNMENT
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Salto de ~l�nea";
     };
-    GroupBox GB_WRAP
-    {
-        Pos = MAP_APPFONT ( 185 , 106 ) ;
-        Size = MAP_APPFONT ( 69 , 25 ) ;
-        /* ### ACHTUNG: Neuer Text in Resource? Textflu� : Textflu� */
-        Text = "Textfluss" ;
-        Text [ English ] = "Text Flow" ;
-        Text [ english_us ] = "Text flow" ;
-        Text [ swedish ] = "Textfl�de" ;
-        Text [ danish ] = "Tekstretning" ;
-        Text [ italian ] = "Flusso di testo" ;
-        Text [ spanish ] = "Flujo del texto" ;
-        Text [ french ] = "Encha�nements" ;
-        Text [ dutch ] = "Tekstverloop" ;
-        Text [ portuguese_brazilian ] = "Textflu�" ;
-        Text [ portuguese ] = "Fluxo de texto" ;
-        Text[ chinese_simplified ] = "���кͷ�ҳ";
-        Text[ russian ] = "��������� �� ��������";
-        Text[ polish ] = "Tekst";
-        Text[ japanese ] = "�̍�";
-        Text[ chinese_traditional ] = "����M����";
-        Text[ arabic ] = "������ ����";
-        Text[ dutch ] = "Tekstverloop";
-        Text[ chinese_simplified ] = "���кͷ�ҳ";
-        Text[ greek ] = "��� ��������";
-        Text[ korean ] = "�ؽ�Ʈ �帧";
-        Text[ turkish ] = "Metin ak���";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Flujo del texto";
-        Text[ finnish ] = "Tekstin rivitys";
-    };
     ImageList IL_LOCK_BMPS
     {
         ImageBitmap = Bitmap { File = "lockmode.bmp" ; };
diff --git a/svx/source/dialog/chardlg.src b/svx/source/dialog/chardlg.src
index d38ca04624bb..1cc20407484b 100644
--- a/svx/source/dialog/chardlg.src
+++ b/svx/source/dialog/chardlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chardlg.src,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.43 $
  *
- *  last change: $Author: dr $ $Date: 2001-05-15 11:12:27 $
+ *  last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -3175,7 +3175,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     Window WIN_CHAR_PREVIEW
     {
-        Border = FALSE ;
+        Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 129  ) ;
         Size = MAP_APPFONT ( 248 , 39 ) ;
         Text = "Beispiel";
@@ -4916,7 +4916,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     Window WIN_EFFECTS_PREVIEW
     {
-        Border = FALSE ;
+        Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 129  ) ;
         Size = MAP_APPFONT ( 248 , 39 ) ;
         Text = "Beispiel";
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index e75c2284a883..111bef85897e 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fntctrl.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
+ *  last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -145,11 +145,7 @@ 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;
+    SetBorderStyle( WINDOW_BORDER_MONO );
 }
 
 // -----------------------------------------------------------------------
@@ -325,10 +321,6 @@ void SvxFontPrevWindow::Paint( const Rectangle& rRect )
         DrawLine( Point( nX + aTxtSize.Width(), nY ), Point( aLogSize.Width(), nY ) );
         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 c86ad837ccd5..a55dc7ed14e6 100644
--- a/svx/source/dialog/numfmt.cxx
+++ b/svx/source/dialog/numfmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmt.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
+ *  last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,6 +134,7 @@ SvxNumberPreviewImpl::SvxNumberPreviewImpl( Window* pParent, const ResId& rResId
     aFont.SetColor( Application::GetSettings().GetStyleSettings().GetFieldColor() );
     SetFont( aFont );
     InitSettings( TRUE, TRUE );
+    SetBorderStyle( WINDOW_BORDER_MONO );
 }
 
 /*************************************************************************
@@ -201,9 +202,6 @@ 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 ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/dialog/numfmt.src b/svx/source/dialog/numfmt.src
index a58a9708078e..3123fd5a8c9f 100644
--- a/svx/source/dialog/numfmt.src
+++ b/svx/source/dialog/numfmt.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numfmt.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
+ *  last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -855,7 +855,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     Window WND_NUMBER_PREVIEW
     {
-        Border = FALSE ;
+        Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 178 , 67 ) ;
         Size = MAP_APPFONT ( 76 , 18 ) ;
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 18a80fdafd35..fac1c80dab53 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paraprev.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dr $ $Date: 2001-05-15 11:12:28 $
+ *  last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -227,7 +227,7 @@ void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
     }
 
     SetLineColor( Color( COL_BLACK ) );
-    SetFillColor( Color( COL_TRANSPARENT ) );
+    SetFillColor();
     DrawRect( Rectangle( Point(), aWinSize ) );
 }