Fix #86988#: Dialog redesign

12 files changed, 283 insertions, 299 deletions

diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index f815445a97..4cf246e851 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinsdlg.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: jp $ $Date: 2001-04-27 17:18:14 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:38:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -396,35 +396,36 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
     aBtOk( this, SW_RES( BT_OK )),
     aBtCancel( this, SW_RES( BT_CANCEL )),
     aBtHelp( this, SW_RES( BT_HELP )),
-    aGbSelection( this, SW_RES( GB_SELECTION )),
+    aFlHead( this, SW_RES( FL_HEAD )),
     aFtDbColumn( this, SW_RES( FT_DB_COLUMN )),
-    aGbDbFormat( this, SW_RES( GB_DB_FORMAT )),
+    aFlFormat( this, SW_RES( FL_FORMAT )),
     aRbDbFmtFromDb( this, SW_RES( RB_DBFMT_FROM_DB )),
     aRbDbFmtFromUsr( this, SW_RES( RB_DBFMT_FROM_USR )),
     aLbDbFmtFromUsr( this, &rView, SW_RES( LB_DBFMT_FROM_USR )),
 
     /* ----- Page Text/Field ------- */
     aLbTxtDbColumn( this, SW_RES( LB_TXT_DB_COLUMN )),
-    aPbDbcolToEdit( this, SW_RES( PB_DBCOL_TOEDIT )),
+    aIbDbcolToEdit( this, SW_RES( IB_DBCOL_TOEDIT )),
     aEdDbText( this, SW_RES( ED_DB_TEXT )),
     aFtDbParaColl( this, SW_RES( FT_DB_PARA_COLL )),
     aLbDbParaColl( this, SW_RES( LB_DB_PARA_COLL )),
 
     /* ----- Page Table ------------ */
     aLbTblDbColumn( this, SW_RES( LB_TBL_DB_COLUMN )),
-    aPbDbcolAllTo( this, SW_RES( PB_DBCOL_ALL_TO )),
-    aPbDbcolOneTo( this, SW_RES( PB_DBCOL_ONE_TO )),
-    aPbDbcolOneFrom( this, SW_RES( PB_DBCOL_ONE_FROM )),
-    aPbDbcolAllFrom( this, SW_RES( PB_DBCOL_ALL_FROM )),
+    aIbDbcolAllTo( this, SW_RES( IB_DBCOL_ALL_TO )),
+    aIbDbcolOneTo( this, SW_RES( IB_DBCOL_ONE_TO )),
+    aIbDbcolOneFrom( this, SW_RES( IB_DBCOL_ONE_FROM )),
+    aIbDbcolAllFrom( this, SW_RES( IB_DBCOL_ALL_FROM )),
     aFtTableCol( this, SW_RES( FT_TABLE_COL )),
     aLbTableCol( this, SW_RES( LB_TABLE_COL )),
-    aGbTableHead( this, SW_RES( GB_TABLE_HEAD )),
     aCbTableHeadon( this, SW_RES( CB_TABLE_HEADON )),
     aRbHeadlColnms( this, SW_RES( RB_HEADL_COLNMS )),
     aRbHeadlEmpty( this, SW_RES( RB_HEADL_EMPTY )),
     aPbTblFormat( this, SW_RES( PB_TBL_FORMAT )),
     aPbTblAutofmt( this, SW_RES( PB_TBL_AUTOFMT )),
 
+    aFlBottom( this, SW_RES( FL_BOTTOM )),
+
     sNoTmpl( SW_RES( STR_NOTEMPL )),
     aDBData(rData),
     pView( &rView ),
@@ -436,7 +437,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
 {
     FreeResource();
 
-    nGBFmtLen = aGbDbFormat.GetText().Len();
+    nGBFmtLen = aFlFormat.GetText().Len();
 
     if(xColSupp.is())
     {
@@ -562,8 +563,8 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
     {
         aRbAsTable.Check( TRUE );
         aRbDbFmtFromDb.Check( TRUE );
-        aPbDbcolOneFrom.Enable( FALSE );
-        aPbDbcolAllFrom.Enable( FALSE );
+        aIbDbcolOneFrom.Enable( FALSE );
+        aIbDbcolAllFrom.Enable( FALSE );
     }
 
     aRbAsTable.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, PageHdl ));
@@ -576,11 +577,11 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
     aPbTblFormat.SetClickHdl(LINK(this, SwInsertDBColAutoPilot, TblFmtHdl ));
     aPbTblAutofmt.SetClickHdl(LINK(this, SwInsertDBColAutoPilot, AutoFmtHdl ));
 
-    aPbDbcolAllTo.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
-    aPbDbcolOneTo.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
-    aPbDbcolOneFrom.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
-    aPbDbcolAllFrom.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
-    aPbDbcolToEdit.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+    aIbDbcolAllTo.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+    aIbDbcolOneTo.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+    aIbDbcolOneFrom.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+    aIbDbcolAllFrom.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
+    aIbDbcolToEdit.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, TblToFromHdl ));
 
     aCbTableHeadon.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
     aRbHeadlColnms.SetClickHdl( LINK(this, SwInsertDBColAutoPilot, HeaderHdl ));
@@ -629,22 +630,21 @@ IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton )
     BOOL bShowTbl = pButton == &aRbAsTable;
 
     String sTxt( pButton->GetText() );
-    aGbSelection.SetText( sTxt.EraseAllChars( '~' ) );
+    aFlHead.SetText( sTxt.EraseAllChars( '~' ) );
 
     aLbTxtDbColumn.Show( !bShowTbl );
-    aPbDbcolToEdit.Show( !bShowTbl );
+    aIbDbcolToEdit.Show( !bShowTbl );
     aEdDbText.Show( !bShowTbl );
     aFtDbParaColl.Show( !bShowTbl );
     aLbDbParaColl.Show( !bShowTbl );
 
     aLbTblDbColumn.Show( bShowTbl );
