PAGE_DBWIZARD_TEXT, PAGE_TEXT, DLG_TEXT_CONNECTION_SETTINGS conversion to .ui

Change-Id: Iea5105cc33b436e9c0728df799b1ceb63f20e46e
Reviewed-on: https://gerrit.libreoffice.org/10579
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

5 files changed, 14 insertions, 6 deletions

diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx
index 1a72da8abe5e..5a0df9d93ed6 100644
--- a/dbaccess/source/ui/inc/charsetlistbox.hxx
+++ b/dbaccess/source/ui/inc/charsetlistbox.hxx
@@ -34,6 +34,7 @@ namespace dbaui
     {
     public:
         CharSetListBox( Window* _pParent, const ResId& _rResId );
+        CharSetListBox( Window* _pParent, WinBits _nBits );
         virtual ~CharSetListBox();
 
         void    SelectEntryByIanaName( const OUString& _rIanaName );
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index 25bcb0d81698..9ff64d87847f 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -42,6 +42,7 @@ class OConnectionURLEdit : public Edit
 
 public:
     OConnectionURLEdit(Window* pParent, const ResId& rResId,bool _bShowPrefix = false);
+    OConnectionURLEdit(Window* pParent, WinBits _nBits,bool _bShowPrefix = false);
     virtual ~OConnectionURLEdit();
 
 public:
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index 9065a06d62d0..97067e6f0cc2 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -22,9 +22,9 @@
 #include "dbu_resource.hrc"
 
 #define PAGE_X              281
-#define PAGE_Y              185
+#define PAGE_Y              215
 #define WIZARD_PAGE_X       225
-#define WIZARD_PAGE_Y       210
+#define WIZARD_PAGE_Y       240
 #define START_X             6
 
 #define CHECKBOX_HEIGHT      8
@@ -83,6 +83,8 @@
 #define STR_MSACCESS_FILTERNAME             RID_STR_DLG_START + 39
 #define STR_CONNECTION_NO_SUCCESS           RID_STR_DLG_START + 40
 #define STR_DBASE_PATH_OR_FILE              RID_STR_DLG_START + 41
+#define STR_TEXT_HEADERTEXT                 RID_STR_DLG_START + 42
+#define STR_TEXT_HELPTEXT                   RID_STR_DLG_START + 43
 #define STR_TEXT_PATH_OR_FILE               RID_STR_DLG_START + 45
 #define STR_FLAT_PATH_OR_FILE               RID_STR_DLG_START + 46
 #define STR_CALC_PATH_OR_FILE               RID_STR_DLG_START + 47
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 963fe36b8185..f370b2d4e0a4 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -88,7 +88,6 @@
 #define DLG_COLLECTION_VIEW             RID_DIALOG_START + 27
 #define DLG_DATABASE_TYPE_CHANGE        RID_DIALOG_START + 28
 #define DLG_DATABASE_WIZARD             RID_DIALOG_START + 29
-#define DLG_TEXT_CONNECTION_SETTINGS    RID_DIALOG_START + 31
 
 // tab pages
 
@@ -117,7 +116,7 @@
 #define PAGE_TABLESUBSCRIPTION          RID_PAGE_START + 28
 
 #define PAGE_DBWIZARD_DBASE                     RID_PAGE_START + 41
-#define PAGE_DBWIZARD_TEXT                      RID_PAGE_START + 42
+    // FREE
 #define PAGE_DBWIZARD_MSACCESS                  RID_PAGE_START + 43
 #define PAGE_DBWIZARD_LDAP                      RID_PAGE_START + 44
     // FREE
@@ -255,6 +254,12 @@
 #define STR_QRY_LABEL                       RID_STR_GEN_START + 44
 #define STR_TITLE_RENAME                    RID_STR_GEN_START + 45
 #define STR_TITLE_PASTE_AS                  RID_STR_GEN_START + 46
+#define STR_AUTOFIELDSEPARATORLIST      RID_STR_GEN_START + 47
+#define STR_AUTOTEXTSEPARATORLIST       RID_STR_GEN_START + 48
+#define STR_AUTOTEXT_FIELD_SEP_NONE     RID_STR_GEN_START + 49
+#define STR_AUTODELIMITER_MISSING       RID_STR_GEN_START + 50
+#define STR_AUTODELIMITER_MUST_DIFFER   RID_STR_GEN_START + 51
+#define STR_AUTONO_WILDCARDS            RID_STR_GEN_START + 52
 
 // untyped resources
 
diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx
index 4ef97f431531..080025084dd6 100644
--- a/dbaccess/source/ui/inc/textconnectionsettings.hxx
+++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx
@@ -49,8 +49,7 @@ namespace dbaui
 
     private:
         ::std::auto_ptr< OTextConnectionHelper >    m_pTextConnectionHelper;
-        OKButton                                    m_aOK;
-        CancelButton                                m_aCancel;
+        OKButton                                    *m_pOK;
         SfxItemSet&                                 m_rItems;
 
     private: