fix: #88882# FixedLine instead of GroupBox

4 files changed, 55 insertions, 59 deletions

diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index 9e7643864fb6..a6293cc301bb 100644
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dinfedt.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:30 $
+ *  last change: $Author: pb $ $Date: 2001-06-28 13:44:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,25 +75,22 @@ void InfoEdit_Impl::KeyInput( const KeyEvent& rKEvent )
         Edit::KeyInput( rKEvent );
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung: Init-Liste
- --------------------------------------------------------------------*/
+// class SfxDocInfoEditDlg -----------------------------------------------
 
 SfxDocInfoEditDlg::SfxDocInfoEditDlg( Window* pParent ) :
 
     ModalDialog( pParent, SfxResId( DLG_DOCINFO_EDT ) ),
 
+    aInfoFL     ( this, ResId( FL_INFO ) ),
     aInfo1ED    ( this, ResId( ED_INFO1 ) ),
     aInfo2ED    ( this, ResId( ED_INFO2 ) ),
     aInfo3ED    ( this, ResId( ED_INFO3 ) ),
     aInfo4ED    ( this, ResId( ED_INFO4 ) ),
     aOkBT       ( this, ResId( BT_OK ) ),
     aCancelBT   ( this, ResId( BT_CANCEL ) ),
-    aHelpBtn    ( this, ResId( BTN_HELP ) ),
-    aInfoGB     ( this, ResId( GB_INFO ) )
+    aHelpBtn    ( this, ResId( BTN_HELP ) )
 
 {
     FreeResource();
 }
 
-
diff --git a/sfx2/source/dialog/dinfedt.hrc b/sfx2/source/dialog/dinfedt.hrc
index 0b1aee0d0065..de71fa4fefe5 100644
--- a/sfx2/source/dialog/dinfedt.hrc
+++ b/sfx2/source/dialog/dinfedt.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dinfedt.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:30 $
+ *  last change: $Author: pb $ $Date: 2001-06-28 13:44:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,4 +69,4 @@
 #define ED_INFO3        9
 #define FT_INFO4       10
 #define ED_INFO4       11
-#define GB_INFO        12
+#define FL_INFO        12
diff --git a/sfx2/source/dialog/dinfedt.src b/sfx2/source/dialog/dinfedt.src
index fabdfb69bf14..7c1d5cd9d583 100644
--- a/sfx2/source/dialog/dinfedt.src
+++ b/sfx2/source/dialog/dinfedt.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dinfedt.src,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2001-06-08 22:00:13 $
+ *  last change: $Author: pb $ $Date: 2001-06-28 13:44:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,7 @@ ModalDialog DLG_DOCINFO_EDT
     HelpId = HID_DOCINFO_EDT ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 166 , 83 ) ;
+    Size = MAP_APPFONT ( 166 , 79 ) ;
     Text = "Infonamen bearbeiten" ;
     Text [ ENGLISH ] = "Edit info names" ;
     Text [ norwegian ] = "Rediger informasjonnavn" ;
@@ -94,34 +94,10 @@ ModalDialog DLG_DOCINFO_EDT
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Editar nombres informaciones";
     Moveable = TRUE ;
-    Edit ED_INFO1
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 86 , 12 ) ;
-    };
-    Edit ED_INFO2
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 29 ) ;
-        Size = MAP_APPFONT ( 86 , 12 ) ;
-    };
-    Edit ED_INFO3
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 44 ) ;
-        Size = MAP_APPFONT ( 86 , 12 ) ;
-    };
-    Edit ED_INFO4
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 59 ) ;
-        Size = MAP_APPFONT ( 86 , 12 ) ;
-    };
-    GroupBox GB_INFO
+    FixedLine FL_INFO
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 98 , 74 ) ;
+        Size = MAP_APPFONT ( 98 , 8 ) ;
         Text = "Namen" ;
         Text [ English ] = "Names" ;
         Text [ norwegian ] = "Names" ;
@@ -147,6 +123,30 @@ ModalDialog DLG_DOCINFO_EDT
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Nombres";
     };
+    Edit ED_INFO1
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
+        Size = MAP_APPFONT ( 86 , 12 ) ;
+    };
+    Edit ED_INFO2
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 12 , 29 ) ;
+        Size = MAP_APPFONT ( 86 , 12 ) ;
+    };
+    Edit ED_INFO3
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 12 , 44 ) ;
+        Size = MAP_APPFONT ( 86 , 12 ) ;
+    };
+    Edit ED_INFO4
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 12 , 59 ) ;
+        Size = MAP_APPFONT ( 86 , 12 ) ;
+    };
     OKButton BT_OK
     {
         Pos = MAP_APPFONT ( 110 , 6 ) ;
diff --git a/sfx2/source/inc/nfltdlg.hxx b/sfx2/source/inc/nfltdlg.hxx
index 66f8fb0e7f37..5aadf2412958 100644
--- a/sfx2/source/inc/nfltdlg.hxx
+++ b/sfx2/source/inc/nfltdlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: nfltdlg.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:52:34 $
+ *  last change: $Author: pb $ $Date: 2001-06-28 13:40:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,37 +62,36 @@
 #define _SFXNFLTDLG_HXX
 
 
-#ifndef _DIALOG_HXX //autogen
+#ifndef _SV_DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
 #endif
-#ifndef _LSTBOX_HXX //autogen
+#ifndef _SV_LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
 #endif
-#ifndef _BUTTON_HXX //autogen
+#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
 #endif
-#ifndef _FIXED_HXX //autogen
+#ifndef _SV_FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
 #endif
-#ifndef _GROUP_HXX //autogen
-#include <vcl/group.hxx>
-#endif
 class SfxFilterMatcher;
 
 class SfxMedium;
 class SfxFilterDialog : public ModalDialog
 {
 private:
-    GroupBox aGroupType;
-    FixedText aMIMEType;
-    FixedText aExtension;
-    ListBox aListbox;
-    GroupBox aGroupFrm;
-    OKButton aOkBtn;
-    CancelButton aCancelBtn;
-    HelpButton aHelpBtn;
-    String aDefFilter;
+    FixedLine               aMimeTypeFL;
+    FixedText               aMIMEType;
+    FixedText               aExtension;
+    FixedLine               aFilterFL;
+    ListBox                 aListbox;
+    OKButton                aOkBtn;
+    CancelButton            aCancelBtn;
+    HelpButton              aHelpBtn;
+
+    String                  aDefFilter;
     const SfxFilterMatcher& rMatcher;
+
     DECL_LINK( OkHdl, Control * );
 
 public:
@@ -104,5 +103,5 @@ public:
     String GetSelectEntry() const;
 };
 
-
 #endif
+