-    aPbDbcolAllTo.Show( bShowTbl );
-    aPbDbcolOneTo.Show( bShowTbl );
-    aPbDbcolOneFrom.Show( bShowTbl );
-    aPbDbcolAllFrom.Show( bShowTbl );
+    aIbDbcolAllTo.Show( bShowTbl );
+    aIbDbcolOneTo.Show( bShowTbl );
+    aIbDbcolOneFrom.Show( bShowTbl );
+    aIbDbcolAllFrom.Show( bShowTbl );
     aFtTableCol.Show( bShowTbl );
     aLbTableCol.Show( bShowTbl );
-    aGbTableHead.Show( bShowTbl );
     aCbTableHeadon.Show( bShowTbl );
     aRbHeadlColnms.Show( bShowTbl );
     aRbHeadlEmpty.Show( bShowTbl );
@@ -688,7 +688,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
     aLbTblDbColumn.SetUpdateMode( FALSE );
     aLbTableCol.SetUpdateMode( FALSE );
 
-    if( pButton == &aPbDbcolAllTo )
+    if( pButton == &aIbDbcolAllTo )
     {
         bEnableTo = FALSE;
 
@@ -705,7 +705,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
         aLbTableCol.SelectEntryPos( nInsPos );
         aLbTblDbColumn.SelectEntryPos( LISTBOX_APPEND );
     }
