TAB_WIZ_TYPE_SELECT and TAB_WIZ_NAME_MATCHING conversion to .ui

Conflicts:
	dbaccess/UIConfig_dbaccess.mk
	dbaccess/source/ui/misc/WizardPages.src

Change-Id: I1a628dd6220f3f180cc01353380fe4aa7e166cf4
Reviewed-on: https://gerrit.libreoffice.org/10776
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

3 files changed, 26 insertions, 26 deletions

diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index 055a48856222..0c713685c0d3 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -36,7 +36,7 @@ namespace dbaui
         virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE;
 
     public:
-        OColumnTreeBox( Window* pParent, const ResId& rResId );
+        OColumnTreeBox( Window* pParent, WinBits nBits = WB_BORDER );
 
         void FillListBox( const ODatabaseExport::TColumnVector& _rList);
         void SetReadOnly(bool _bRo=true) { m_bReadOnly = _bRo; }
@@ -50,18 +50,20 @@ namespace dbaui
     // Name matching for data appending
     class OWizNameMatching : public OWizardPage
     {
-        FixedText           m_FT_TABLE_LEFT;
-        FixedText           m_FT_TABLE_RIGHT;
-        OColumnTreeBox      m_CTRL_LEFT;    // left side
-        OColumnTreeBox      m_CTRL_RIGHT;   // right side
-        ImageButton         m_ibColumn_up;
-        ImageButton         m_ibColumn_down;
-        ImageButton         m_ibColumn_up_right;
-        ImageButton         m_ibColumn_down_right;
-        PushButton          m_pbAll;
-        PushButton          m_pbNone;
+        FixedText           *m_pTABLE_LEFT;
+        FixedText           *m_pTABLE_RIGHT;
+        OColumnTreeBox      *m_pCTRL_LEFT;    // left side
+        OColumnTreeBox      *m_pCTRL_RIGHT;   // right side
+        PushButton          *m_pColumn_up;
+        PushButton          *m_pColumn_down;
+        PushButton          *m_pColumn_up_right;
+        PushButton          *m_pColumn_down_right;
+        PushButton          *m_pAll;
+        PushButton          *m_pNone;
         OUString            m_sSourceText;
         OUString            m_sDestText;
+        Image               m_aImgUp;
+        Image               m_aImgDown;
 
         DECL_LINK( ButtonClickHdl, Button * );
         DECL_LINK( RightButtonClickHdl, Button * );
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 58138e3d1bff..5e498d139607 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -37,6 +37,7 @@ namespace dbaui
     class OWizTypeSelectControl : public OFieldDescControl
     {
     protected:
+        Window*             m_pParentTabPage;
         virtual void        ActivateAggregate( EControlType eType ) SAL_OVERRIDE;
         virtual void        DeactivateAggregate( EControlType eType ) SAL_OVERRIDE;
 
@@ -50,7 +51,7 @@ namespace dbaui
         virtual OUString            getAutoIncrementValue() const SAL_OVERRIDE;
 
     public:
-        OWizTypeSelectControl(Window* pParent, const ResId& rResId,OTableDesignHelpBar* pHelpBar=NULL);
+        OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL);
         virtual ~OWizTypeSelectControl();
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE;
@@ -68,16 +69,14 @@ namespace dbaui
                                                 bool _bSet = false);
     protected:
         virtual bool            PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+        Window*                 m_pParentTabPage;
     public:
         OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER )
             : MultiListBox(pParent,nStyle)
             , m_bPKey(false)
             {}
-        OWizTypeSelectList( Window* pParent, const ResId& rResId )
-            : MultiListBox(pParent,rResId)
-            , m_bPKey(false)
-            {}
         void                    SetPKey(bool bPKey) { m_bPKey = bPKey; }
+        void                    SetParentTabPage(Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; }
     };
 
     // Wizard Page: OWizTypeSelect
@@ -91,13 +90,13 @@ namespace dbaui
         DECL_LINK( ColumnSelectHdl, MultiListBox* );
         DECL_LINK( ButtonClickHdl, Button * );
     protected:
-        OWizTypeSelectList      m_lbColumnNames;
-        FixedLine               m_flColumns;
-        OWizTypeSelectControl   m_aTypeControl;
-        FixedLine               m_flAutoType;
-        FixedText               m_ftAuto;
-        NumericField            m_etAuto;
-        PushButton              m_pbAuto;
+        OWizTypeSelectList      *m_pColumnNames;
+        FixedText               *m_pColumns;
+        OWizTypeSelectControl   *m_pTypeControl;
+        FixedText               *m_pAutoType;
+        FixedText               *m_pAutoFt;
+        NumericField            *m_pAutoEt;
+        PushButton              *m_pAutoPb;
 
         Image                   m_imgPKey;
         SvStream*               m_pParserStream; // stream to read the tokens from or NULL
@@ -113,7 +112,6 @@ namespace dbaui
     public:
         virtual void            Reset ( ) SAL_OVERRIDE;
         virtual void            ActivatePage( ) SAL_OVERRIDE;
-        virtual void            Resize() SAL_OVERRIDE;
         virtual bool            LeavePage() SAL_OVERRIDE;
         virtual OUString        GetTitle() const SAL_OVERRIDE;
 
diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc
index ed0aacd7434a..61b5d6728ce9 100644
--- a/dbaccess/source/ui/inc/dbu_misc.hrc
+++ b/dbaccess/source/ui/inc/dbu_misc.hrc
@@ -21,8 +21,8 @@
 
 #include "dbu_resource.hrc"
 
-// free
-// free
+#define IMG_UP                              RID_STR_MISC_START +  0
+#define IMG_DOWN                            RID_STR_MISC_START +  1
 #define STR_WIZ_COLUMN_SELECT_TITEL         RID_STR_MISC_START +  2
 #define STR_WIZ_TYPE_SELECT_TITEL           RID_STR_MISC_START +  3
 #define STR_WIZ_PKEY_ALREADY_DEFINED        RID_STR_MISC_START +  4