User: hr Date: 2007-11-01 15:21:54+0000 Modified: dba/dbaccess/source/ui/inc/dbwizsetup.hxx
Log: INTEGRATION: CWS dba24b (1.11.28); FILE MERGED 2007/08/29 11:57:35 fs 1.11.28.2: during #i80930#: getDefaultDatabaseType 2007/08/28 13:29:13 fs 1.11.28.1: +declareAuthDepPath File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dbwizsetup.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbwizsetup.hxx?r1=1.11&r2=1.12 Delta lines: +17 -1 -------------------- --- dbwizsetup.hxx 2007-07-06 08:28:45+0000 1.11 +++ dbwizsetup.hxx 2007-11-01 15:21:51+0000 1.12 @@ -133,7 +133,7 @@ virtual SfxItemSet* getWriteOutputSet(); // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB(); + 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 DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; @@ -176,6 +176,20 @@ }; private: + /** declares a path with or without authentication, as indicated by the database type + + @param _eType + 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. + @param _nPathId + the ID of the path + @path + the first state in this path, following by an arbitrary number of others, as in + RoadmapWizard::declarePath. + */ + void declareAuthDepPath( DATASOURCE_TYPE _eType, PathId _nPathId, WizardState _nFirstState, ... ); + void RegisterDataSourceByLocation(const ::rtl::OUString& sPath); sal_Bool SaveDatabaseDocument(); void activateDatabasePath(); @@ -184,6 +198,8 @@ void createUniqueFolderName(INetURLObject* pURL); DATASOURCE_TYPE VerifyDataSourceType(const DATASOURCE_TYPE _DatabaseType) const; + DATASOURCE_TYPE getDefaultDatabaseType() const; + void updateTypeDependentStates(); sal_Bool callSaveAsDialog(); sal_Bool IsConnectionUrlRequired(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