-    else if( pButton == &aPbDbcolOneTo &&
+    else if( pButton == &aIbDbcolOneTo &&
             LISTBOX_ENTRY_NOTFOUND != aLbTblDbColumn.GetSelectEntryPos() )
     {
         USHORT nInsPos = aLbTableCol.GetSelectEntryPos(),
@@ -722,7 +722,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
 
         bEnableTo = 0 != aLbTblDbColumn.GetEntryCount();
     }
-    else if( pButton == &aPbDbcolOneFrom )
+    else if( pButton == &aIbDbcolOneFrom )
     {
         if( LISTBOX_ENTRY_NOTFOUND != aLbTableCol.GetSelectEntryPos() )
         {
@@ -761,7 +761,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
 
         bEnableFrom = 0 != aLbTableCol.GetEntryCount();
     }
-    else if( pButton == &aPbDbcolAllFrom )
+    else if( pButton == &aIbDbcolAllFrom )
     {
         bEnableFrom = FALSE;
 
@@ -771,7 +771,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
             aLbTblDbColumn.InsertEntry( aDBColumns[ n ]->sColumn, n );
         aLbTblDbColumn.SelectEntryPos( 0 );
     }
-    else if( pButton == &aPbDbcolToEdit )
+    else if( pButton == &aIbDbcolToEdit )
     {
         bChgEnable = FALSE;
         // Daten ins Edit moven:
@@ -812,10 +812,10 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton )
 
     if( bChgEnable )
     {
-        aPbDbcolOneTo.Enable( bEnableTo );
-        aPbDbcolAllTo.Enable( bEnableTo );
-        aPbDbcolOneFrom.Enable( bEnableFrom );
-        aPbDbcolAllFrom.Enable( bEnableFrom );
+        aIbDbcolOneTo.Enable( bEnableTo );
+        aIbDbcolAllTo.Enable( bEnableTo );
+        aIbDbcolOneFrom.Enable( bEnableFrom );
+        aIbDbcolAllFrom.Enable( bEnableFrom );
 
         aRbDbFmtFromDb.Enable( FALSE );
         aRbDbFmtFromUsr.Enable( FALSE );
@@ -835,11 +835,11 @@ IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox*, pBox )
 {
     Button* pButton = 0;
     if( pBox == &aLbTxtDbColumn )
-        pButton = &aPbDbcolToEdit;
-    else if( pBox == &aLbTblDbColumn && aPbDbcolOneTo.IsEnabled() )
-        pButton = &aPbDbcolOneTo;
-    else if( pBox == &aLbTableCol && aPbDbcolOneFrom.IsEnabled() )
-        pButton = &aPbDbcolOneFrom;
+        pButton = &aIbDbcolToEdit;
+    else if( pBox == &aLbTblDbColumn && aIbDbcolOneTo.IsEnabled() )
+        pButton = &aIbDbcolOneTo;
+    else if( pBox == &aLbTableCol && aIbDbcolOneFrom.IsEnabled() )
+        pButton = &aIbDbcolOneFrom;
 
     if( pButton )
         TblToFromHdl( pButton );
@@ -1004,7 +1004,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
     {
         // an der FormatGroupBox den ausgewaehlten FeldNamen setzen, damit
         // klar ist, welches Feld ueber das Format eingestellt wird!
-        String sTxt( aGbDbFormat.GetText().Copy( 0, nGBFmtLen ));
+        String sTxt( aFlFormat.GetText().Copy( 0, nGBFmtLen ));
         if( !aSrch.sColumn.getLength() )
         {
             aRbDbFmtFromDb.Enable( FALSE );
@@ -1030,7 +1030,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox )
                 aLbDbFmtFromUsr.SetDefFormat( aDBColumns[ nFndPos ]->nUsrNumFmt );
         }
 
-        aGbDbFormat.SetText( sTxt );
+        aFlFormat.SetText( sTxt );
 
         // um spaeter zu wissen, welche ListBox die "aktive" war, wird sich
         // im 1. Eintrag ein Flag gemerkt,
@@ -2015,11 +2015,11 @@ void SwInsertDBColAutoPilot::Load()
 
                 if( !aLbTblDbColumn.GetEntryCount() )
                 {
-                    aPbDbcolAllTo.Enable( FALSE );
-                    aPbDbcolOneTo.Enable( FALSE );
+                    aIbDbcolAllTo.Enable( FALSE );
+                    aIbDbcolOneTo.Enable( FALSE );
                 }
-                aPbDbcolOneFrom.Enable( TRUE );
-                aPbDbcolAllFrom.Enable( TRUE );
+                aIbDbcolOneFrom.Enable( TRUE );
+                aIbDbcolAllFrom.Enable( TRUE );
             }
             aEdDbText.SetText( pNewData->sEdit );
 
diff --git a/sw/source/ui/dbui/dbinsdlg.hrc b/sw/source/ui/dbui/dbinsdlg.hrc
index 4b251d0309..0c07959869 100644
--- a/sw/source/ui/dbui/dbinsdlg.hrc
+++ b/sw/source/ui/dbui/dbinsdlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinsdlg.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:33 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:38:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,9 +70,9 @@
 #define BT_OK					5
 #define BT_CANCEL				6
 #define BT_HELP					7
-#define GB_SELECTION			8
+#define FL_HEAD                           8
 #define FT_DB_COLUMN			10
-#define GB_DB_FORMAT			11
+#define FL_FORMAT                       11
 #define RB_DBFMT_FROM_DB		12
 #define RB_DBFMT_FROM_USR		13
 #define LB_DBFMT_FROM_USR		14
@@ -80,21 +80,21 @@
 /* ------------- Page Text/Field ------------------ */
 #define LB_TXT_DB_COLUMN		15
 
-#define PB_DBCOL_TOEDIT			16
-#define ED_DB_TEXT				17
+#define IB_DBCOL_TOEDIT                 16
+#define ED_DB_TEXT                      17
 #define FT_DB_PARA_COLL			18
 #define LB_DB_PARA_COLL			19
 
 /* ------------- Page Table -------------------- */
 #define LB_TBL_DB_COLUMN		20
 
-#define PB_DBCOL_ALL_TO			21
-#define PB_DBCOL_ONE_TO			22
-#define PB_DBCOL_ONE_FROM		23
-#define PB_DBCOL_ALL_FROM		24
+#define IB_DBCOL_ALL_TO                 21
+#define IB_DBCOL_ONE_TO                 22
+#define IB_DBCOL_ONE_FROM               23
+#define IB_DBCOL_ALL_FROM               24
 #define FT_TABLE_COL			25
 #define LB_TABLE_COL			26
-#define GB_TABLE_HEAD			27
+#define FL_BOTTOM                       27
 #define CB_TABLE_HEADON			28
 #define RB_HEADL_COLNMS			29
 #define RB_HEADL_EMPTY			30
diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src
index dd8040a017..22a8d690d3 100644
--- a/sw/source/ui/dbui/dbinsdlg.src
+++ b/sw/source/ui/dbui/dbinsdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinsdlg.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: rt $ $Date: 2001-05-17 08:08:30 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:38:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -213,10 +213,10 @@ ModalDialog DLG_AP_INSERT_DB_SEL
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
-    GroupBox GB_SELECTION
+    FixedLine FL_HEAD
     {
         Pos = MAP_APPFONT ( 6 , 19 ) ;
-        Size = MAP_APPFONT ( 279 , 150 ) ;
+        Size = MAP_APPFONT ( 279 , 8 ) ;
         /* wird dynamisch gesetzt! */
         Text = "" ;
     };
@@ -249,10 +249,10 @@ ModalDialog DLG_AP_INSERT_DB_SEL
         Text[ catalan ] = "~Columnas de la base de datos";
         Text[ finnish ] = "~Tietokannan sarakkeet";
     };
-    GroupBox GB_DB_FORMAT
+    FixedLine FL_FORMAT
     {
-        Pos = MAP_APPFONT ( 12 , 121 ) ;
-        Size = MAP_APPFONT ( 99 , 42 ) ;
+        Pos = MAP_APPFONT (   6 , 117 ) ;
+        Size = MAP_APPFONT ( 279 , 8 ) ;
         Text = "For~mat" ;
         Text [ ENGLISH ] = "For~mat" ;
         Text [ english_us ] = "For~mat" ;
@@ -280,7 +280,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_DBFMT_FROM_DB
     {
-        Pos = MAP_APPFONT ( 15 , 133 ) ;
+        Pos = MAP_APPFONT ( 15 , 128 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text = "A~us Datenbank" ;
         Text [ ENGLISH ] = "From database" ;
@@ -311,14 +311,14 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_DBFMT_FROM_USR
     {
-        Pos = MAP_APPFONT ( 15 , 148 ) ;
+        Pos = MAP_APPFONT ( 15 , 143 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         TabStop = TRUE ;
     };
     ListBox LB_DBFMT_FROM_USR
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 30 , 146 ) ;
+        Pos = MAP_APPFONT ( 30 , 142 ) ;
         Size = MAP_APPFONT ( 75 , 44 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -329,23 +329,35 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 41 ) ;
-        Size = MAP_APPFONT ( 75 , 70 ) ;
+        Size = MAP_APPFONT ( 93 , 70 ) ;
         TabStop = TRUE ;
         Hide = TRUE ;
     };
-    PushButton PB_DBCOL_TOEDIT
+    ImageButton IB_DBCOL_TOEDIT
     {
-        Pos = MAP_APPFONT ( 92 , 99 ) ;
+        Pos = MAP_APPFONT ( 111 , 41 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
-        Text = "=>" ;
         TabStop = TRUE ;
         Hide = TRUE ;
+        ButtonImage = Image
+        {
+            ImageBitmap = Bitmap
+            {
+                File = "one_right.bmp" ;
+            };
+            MaskColor = Color
+            {
+                Red = 0xC000 ;
+                Green = 0xC000 ;
+                Blue = 0xC000 ;
+            };
+        };
     };
     MultiLineEdit ED_DB_TEXT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 118 , 41 ) ;
-        Size = MAP_APPFONT ( 161 , 70 ) ;
+        Pos = MAP_APPFONT ( 137 , 41 ) ;
+        Size = MAP_APPFONT ( 142 , 70 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
         VScroll = TRUE ;
@@ -355,8 +367,8 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     FixedText FT_DB_PARA_COLL
     {
-        Pos = MAP_APPFONT ( 118 , 133 ) ;
-        Size = MAP_APPFONT ( 58 , 10 ) ;
+        Pos = MAP_APPFONT ( 118 , 129 ) ;
+        Size = MAP_APPFONT ( 58 , 8 ) ;
         TEXT = "Absat~zvorlage:" ;
         TEXT [ English ] = "Paragraph Style:" ;
         TEXT [ norwegian ] = "Avsnittsmal:" ;
@@ -387,8 +399,8 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     ListBox LB_DB_PARA_COLL
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 182 , 131 ) ;
-        Size = MAP_APPFONT ( 90 , 59 ) ;
+        Pos = MAP_APPFONT ( 182 , 127 ) ;
+        Size = MAP_APPFONT ( 97 , 59 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Hide = TRUE ;
@@ -399,40 +411,88 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 41 ) ;
-        Size = MAP_APPFONT ( 75 , 70 ) ;
+        Size = MAP_APPFONT ( 93 , 70 ) ;
         TabStop = TRUE ;
     };
-    PushButton PB_DBCOL_ALL_TO
+    ImageButton IB_DBCOL_ALL_TO
     {
-        Pos = MAP_APPFONT ( 92 , 41 ) ;
+        Pos = MAP_APPFONT ( 111 , 41 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
-        Text = "~=>>" ;
         TabStop = TRUE ;
-    };
-    PushButton PB_DBCOL_ONE_TO
-    {
-        Pos = MAP_APPFONT ( 92 , 56 ) ;
+        ButtonImage = Image
+        {
+            ImageBitmap = Bitmap
+            {
+                File = "all_right.bmp" ;
+            };
+            MaskColor = Color
+            {
+                Red = 0xC000 ;
+                Green = 0xC000 ;
+                Blue = 0xC000 ;
+            };
+        };
+    };
+    ImageButton IB_DBCOL_ONE_TO
+    {
+        Pos = MAP_APPFONT ( 111 , 56 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
-        Text = "-~>" ;
         TabStop = TRUE ;
-    };
-    PushButton PB_DBCOL_ONE_FROM
-    {
-        Pos = MAP_APPFONT ( 92 , 84 ) ;
+        ButtonImage = Image
+        {
+            ImageBitmap = Bitmap
+            {
+                File = "one_right.bmp" ;
+            };
+            MaskColor = Color
+            {
+                Red = 0xC000 ;
+                Green = 0xC000 ;
+                Blue = 0xC000 ;
+            };
+        };
+    };
+    ImageButton IB_DBCOL_ONE_FROM
+    {
+        Pos = MAP_APPFONT ( 111 , 84 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
-        Text = "<~-" ;
         TabStop = TRUE ;
-    };
-    PushButton PB_DBCOL_ALL_FROM
-    {
-        Pos = MAP_APPFONT ( 92 , 99 ) ;
+        ButtonImage = Image
+        {
+            ImageBitmap = Bitmap
+            {
+                File = "one_left.bmp" ;
+            };
+            MaskColor = Color
+            {
+                Red = 0xC000 ;
+                Green = 0xC000 ;
+                Blue = 0xC000 ;
+            };
+        };
+    };
+    ImageButton IB_DBCOL_ALL_FROM
+    {
+        Pos = MAP_APPFONT ( 111 , 99 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
-        Text = "~<<=" ;
         TabStop = TRUE ;
+        ButtonImage = Image
+        {
+            ImageBitmap = Bitmap
+            {
+                File = "all_left.bmp" ;
+            };
+            MaskColor = Color
+            {
+                Red = 0xC000 ;
+                Green = 0xC000 ;
+                Blue = 0xC000 ;
+            };
+        };
     };
     FixedText FT_TABLE_COL
     {
-        Pos = MAP_APPFONT ( 118 , 31 ) ;
+        Pos = MAP_APPFONT ( 137 , 31 ) ;
         Size = MAP_APPFONT ( 40 , 10 ) ;
         Text = "Tabe~lle" ;
         Text [ ENGLISH ] = "Tab~le" ;
@@ -462,134 +522,44 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     ListBox LB_TABLE_COL
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 118 , 42 ) ;
+        Pos = MAP_APPFONT ( 137 , 41 ) ;
         Size = MAP_APPFONT ( 75 , 70 ) ;
         TabStop = TRUE ;
     };
-    GroupBox GB_TABLE_HEAD
-    {
-        Pos = MAP_APPFONT ( 199 , 41 ) ;
-        Size = MAP_APPFONT ( 80 , 58 ) ;
-        Text = "Tabellen黚erschrift" ;
-        Text [ ENGLISH ] = "Table headline" ;
-        Text [ english_us ] = "Table heading" ;
-        Text [ portuguese_brazilian ] = "Tabellen?erschrift" ;
-        Text [ swedish ] = "Tabell鰒erskrift" ;
-        Text [ danish ] = "Tabeloverskrift" ;
-        Text [ italian ] = "Titolo tabella" ;
-        Text [ spanish ] = "Encabezado de la tabla" ;
-        Text [ french ] = "Titre de la table" ;
-        Text [ dutch ] = "Tabelopschrift" ;
-        Text [ portuguese ] = "T韙ulo da tabela" ;
-        Text[ chinese_simplified ] = "表格标题";
-        Text[ russian ] = "青泐腩忸� 蜞犭桷�";
-        Text[ polish ] = "Nag丑wek tabeli";
-        Text[ japanese ] = "昞\偺尒弌偟";
-        Text[ chinese_traditional ] = "夹肈";
-        Text[ arabic ] = "阡媲� 轻滔擎�";
-        Text[ dutch ] = "Tabelopschrift";
-        Text[ chinese_simplified ] = "表格标题";
-        Text[ greek ] = "硼殛弼犭咪� 疬磲赆";
-        Text[ korean ] = "钎 力格";
-        Text[ turkish ] = "Tablo ba�";
-        Text[ catalan ] = "Encabezado de la tabla";
-        Text[ finnish ] = "Taulukon otsikko";
+    FixedLine FL_BOTTOM
+    {
+        Pos = MAP_APPFONT ( 0 , 164 ) ;
+        Size = MAP_APPFONT ( 291, 8 ) ;
     };
     CheckBox CB_TABLE_HEADON
     {
-        Pos = MAP_APPFONT ( 205 , 56 ) ;
+        Pos = MAP_APPFONT ( 111 , 128 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
-        Text = "E~inschalten" ;
+        Text = "Tabellen黚erschrift einf黦en" ;
         Text [ ENGLISH ] = "On" ;
         TabStop = TRUE ;
         Check = TRUE ;
-        Text [ english_us ] = "~On" ;
-        Text [ portuguese_brazilian ] = "E~inschalten" ;
-        Text [ swedish ] = "~P�" ;
-        Text [ danish ] = "Aktiver" ;
-        Text [ italian ] = "Attiva" ;
-        Text [ spanish ] = "~Activar" ;
-        Text [ french ] = "~Activer" ;
-        Text [ dutch ] = "In~schakelen" ;
-        Text [ portuguese ] = "~Activar" ;
-        Text[ chinese_simplified ] = "激活(~O)";
-        Text[ russian ] = "玛膻麒螯";
-        Text[ polish ] = "W彻cz";
-        Text[ japanese ] = "递(~O)";
-        Text[ chinese_traditional ] = "币笆(~O)";
-        Text[ arabic ] = "试垌�";
-        Text[ dutch ] = "In~schakelen";
-        Text[ chinese_simplified ] = "激活(~O)";
-        Text[ greek ] = "彭羼泔痫哏箸";
-        Text[ korean ] = "劝己(~O)";
-        Text[ turkish ] = "莂lt齬";
-        Text[ catalan ] = "~Activar";
-        Text[ finnish ] = "~On";
     };
     RadioButton RB_HEADL_COLNMS
     {
-        Pos = MAP_APPFONT ( 217 , 72 ) ;
+        Pos = MAP_APPFONT ( 117 , 142 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
-        Text = "S~paltenamen" ;
+        Text = "S~paltenamen 黚ernehmen" ;
         Text [ English ] = "Column name" ;
         TabStop = TRUE ;
         Check = TRUE ;
-        Text [ portuguese ] = "~Nome da coluna" ;
-        Text [ english_us ] = "Column ~name" ;
-        Text [ portuguese_brazilian ] = "S~paltenamen" ;
-        Text [ swedish ] = "Kolumn~namn" ;
-        Text [ danish ] = "Kolonnenavn" ;
-        Text [ italian ] = "Nomi colonne" ;
-        Text [ spanish ] = "~Nombres de columnas" ;
-        Text [ french ] = "Noms ~de colonne" ;
-        Text [ dutch ] = "K~olomnaam" ;
-        Text[ chinese_simplified ] = "栏名(~N)";
-        Text[ russian ] = "褥屙� 觐腩眍�";
-        Text[ polish ] = "Nazwa kolumny";
-        Text[ japanese ] = "楍柤(~N)";
-        Text[ chinese_traditional ] = "逆(~N)";
-        Text[ arabic ] = "糜闱� 轻泌阆�";
-        Text[ dutch ] = "K~olomnaam";
-        Text[ chinese_simplified ] = "栏名(~N)";
-        Text[ greek ] = "享狒� 篝揠珧";
-        Text[ korean ] = "凯 捞抚(~N)";
-        Text[ turkish ] = "~S黷un ad�";
-        Text[ catalan ] = "~Nombres de columnas";
-        Text[ finnish ] = "~Sarakkeen nimi";
     };
     RadioButton RB_HEADL_EMPTY
     {
-        Pos = MAP_APPFONT ( 217 , 87 ) ;
+        Pos = MAP_APPFONT ( 117 , 156 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
-        Text = "lee~r" ;
+        Text = "Nur Zeile erstellen" ;
         Text [ English ] = "empty" ;
         TabStop = TRUE ;
-        Text [ portuguese ] = "~vazio" ;
-        Text [ english_us ] = "~empty" ;
-        Text [ portuguese_brazilian ] = "lee~r" ;
-        Text [ swedish ] = "t~om" ;
-        Text [ danish ] = "tom" ;
-        Text [ italian ] = "v~uoto" ;
-        Text [ spanish ] = "~vac韔" ;
-        Text [ french ] = "~Vide" ;
-        Text [ dutch ] = "lee~g" ;
-        Text[ chinese_simplified ] = "空缺(~E)";
-        Text[ russian ] = "矬耱铋";
-        Text[ polish ] = "pusty";
-        Text[ japanese ] = "嬻敀(~E)";
-        Text[ chinese_traditional ] = "(~E)";
-        Text[ arabic ] = "萸眼";
-        Text[ dutch ] = "lee~g";
-        Text[ chinese_simplified ] = "空缺(~E)";
-        Text[ greek ] = "赍睃";
-        Text[ korean ] = "厚绢乐澜(~E)";
-        Text[ turkish ] = "bo�";
-        Text[ catalan ] = "~vac韔";
-        Text[ finnish ] = "~tyhj�";
     };
     PushButton PB_TBL_FORMAT
     {
-        Pos = MAP_APPFONT ( 199 , 124 ) ;
+        Pos = MAP_APPFONT ( 219 , 128 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
         Text = "Ei~genschaften..." ;
         Text [ English ] = "Properties..." ;
@@ -619,7 +589,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     PushButton PB_TBL_AUTOFMT
     {
-        Pos = MAP_APPFONT ( 199 , 142 ) ;
+        Pos = MAP_APPFONT ( 219 , 144 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
         Text = "Aut~oformat..." ;
         Text [ English ] = "Aut~oformat..." ;
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index f284cb0d63..92f8388c2d 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: flddb.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-02-22 13:52:36 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:40:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,10 +123,13 @@ SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet ) :
     aNewFormatRB(this, SW_RES(RB_DBFORMAT)),
     aNumFormatLB(this, SW_RES(LB_DBNUMFORMAT)),
     aFormatLB	(this, SW_RES(LB_DBFORMAT)),
-    aFormatGB	(this, SW_RES(GB_DBFORMAT))
+    aFormatFL   (this, SW_RES(FL_DBFORMAT)),
+    aFormatVertFL   (this, SW_RES(FL_DBFORMAT_VERT))
 {
     FreeResource();
 
+    aFormatVertFL.SetStyle( aFormatVertFL.GetStyle() | WB_VERT );
+
     aOldNumSelectHdl = aNumFormatLB.GetSelectHdl();
 
     aNumFormatLB.SetSelectHdl(LINK(this, SwFldDBPage, NumSelectHdl));
@@ -444,7 +447,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
             aNumFormatLB.Enable(bDBFormat);
             aFormatLB.Enable(bFormat);
         }
-        aFormatGB.Enable(bDBFormat|bFormat);
+        aFormatFL.Enable(bDBFormat|bFormat);
 
         if (!IsFldEdit())
         {
@@ -547,7 +550,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
             aDBFormatRB.Enable(bNumFormat);
             aNewFormatRB.Enable(bNumFormat);
             aNumFormatLB.Enable(bNumFormat);
-            aFormatGB.Enable(bNumFormat);
+            aFormatFL.Enable(bNumFormat);
         }
     }
     return 0;
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 33eef900f4..f021ea7d68 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: flddb.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-10-27 11:24:22 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:40:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,7 +98,8 @@ class SwFldDBPage : public SwFldPage
     RadioButton			aNewFormatRB;
     NumFormatListBox	aNumFormatLB;
     ListBox				aFormatLB;
-    GroupBox			aFormatGB;
+    FixedLine           aFormatFL;
+    FixedLine           aFormatVertFL;
 
     String				sOldDBName;
     String				sOldTableName;
diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src
index 5b789f04ca..8e66e51492 100644
--- a/sw/source/ui/fldui/flddb.src
+++ b/sw/source/ui/fldui/flddb.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: flddb.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: rt $ $Date: 2001-05-17 08:15:45 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:40:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,8 +102,8 @@ TabPage TP_FLD_DB
     ListBox LB_DBTYPE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 16 ) ;
-        Size = MAP_APPFONT ( 76 , 104 ) ;
+        Pos = MAP_APPFONT ( 6 , 14 ) ;
+        Size = MAP_APPFONT ( 76 , 106 ) ;
         TabStop = TRUE ;
         Sort = TRUE ;
         AutoHScroll = TRUE ;
@@ -148,15 +148,15 @@ TabPage TP_FLD_DB
     Edit ED_DBCONDITION
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 138 ) ;
+        Pos = MAP_APPFONT ( 6 , 137 ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
     };
     FixedText FT_DBSETNUMBER
     {
-        Pos = MAP_APPFONT ( 6 , 155 ) ;
-        Size = MAP_APPFONT ( 76 , 10 ) ;
+        Pos = MAP_APPFONT ( 6 , 156 ) ;
+        Size = MAP_APPFONT ( 76 , 8 ) ;
         TEXT = "Sat~znummer" ;
         TEXT [ English ] = "Setnumber" ;
         TEXT [ norwegian ] = "Setnumber" ;
@@ -193,7 +193,7 @@ TabPage TP_FLD_DB
     FixedText FT_DBSELECTION
     {
         Pos = MAP_APPFONT ( 88 , 3 ) ;
-        Size = MAP_APPFONT ( 166 , 10 ) ;
+        Size = MAP_APPFONT ( 166 , 8 ) ;
         Text = "Datenbank~auswahl" ;
         Text [ ENGLISH ] = "Database s~election" ;
         Left = TRUE ;
@@ -221,8 +221,8 @@ TabPage TP_FLD_DB
     Control TLB_DBLIST
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 88 , 16 ) ;
-        Size = MAP_APPFONT ( 166 , 122 ) ;
+        Pos = MAP_APPFONT ( 88 , 14 ) ;
+        Size = MAP_APPFONT ( 160 , 124 ) ;
         TabStop = TRUE ;
     };
     RadioButton RB_DBOWNFORMAT
@@ -300,10 +300,10 @@ TabPage TP_FLD_DB
         Sort = FALSE ;
         Hide = TRUE ;
     };
-    GroupBox GB_DBFORMAT
+    FixedLine FL_DBFORMAT
     {
         Pos = MAP_APPFONT ( 88 , 141 ) ;
-        Size = MAP_APPFONT ( 166 , 38 ) ;
+        Size = MAP_APPFONT ( 166 , 8 ) ;
         TEXT = "Format" ;
         TEXT [ English ] = "Format" ;
         Text [ english_us ] = "Format" ;
@@ -327,6 +327,11 @@ TabPage TP_FLD_DB
         Text[ catalan ] = "Formato";
         Text[ finnish ] = "Muotoile";
     };
+    FixedLine FL_DBFORMAT_VERT
+    {
+        Pos = MAP_APPFONT ( 87 , 152 ) ;
+        Size = MAP_APPFONT ( 4 , 27 ) ;
+    };
     Text [ english_us ] = "Database" ;
     Text [ portuguese_brazilian ] = "Datenbank" ;
     Text [ swedish ] = "Databas" ;
diff --git a/sw/source/ui/fldui/fldtdlg.hrc b/sw/source/ui/fldui/fldtdlg.hrc
index daee040689..0de8dc5085 100644
--- a/sw/source/ui/fldui/fldtdlg.hrc
+++ b/sw/source/ui/fldui/fldtdlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldtdlg.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:40:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,7 @@
 #define RC_TP_DB_START		(RC_FLDTDLG_BEGIN)
 #define FT_DBTYPE			(RC_TP_DB_START + 1)
 #define LB_DBTYPE			(RC_TP_DB_START + 2)
-#define GB_DBFORMAT			(RC_TP_DB_START + 3)
+#define FL_DBFORMAT                     (RC_TP_DB_START + 3)
 #define FT_DBSELECTION		(RC_TP_DB_START + 4)
 #define TLB_DBLIST			(RC_TP_DB_START + 5)
 #define FT_DBCONDITION		(RC_TP_DB_START + 6)
@@ -84,6 +84,7 @@
 #define RB_DBFORMAT			(RC_TP_DB_START + 12)
 #define RB_DBOWNFORMAT		(RC_TP_DB_START + 13)
 #define RC_TP_DB_END		(RC_TP_DB_START + 14)
+#define FL_DBFORMAT_VERT                (RC_TP_DB_START + 15)
 
 // Dokumentinfo-TabPage:
 #define RC_TP_DOCINF_START	(RC_TP_DB_END)
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx
index 6e745d814f..d52a523a61 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/ui/inc/dbinsdlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbinsdlg.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: os $ $Date: 2001-02-21 12:27:36 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:42:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -150,31 +150,30 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
     RadioButton 	aRbAsField;
     RadioButton 	aRbAsText;
 
-    GroupBox 		aGbSelection;
+    FixedLine       aFlHead;
     FixedText 		aFtDbColumn;
 
     ListBox 		aLbTblDbColumn;
     ListBox 		aLbTxtDbColumn;
 
-    GroupBox 		aGbDbFormat;
+    FixedLine       aFlFormat;
     RadioButton 	aRbDbFmtFromDb;
     RadioButton 	aRbDbFmtFromUsr;
     NumFormatListBox aLbDbFmtFromUsr;
 
     /* ----- Page Text/Field ------- */
-    PushButton 		aPbDbcolToEdit;
+    ImageButton     aIbDbcolToEdit;
     MultiLineEdit 	aEdDbText;
     FixedText 		aFtDbParaColl;
     ListBox 		aLbDbParaColl;
 
     /* ----- Page Table ------------ */
-    PushButton 		aPbDbcolAllTo;
-    PushButton 		aPbDbcolOneTo;
-    PushButton 		aPbDbcolOneFrom;
-    PushButton 		aPbDbcolAllFrom;
+    ImageButton     aIbDbcolAllTo;
+    ImageButton     aIbDbcolOneTo;
+    ImageButton     aIbDbcolOneFrom;
+    ImageButton     aIbDbcolAllFrom;
     FixedText 		aFtTableCol;
     ListBox 		aLbTableCol;
-    GroupBox 		aGbTableHead;
     CheckBox 		aCbTableHeadon;
     RadioButton 	aRbHeadlColnms;
     RadioButton 	aRbHeadlEmpty;
@@ -185,7 +184,9 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
     CancelButton 	aBtCancel;
     HelpButton 		aBtHelp;
 
-    SwInsDBColumns	aDBColumns;
+    FixedLine       aFlBottom;
+
+    SwInsDBColumns  aDBColumns;
     const SwDBData	aDBData;
 
     Link			aOldNumFmtLnk;
diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/ui/inc/idxmrk.hxx
index 17fcb667d1..bb6accd139 100644
--- a/sw/source/ui/inc/idxmrk.hxx
+++ b/sw/source/ui/inc/idxmrk.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxmrk.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:42:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -250,15 +250,15 @@ class SwAuthMarkDlg : public Window
     friend class SwAuthMarkModalDlg;
     RadioButton		aFromComponentRB;
     RadioButton		aFromDocContentRB;
-    FixedText		aEntryFT;
-    Edit			aEntryED;
-    ListBox 		aEntryLB;
     FixedText		aAuthorFT;
     FixedInfo		aAuthorFI;
     FixedText		aTitleFT;
     FixedInfo		aTitleFI;
+    FixedText		aEntryFT;
+    Edit			aEntryED;
+    ListBox 		aEntryLB;
 
-    GroupBox		aEntryGB;
+    FixedLine       aEntryFL;
 
     OKButton 		aOKBT;
     CancelButton 	aCancelBT;
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index 725f54f20e..3b057542ba 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxmrk.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: jp $ $Date: 2001-03-27 21:47:24 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:43:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1094,7 +1094,7 @@ SwAuthMarkDlg::SwAuthMarkDlg(  Window *pParent,
     aAuthorFI(	this, ResId(FI_AUTHOR  	)),
     aTitleFT(	this, ResId(FT_TITLE 	)),
     aTitleFI(	this, ResId(FI_TITLE 	)),
-    aEntryGB(	this, ResId(GB_ENTRY	)),
+    aEntryFL(   this, ResId(FL_ENTRY    )),
     aOKBT(		this, ResId(PB_OK		)),
     aCancelBT(	this, ResId(PB_CANCEL	)),
     aHelpBT(	this, ResId(PB_HELP	)),
@@ -1784,6 +1784,9 @@ void	SwAuthMarkModalDlg::Apply()
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.8  2001/03/27 21:47:24  jp
+    optimize SeachOption initialisation
+
     Revision 1.7  2001/03/19 15:59:00  tl
     use TransliterationModules_IGNORE_CASE now
 
diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/ui/index/idxmrk.hrc
index 87e59f3598..a1d8d80d2a 100644
--- a/sw/source/ui/index/idxmrk.hrc
+++ b/sw/source/ui/index/idxmrk.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxmrk.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:43:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,7 +86,7 @@
 #define PB_HELP	    24
 #define GB_ENTRIES  25
 #define PB_CREATEENTRY 26
-#define GB_ENTRY	27
+#define FL_ENTRY        27
 #define FT_TITLE	28
 #define FI_TITLE    29
 #define FT_AUTHOR   30
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 3edfed49f5..f94ce65aed 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxmrk.src,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:18:57 $
+ *  last change: $Author: fme $ $Date: 2001-05-25 14:43:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -825,53 +825,9 @@ String STR_IDXMRK_INSERT
             Text[ catalan ] = "~Del contenido del documento";\
             Text[ finnish ] = "~Asiakirjan sis鋖l鰏t�";\
         };															\
-        FixedText FT_ENTRY                              \
-        {                                               \
-            Pos = MAP_APPFONT ( 12 , 15 + RADIO_BUTTON_HEIGHT) ; \
-            Size = MAP_APPFONT ( 60 , 8 ) ;             \
-            Text = "~Kurzbezeichnung" ;                 \
-            Text [ ENGLISH ] = "Short name" ;           \
-            Text[ english_us ] = "Short ~name";\
-            Text[ portuguese ] = "~Abreviatura";\
-            Text[ russian ] = "杨牮帙屙眍� 磬玮囗桢";\
-            Text[ greek ] = "吁眙镬镢襻鲞�";\
-            Text[ dutch ] = "Beknopte aand~uiding";\
-            Text[ french ] = "~Abr間�";\
-            Text[ spanish ] = "Abre~viatura";\
-            Text[ italian ] = "Abbreviazione";\
-            Text[ danish ] = "Kort betegnelse";\
-            Text[ swedish ] = "~Kort beteckning";\
-            Text[ polish ] = "Skr髏";\
-            Text[ portuguese_brazilian ] = "Short name";\
-            Text[ japanese ] = "棯徧(~N)";\
-            Text[ korean ] = "陋篮 捞抚(~N)";\
-            Text[ chinese_simplified ] = "简称(~N)";\
-            Text[ chinese_traditional ] = "虏祏磞瓃(~N)";\
-            Text[ arabic ] = "轻怯� 轻阄收�";\
-            Text[ turkish ] = "K~齭altma";\
-            Text[ language_user1 ] = " ";\
-            Text[ catalan ] = "Abre~viatura";\
-            Text[ finnish ] = "Lyhyt ~nimi";\
-        };                                              \
-        Edit ED_ENTRY                                   \
-        {                                               \
-            Border = TRUE ;                             \
-            Pos = MAP_APPFONT ( 75 , 14 + RADIO_BUTTON_HEIGHT) ; \
-            Size = MAP_APPFONT ( 74 , 12 ) ;            \
-            TabStop = TRUE ;                            \
-            Left = TRUE ;                               \
-        };                                              \
-        ListBox LB_ENTRY                                   \
-        {                                               \
-            Border = TRUE ;                             \
-            Pos = MAP_APPFONT ( 75 , 14 + RADIO_BUTTON_HEIGHT) ; \
-            Size = MAP_APPFONT ( 74 , 50 ) ;            \
-            TabStop = TRUE ;                            \
-            DropDown = TRUE ;                           \
-        };                                              \
         FixedText FT_AUTHOR                             \
         {                                               \
-            Pos = MAP_APPFONT ( 12 , 28 + RADIO_BUTTON_HEIGHT) ; \
+            Pos = MAP_APPFONT ( 12 , 14 + RADIO_BUTTON_HEIGHT) ; \
             Size = MAP_APPFONT ( 60 , 8 ) ;             \
             Text = "Autor" ;                            \
             Text [ ENGLISH ] = "Author" ;               \
@@ -899,13 +855,13 @@ String STR_IDXMRK_INSERT
         };                                              \
         FixedText	FI_AUTHOR                           \
         {                                               \
-            Pos = MAP_APPFONT ( 75 , 28 + RADIO_BUTTON_HEIGHT) ; \
-            Size = MAP_APPFONT ( 74 , 20 ) ;            \
+            Pos = MAP_APPFONT ( 12 , 25 + RADIO_BUTTON_HEIGHT) ; \
+            Size = MAP_APPFONT ( 140, 8 ) ;            \
             WordBreak = TRUE;                           \
         };                                              \
         FixedText FT_TITLE                              \
         {                                               \
-            Pos = MAP_APPFONT ( 12 , 54 + RADIO_BUTTON_HEIGHT) ; \
+            Pos = MAP_APPFONT ( 12 , 37 + RADIO_BUTTON_HEIGHT) ; \
             Size = MAP_APPFONT ( 60 , 8 ) ;             \
             Text = "Titel" ;                            \
             Text [ ENGLISH ] = "Title" ;                \
@@ -933,14 +889,58 @@ String STR_IDXMRK_INSERT
         };                                              \
         FixedText	FI_TITLE                            \
         {                                               \
-            Pos = MAP_APPFONT ( 75 , 54  + RADIO_BUTTON_HEIGHT) ; \
-            Size = MAP_APPFONT ( 74 , 20 ) ;            \
+            Pos = MAP_APPFONT ( 12 , 48  + RADIO_BUTTON_HEIGHT) ; \
+            Size = MAP_APPFONT ( 140, 8 ) ;            \
             WordBreak = TRUE;                           \
         };                                              \
-        GroupBox GB_ENTRY                               \
+        FixedText FT_ENTRY                              \
+        {                                               \
+            Pos = MAP_APPFONT ( 12 , 62 + RADIO_BUTTON_HEIGHT) ; \
+            Size = MAP_APPFONT ( 60 , 8 ) ;             \
+            Text = "~Kurzbezeichnung" ;                 \
+            Text [ ENGLISH ] = "Short name" ;           \
+            Text[ english_us ] = "Short ~name";\
+            Text[ portuguese ] = "~Abreviatura";\
+            Text[ russian ] = "杨牮帙屙眍� 磬玮囗桢";\
+            Text[ greek ] = "吁眙镬镢襻鲞�";\
+            Text[ dutch ] = "Beknopte aand~uiding";\
+            Text[ french ] = "~Abr間�";\
+            Text[ spanish ] = "Abre~viatura";\
+            Text[ italian ] = "Abbreviazione";\
+            Text[ danish ] = "Kort betegnelse";\
+            Text[ swedish ] = "~Kort beteckning";\
+            Text[ polish ] = "Skr髏";\
+            Text[ portuguese_brazilian ] = "Short name";\
+            Text[ japanese ] = "棯徧(~N)";\
+            Text[ korean ] = "陋篮 捞抚(~N)";\
+            Text[ chinese_simplified ] = "简称(~N)";\
+            Text[ chinese_traditional ] = "虏祏磞瓃(~N)";\
+            Text[ arabic ] = "轻怯� 轻阄收�";\
+            Text[ turkish ] = "K~齭altma";\
+            Text[ language_user1 ] = " ";\
+            Text[ catalan ] = "Abre~viatura";\
+            Text[ finnish ] = "Lyhyt ~nimi";\
+        };                                              \
+        Edit ED_ENTRY                                   \
+        {                                               \
+            Border = TRUE ;                             \
+            Pos = MAP_APPFONT ( 12 , 73 + RADIO_BUTTON_HEIGHT) ; \
+            Size = MAP_APPFONT ( 140 , 12 ) ;            \
+            TabStop = TRUE ;                            \
+            Left = TRUE ;                               \
+        };                                              \
+        ListBox LB_ENTRY                                   \
+        {                                               \
+            Border = TRUE ;                             \
+            Pos = MAP_APPFONT ( 12 , 73 + RADIO_BUTTON_HEIGHT) ; \
+            Size = MAP_APPFONT ( 140 , 50 ) ;            \
+            TabStop = TRUE ;                            \
+            DropDown = TRUE ;                           \
+        };                                              \
+        FixedLine FL_ENTRY                               \
         {                                               \
             Pos = MAP_APPFONT ( 6 , 3 ) ;               \
-            Size = MAP_APPFONT ( 146 , 112  + RADIO_BUTTON_HEIGHT) ; \
+            Size = MAP_APPFONT ( 146 , 8 ) ; \
             Text = "Eintrag" ;                          \
             Text [ ENGLISH ] = "Entry" ;                \
             Text[ english_us ] = "Entry";\