Convert 5 tabpages to .ui

I convert PAGE_DBWIZARD_ADO, PAGE_DBWIZARD_DBASE,
PAGE_DBWIZARD_MSACCESS, PAGE_DBWIZARD_ODBC, PAGE_DBWIZARD_USERDEFINED

Conflicts:
	dbaccess/source/ui/inc/dbu_resource.hrc

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

3 files changed, 26 insertions, 99 deletions

diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 682080374afd..2c2d3fbe94e9 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -68,37 +68,27 @@ namespace dbaui
 
     OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
-        OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_DBASE,    _rAttrSet, STR_DBASE_HELPTEXT,    STR_DBASE_HEADERTEXT,    STR_DBASE_PATH_OR_FILE);
-        oDBWizardPage->FreeResource();
-        return oDBWizardPage;
+        return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE);
     }
 
     OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
-        OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_MSACCESS, _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
-        oDBWizardPage->FreeResource();
-        return oDBWizardPage;
+        return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
     }
 
     OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
-        OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADO, _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL);
-        oDBWizardPage->FreeResource();
-        return oDBWizardPage;
+        return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL);
     }
 
     OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
-        OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ODBC, _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE);
-        oDBWizardPage->FreeResource();
-        return oDBWizardPage;
+        return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE);
     }
 
     OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
-        OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_USERDEFINED, _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL);
-        oDBWizardPage->FreeResource();
-        return oDBWizardPage;
+        return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL);
     }
 
     // OConnectionTabPageSetup
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index c483d3a35d4d..6571f91a25be 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -24,21 +24,13 @@
 #include "dbu_dlg.hrc"
 #include "browserids.hxx"
 
-#define STR_DBASE_HELPTEXT                  28
-#define STR_MSACCESS_HELPTEXT               29
     // FREE
-#define STR_ADO_HELPTEXT                    32
 #define STR_JDBC_HELPTEXT                   33
-#define STR_ODBC_HELPTEXT                   34
 #define STR_MYSQLJDBC_HELPTEXT              35
     // FREE
 #define STR_ORACLE_HELPTEXT                 40
-#define STR_DBASE_HEADERTEXT                41
-#define STR_MSACCESS_HEADERTEXT             42
     // FREE
-#define STR_ADO_HEADERTEXT                  45
 #define STR_JDBC_HEADERTEXT                 46
-#define STR_ODBC_HEADERTEXT                 47
 #define STR_MYSQLJDBC_HEADERTEXT            48
     // FREE
 #define STR_ORACLE_HEADERTEXT               54
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 32552223100e..5f4be24e4606 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -221,27 +221,15 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE
     };
 };
 
-TabPage PAGE_DBWIZARD_DBASE
+String STR_DBASE_HEADERTEXT
 {
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_DBASE";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    String STR_DBASE_HEADERTEXT
-    {
-        Text[ en-US ] = "Set up a connection to dBASE files" ;
-    };
-
-    String STR_DBASE_HELPTEXT
-    {
-        Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
-    };
-
-     AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION,HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION)
+    Text[ en-US ] = "Set up a connection to dBASE files" ;
 };
 
+String STR_DBASE_HELPTEXT
+{
+    Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
+};
 
 String STR_TEXT_HEADERTEXT
 {
@@ -258,25 +246,14 @@ String STR_TEXT_PATH_OR_FILE
     Text[ en-US ]  = "Path to text files";
 };
 
-TabPage PAGE_DBWIZARD_MSACCESS
+String STR_MSACCESS_HEADERTEXT
 {
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MSACCESS";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    String STR_MSACCESS_HEADERTEXT
-    {
-        Text[ en-US ] = "Set up a connection to a Microsoft Access database" ;
-    };
-
-    String STR_MSACCESS_HELPTEXT
-    {
-        Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
-    };
+    Text[ en-US ] = "Set up a connection to a Microsoft Access database" ;
+};
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION, HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION)
+String STR_MSACCESS_HELPTEXT
+{
+    Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
 };
 
 TabPage PAGE_DBWIZARD_LDAP
@@ -319,55 +296,23 @@ TabPage PAGE_DBWIZARD_LDAP
     };
 };
 
-TabPage PAGE_DBWIZARD_ADO
+String STR_ADO_HEADERTEXT
 {
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADO";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    String STR_ADO_HEADERTEXT
-    {
-        Text[ en-US ] = "Set up a connection to an ADO database" ;
-    };
-
-    String STR_ADO_HELPTEXT{
-        Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ;
-    };
-
-    AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL)
+    Text[ en-US ] = "Set up a connection to an ADO database" ;
 };
 
-TabPage PAGE_DBWIZARD_ODBC
+String STR_ADO_HELPTEXT
 {
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ODBC";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
-
-    String STR_ODBC_HEADERTEXT
-    {
-        Text[ en-US ] = "Set up a connection to an ODBC database" ;
-    };
-
-    String STR_ODBC_HELPTEXT{
-        Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
-    };
-
-    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE, HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE)
+    Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ;
 };
 
-TabPage PAGE_DBWIZARD_USERDEFINED
+String STR_ODBC_HEADERTEXT
 {
-    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_USERDEFINED";
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
-    Hide = TRUE ;
+    Text[ en-US ] = "Set up a connection to an ODBC database" ;
+};
 
-    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE, HID_PAGE_DBWIZARD_USERDEFINED_BROWSE)
+String STR_ODBC_HELPTEXT{
+    Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
 };
 
 TabPage PAGE_DBWIZARD_JDBC