summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx4
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx2
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.hxx26
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx4
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx2
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx50
6 files changed, 45 insertions, 43 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 670c399fa149..75577db17114 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -77,9 +77,9 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- VclPtr<SfxTabPage> OConnectionTabPage::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> OConnectionTabPage::Create( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OConnectionTabPage>::Create( pParent, *_rAttrSet );
+ return VclPtr<OConnectionTabPage>::Create( pParent.pParent, *_rAttrSet );
}
// OConnectionTabPage
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 7b21837dd1ef..089baf330104 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -58,7 +58,7 @@ namespace dbaui
public:
virtual ~OConnectionTabPage() override;
virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* _rAttrSet );
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index 8194bfec03a6..4fa30d49b3a4 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX
#include <dsntypes.hxx>
+#include <sfx2/tabdlg.hxx>
#include <svl/poolitem.hxx>
#include <vcl/vclptr.hxx>
#include <vector>
@@ -35,49 +36,48 @@ namespace dbaui
/** Creates the detail page for ado
*/
- static VclPtr<SfxTabPage> CreateDbase( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateDbase( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ado
*/
- static VclPtr<SfxTabPage> CreateAdo( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateAdo( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ODBC
*/
- static VclPtr<SfxTabPage> CreateODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateODBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for user
*/
- static VclPtr<SfxTabPage> CreateUser( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateUser( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLODBC
*/
- static VclPtr<SfxTabPage> CreateMySQLODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateMySQLODBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLJDBC
*/
- static VclPtr<SfxTabPage> CreateMySQLJDBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateMySQLJDBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLNATIVE
*/
- static VclPtr<SfxTabPage> CreateMySQLNATIVE( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateMySQLNATIVE( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for Oracle JDBC
*/
- static VclPtr<SfxTabPage> CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateOracleJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet );
/** Creates the detail page for LDAP
*/
- static VclPtr<SfxTabPage> CreateLDAP( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateLDAP( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/// Creates the detail page for Text
- static VclPtr<SfxTabPage> CreateText( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
-
+ static VclPtr<SfxTabPage> CreateText( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/// creates the GeneratedValues page
- static VclPtr<SfxTabPage> CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateGeneratedValuesPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
/// creates the "Special Settings" page of the "Advanced Settings" dialog
- static VclPtr<SfxTabPage> CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> CreateSpecialSettingsPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
};
}
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 84869c3f3ee9..0daf9f8f13d9 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -202,9 +202,9 @@ void OUserAdmin::FillUserNames()
}
-VclPtr<SfxTabPage> OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+VclPtr<SfxTabPage> OUserAdmin::Create( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OUserAdmin>::Create( pParent, *_rAttrSet );
+ return VclPtr<OUserAdmin>::Create( pParent.pParent, *_rAttrSet );
}
IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void )
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 17fa0bdf5454..c7a1cbb96913 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -60,7 +60,7 @@ class OUserAdmin final : public OGenericAdministrationPage
OUserAdmin( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs);
public:
- static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet );
+ static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* _rAttrSet );
virtual ~OUserAdmin() override;
virtual void dispose() override;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index cc3fba28d0ff..67da68cd9834 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -209,9 +209,9 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
- VclPtr<SfxTabPage> ODriversSettings::CreateDbase( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateDbase( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<ODbaseDetailsPage>::Create( pParent, *_rAttrSet );
+ return VclPtr<ODbaseDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
void ODbaseDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
@@ -269,9 +269,9 @@ namespace dbaui
}
- VclPtr<SfxTabPage> ODriversSettings::CreateAdo( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateAdo( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OAdoDetailsPage>::Create( pParent, *_rAttrSet );
+ return VclPtr<OAdoDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
// OOdbcDetailsPage
@@ -293,9 +293,9 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
- VclPtr<SfxTabPage> ODriversSettings::CreateODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateODBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OOdbcDetailsPage>::Create( pParent, *_rAttrSet );
+ return VclPtr<OOdbcDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -346,9 +346,9 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
- VclPtr<SfxTabPage> ODriversSettings::CreateUser( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateUser( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OUserDriverDetailsPage>::Create( pParent, *_rAttrSet );
+ return VclPtr<OUserDriverDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
bool OUserDriverDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -403,9 +403,9 @@ namespace dbaui
{
}
- VclPtr<SfxTabPage> ODriversSettings::CreateMySQLODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateMySQLODBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OMySQLODBCDetailsPage>::Create( pParent, *_rAttrSet );
+ return VclPtr<OMySQLODBCDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
// OMySQLJDBCDetailsPage
@@ -641,18 +641,19 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
}
- VclPtr<SfxTabPage> ODriversSettings::CreateMySQLJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateMySQLJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OGeneralSpecialJDBCDetailsPage>::Create( pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER );
+ return VclPtr<OGeneralSpecialJDBCDetailsPage>::Create( pParent.pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER );
}
- VclPtr<SfxTabPage> ODriversSettings::CreateMySQLNATIVE( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+
+ VclPtr<SfxTabPage> ODriversSettings::CreateMySQLNATIVE( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<MySQLNativePage>::Create( pParent, *_rAttrSet );
+ return VclPtr<MySQLNativePage>::Create( pParent.pParent, *_rAttrSet );
}
- VclPtr<SfxTabPage> ODriversSettings::CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateOracleJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OGeneralSpecialJDBCDetailsPage>::Create( pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false);
+ return VclPtr<OGeneralSpecialJDBCDetailsPage>::Create( pParent.pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false);
}
// OLDAPDetailsPage
@@ -690,9 +691,9 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
- VclPtr<SfxTabPage> ODriversSettings::CreateLDAP( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateLDAP( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OLDAPDetailsPage>::Create( pParent, *_rAttrSet );
+ return VclPtr<OLDAPDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
bool OLDAPDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -764,10 +765,11 @@ namespace dbaui
OCommonBehaviourTabPage::dispose();
}
- VclPtr<SfxTabPage> ODriversSettings::CreateText( vcl::Window* pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateText( TabPageParent pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<OTextDetailsPage>::Create( pParent, *_rAttrSet );
+ return VclPtr<OTextDetailsPage>::Create( pParent.pParent, *_rAttrSet );
}
+
void OTextDetailsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList)
{
OCommonBehaviourTabPage::fillControls(_rControlList);
@@ -802,16 +804,16 @@ namespace dbaui
return m_pTextConnectionHelper->prepareLeave();
}
- VclPtr<SfxTabPage> ODriversSettings::CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateGeneratedValuesPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet )
{
- return VclPtr<GeneratedValuesPage>::Create( _pParent, *_rAttrSet );
+ return VclPtr<GeneratedValuesPage>::Create( _pParent.pParent, *_rAttrSet );
}
- VclPtr<SfxTabPage> ODriversSettings::CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet )
+ VclPtr<SfxTabPage> ODriversSettings::CreateSpecialSettingsPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet )
{
OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( *_rAttrSet );
DataSourceMetaData aMetaData( eType );
- return VclPtr<SpecialSettingsPage>::Create( _pParent, *_rAttrSet, aMetaData );
+ return VclPtr<SpecialSettingsPage>::Create( _pParent.pParent, *_rAttrSet, aMetaData );
}
} // namespace dbaui
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 13:54:01 +0000