adapt code to edit categories dialog .ui

Change-Id: Ib03ec188ba30d122ff687937209b989d418fe7ac

sw/AllLangResTarget_sw.mk

@@ -139,7 +139,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/lingu/olmenu.src \
     sw/source/ui/misc/autocorr.src \
     sw/source/ui/misc/docfnote.src \
-    sw/source/ui/misc/glosbib.src \
     sw/source/ui/misc/glossary.src \
     sw/source/ui/misc/numberingtypelistbox.src \
     sw/source/ui/misc/outline.src \

sw/inc/helpid.h

@@ -20,7 +20,6 @@
 #include <svx/svxcommands.h>
 #include <sfx2/sfxcommands.h>
 
-#define HID_BIB_BASE                                            "SW_HID_BIB_BASE"
 #define HID_MERGE_PRINTMONITOR                                  "SW_HID_MERGE_PRINTMONITOR"
 #define HID_FLD_INPUT                                           "SW_HID_FLD_INPUT"
 #define HID_DOCINFO_EDT                                         "SW_HID_DOCINFO_EDT"

sw/source/ui/inc/glosbib.hxx

@@ -35,9 +35,16 @@ class SwGlossaryHdl;
 
 class FEdit : public Edit
 {
-    public:
-        FEdit(Window * pParent, const ResId& rResId) :
-            Edit(pParent, rResId){}
+public:
+    FEdit(Window* pParent, const ResId& rResId)
+        : Edit(pParent, rResId)
+    {
+    }
+
+    FEdit(Window* pParent)
+        : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK)
+    {
+    }
 
     virtual void KeyInput( const KeyEvent& rKEvent );
 };
@@ -52,27 +59,28 @@ struct GlosBibUserData
 class SwGlossaryGroupTLB : public SvTabListBox
 {
 public:
-    SwGlossaryGroupTLB(Window* pParent, const ResId& rResId) :
-        SvTabListBox(pParent, rResId) {}
+    SwGlossaryGroupTLB(Window* pParent, const ResId& rResId)
+        : SvTabListBox(pParent, rResId)
+    {
+    }
 
-    virtual void    RequestHelp( const HelpEvent& rHEvt );
+    SwGlossaryGroupTLB(Window* pParent)
+        : SvTabListBox(pParent, WB_BORDER|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT)
+    {
+    }
+
+    virtual void RequestHelp( const HelpEvent& rHEvt );
 };
 
 class SwGlossaryGroupDlg : public SvxStandardDialog
 {
-    FixedText           aBibFT;
-    FEdit               aNameED;
-    FixedText           aPathFT;
-    ListBox             aPathLB;
-    FixedText           aSelectFT;
-    SwGlossaryGroupTLB  aGroupTLB;
-
-    OKButton        aOkPB;
-    CancelButton    aCancelPB;
-    HelpButton      aHelpPB;
-    PushButton      aNewPB;
-    PushButton      aDelPB;
-    PushButton      aRenamePB;
+    FEdit*              m_pNameED;
+    ListBox*            m_pPathLB;
+    SwGlossaryGroupTLB* m_pGroupTLB;
+
+    PushButton*     m_pNewPB;
+    PushButton*     m_pDelPB;
+    PushButton*     m_pRenamePB;
 
     typedef std::vector< ::rtl::OUString> OUVector_t;
     OUVector_t m_RemovedArr;

sw/source/ui/inc/misc.hrc

@@ -21,10 +21,7 @@
 
 #include "rcid.hrc"
 
-#define STR_GLOSSARY_BIB_DLG        (RC_MISC_BEGIN + 5)
-
 #define DLG_DOC_FOOTNOTE            (RC_MISC_BEGIN + 13)
-#define DLG_BIB_BASE                (RC_MISC_BEGIN + 16)
 #define DLG_INSERT_BOOKMARK         (RC_MISC_BEGIN + 17)
 #define DLG_NUM_NAMES               (RC_MISC_BEGIN + 18)
 #define DLG_SORTING                 (RC_MISC_BEGIN + 19)

sw/source/ui/misc/glosbib.hrc

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define FT_BIB                          1
-#define FT_PATH                         2
-#define FT_SELECT                       3
-#define CO_NAME             2
-#define PB_NEW              3
-#define PB_DELETE           4
-#define BT_OK               5
-#define BT_CANCEL           6
-#define BT_HELP             7
-#define LB_PATH             8
-#define TLB_GROUPS          9
-#define ED_NAME             10
-#define PB_RENAME           11
-

sw/source/ui/misc/glosbib.src

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "glosbib.hrc"
-#include "misc.hrc"
-#include "helpid.h"
-ModalDialog DLG_BIB_BASE
-{
-    HelpID = HID_BIB_BASE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 349 , 121 ) ;
-    Moveable = TRUE ;
-    Text [ en-US ] = "Edit Categories" ;
-    PushButton PB_NEW
-    {
-        HelpID = "sw:PushButton:DLG_BIB_BASE:PB_NEW";
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 293 , 66 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~New" ;
-        TabStop = TRUE ;
-    };
-    PushButton PB_DELETE
-    {
-        HelpID = "sw:PushButton:DLG_BIB_BASE:PB_DELETE";
-        Pos = MAP_APPFONT ( 293 , 83 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Delete" ;
-        TabStop = TRUE ;
-        Disable = TRUE ;
-    };
-    PushButton PB_RENAME
-    {
-        HelpID = "sw:PushButton:DLG_BIB_BASE:PB_RENAME";
-        Disable = TRUE ;
-        Pos = MAP_APPFONT ( 293 , 100 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Rename" ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_BIB
-    {
-        Pos = MAP_APPFONT ( 12 , 3 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Text [ en-US ] = "Category" ;
-    };
-    OKButton BT_OK
-    {
-        Pos = MAP_APPFONT ( 293 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BT_CANCEL
-    {
-        Pos = MAP_APPFONT ( 293 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BT_HELP
-    {
-        Pos = MAP_APPFONT ( 293 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    Edit ED_NAME
-    {
-        HelpID = "sw:Edit:DLG_BIB_BASE:ED_NAME";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 159 , 12 ) ;
-        TabStop = TRUE ;
-        Border = TRUE ;
-        MaxTextLength = 256 ;
-    };
-    FixedText FT_PATH
-    {
-        Pos = MAP_APPFONT ( 174 , 3 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "Path";
-    };
-    ListBox LB_PATH
-    {
-        HelpID = "sw:ListBox:DLG_BIB_BASE:LB_PATH";
-        Pos = MAP_APPFONT ( 174 , 14 ) ;
-        Size = MAP_APPFONT ( 107 , 50 ) ;
-        DropDown = TRUE ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        DDExtraWidth = TRUE ;
-    };
-    FixedText FT_SELECT
-    {
-        Pos = MAP_APPFONT ( 12 , 30 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Text [ en-US ] = "Selection list";
-    };
-    Control TLB_GROUPS
-    {
-        Pos = MAP_APPFONT ( 12 , 41 ) ;
-        Size = MAP_APPFONT ( 269 , 73 ) ;
-        TabStop = TRUE ;
-        Border = TRUE ;
-    };
-    /*    ComboBox CO_NAME
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 89 , 76 ) ;
-        TabStop = TRUE ;
-#ifdef WIN
-        MaxTextLength = 8 ;
-#else
-        MaxTextLength = 32 ;
-#endif
-        Sort = TRUE ;
-    };*/
-};
-/*
-String STR_GLOSSARY_BIB_DLG
-{
-    Text [ en-US ] = "Edit Categories" ;
-};*/