Fix #86988#: Redesign of dialogs

6 files changed, 31 insertions, 25 deletions

diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx
index b9148833ff04..371d2d7da87d 100644
--- a/sw/source/ui/dialog/abstract.cxx
+++ b/sw/source/ui/dialog/abstract.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: abstract.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:34 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 10:46:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,7 @@
 
 SwInsertAbstractDlg::SwInsertAbstractDlg( Window* pParent ) :
     SfxModalDialog(pParent, SW_RES(DLG_INSERT_ABSTRACT)),
-    aGB     (this, ResId(GB_1       )),
+    aFL     (this, ResId(FL_1       )),
     aParaFT (this, ResId(FT_PARA    )),
     aParaNF (this, ResId(NF_PARA    )),
     aLevelFT(this, ResId(FT_LEVEL   )),
@@ -121,6 +121,9 @@ BYTE SwInsertAbstractDlg::GetPara() const
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:34  hr
+      initial import
+
       Revision 1.4  2000/09/18 16:05:19  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/dialog/abstract.hrc b/sw/source/ui/dialog/abstract.hrc
index 1a5f245f79c7..7bb37f50b085 100644
--- a/sw/source/ui/dialog/abstract.hrc
+++ b/sw/source/ui/dialog/abstract.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: abstract.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:34 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 10:46:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,7 +59,7 @@
  *
  ************************************************************************/
 
-#define GB_1                1
+#define FL_1                            1
 #define FT_PARA             2
 #define NF_PARA             3
 #define FT_LEVEL            4
diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src
index 85972db5aade..dbd4af01ac02 100644
--- a/sw/source/ui/dialog/abstract.src
+++ b/sw/source/ui/dialog/abstract.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: abstract.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:09:17 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 10:46:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,11 +74,11 @@ ModalDialog DLG_INSERT_ABSTRACT
     Text = "AutoAbstract erzeugen" ;
     Text [ English ] = "Create abstract" ;
     Moveable = TRUE ;
-    GroupBox GB_1
+    FixedLine FL_1
     {
         OutputSize = TRUE ;
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 174 , 62 ) ;
+        Size = MAP_APPFONT ( 174 , 8 ) ;
         Text = "Eigenschaften" ;
         Text [ English ] = "Properties" ;
         Text [ english_us ] = "Properties" ;
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index d5e18264c761..15abeba513ae 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ascfldlg.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jp $ $Date: 2001-03-27 21:47:58 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 10:46:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -133,7 +133,7 @@ const USHORT nDialogExtraDataLen = 11;      // 12345678901
 SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
                                     SvStream* pStream )
     : SfxModalDialog( pParent, SW_RES( DLG_ASCII_FILTER )),
-    aGB( this, ResId( GB_1 )),
+    aFL( this, ResId( FL_1 )),
     aCharSetFT( this, ResId( FT_CHARSET )),
     aCharSetLB( this, ResId( LB_CHARSET )),
     aFontFT( this, ResId( FT_FONT )),
@@ -522,6 +522,9 @@ IMPL_LINK( SwAsciiFilterDlg, LineEndHdl, RadioButton*, pBtn )
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.5  2001/03/27 21:47:58  jp
+      use GetAppLanguage
+
       Revision 1.4  2001/03/22 10:42:29  tl
       Type of aLanguageLB changed to SvxLanguageBox
 
diff --git a/sw/source/ui/dialog/ascfldlg.hrc b/sw/source/ui/dialog/ascfldlg.hrc
index 005695d0f319..98dfa809c343 100644
--- a/sw/source/ui/dialog/ascfldlg.hrc
+++ b/sw/source/ui/dialog/ascfldlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ascfldlg.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2001-01-19 13:48:26 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 10:46:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,7 +59,7 @@
  *
  ************************************************************************/
 
-#define GB_1                1
+#define FL_1                            1
 #define FT_CHARSET          2
 #define LB_CHARSET          3
 #define FT_FONT             4
diff --git a/sw/source/ui/dialog/ascfldlg.src b/sw/source/ui/dialog/ascfldlg.src
index 8c5a6461c004..51b1d50beb49 100644
--- a/sw/source/ui/dialog/ascfldlg.src
+++ b/sw/source/ui/dialog/ascfldlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ascfldlg.src,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:11:41 $
+ *  last change: $Author: fme $ $Date: 2001-06-01 10:46:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,15 +67,15 @@ ModalDialog DLG_ASCII_FILTER
     HelpID = HID_ASCII_FILTER ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 239 , 84 ) ;
+    Size = MAP_APPFONT ( 239 , 63 ) ;
     Text = "ASCII Filter Optionen" ;
     Text [ English ] = "ASCII filter options" ;
     Moveable = TRUE ;
-    GroupBox GB_1
+    FixedLine FL_1
     {
         OutputSize = TRUE ;
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 174 , 78 ) ;
+        Size = MAP_APPFONT ( 174 , 8 ) ;
         Text = "Eigenschaften" ;
         Text [ English ] = "Properties" ;
         Text[ english_us ] = "Properties";
@@ -199,7 +199,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     ListBox LB_LANGUAGE
     {
-        Pos = MAP_APPFONT ( 80 , 46 ) ;
+        Pos = MAP_APPFONT ( 88 , 46 ) ;
         Size = MAP_APPFONT ( 86 , 61 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -235,7 +235,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     RadioButton RB_CRLF
     {
-        Pos = MAP_APPFONT ( 80 , 62 ) ;
+        Pos = MAP_APPFONT ( 88 , 62 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
         Check = TRUE;
@@ -265,7 +265,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     RadioButton RB_CR
     {
-        Pos = MAP_APPFONT ( 123 , 62 ) ;
+        Pos = MAP_APPFONT ( 131 , 62 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
 //        TabStop = TRUE ;
         Text = "C~R" ;
@@ -294,7 +294,7 @@ ModalDialog DLG_ASCII_FILTER
     };
     RadioButton RB_LF
     {
-        Pos = MAP_APPFONT ( 146 , 62 ) ;
+        Pos = MAP_APPFONT ( 154 , 62 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
 //        TabStop = TRUE ;
         Text = "~LF" ;