diff options
Diffstat (limited to 'dbaccess/source/ui/inc/dbwizsetup.hxx')
-rw-r--r-- | dbaccess/source/ui/inc/dbwizsetup.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index b25bbad01a8e..29dd45cf7e4b 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -84,8 +84,8 @@ private: OModuleClient m_aModuleClient; ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; - ::dbaccess::DATASOURCE_TYPE m_eType; - ::dbaccess::DATASOURCE_TYPE m_eOldType; + ::rtl::OUString m_sURL; + ::rtl::OUString m_sOldURL; sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> @@ -98,6 +98,7 @@ private: String m_sRM_ADABASText; String m_sRM_ADOText; String m_sRM_JDBCText; + String m_sRM_MySQLNativePageTitle; String m_sRM_OracleText; String m_sRM_MySQLText; String m_sRM_ODBCText; @@ -131,7 +132,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual ::dbaccess::DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; + virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual void setTitle(const ::rtl::OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); @@ -172,7 +173,7 @@ protected: private: /** declares a path with or without authentication, as indicated by the database type - @param _eType + @param _sURL the data source type for which the path is declared. If this data source type does not support authentication, the PAGE_DBSETUPWIZARD_AUTHENTIFICATION state will be stripped from the sequence of states. @@ -182,7 +183,7 @@ private: the first state in this path, following by an arbitrary number of others, as in RoadmapWizard::declarePath. */ - void declareAuthDepPath( ::dbaccess::DATASOURCE_TYPE _eType, PathId _nPathId, WizardState _nFirstState, ... ); + void declareAuthDepPath( const ::rtl::OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths); void RegisterDataSourceByLocation(const ::rtl::OUString& sPath); sal_Bool SaveDatabaseDocument(); @@ -192,7 +193,7 @@ private: void createUniqueFolderName(INetURLObject* pURL); ::dbaccess::DATASOURCE_TYPE VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE _DatabaseType) const; - ::dbaccess::DATASOURCE_TYPE getDefaultDatabaseType() const; + ::rtl::OUString getDefaultDatabaseType() const; void updateTypeDependentStates(); sal_Bool callSaveAsDialog(); |