User: kz Date: 05/06/30 09:34:17 Modified: /dba/dbaccess/source/ui/inc/ dbwizsetup.hxx
Log: INTEGRATION: CWS wizopendb (1.5.48); FILE MERGED 2005/06/06 10:40:43 fs 1.5.48.1: #i42477# allow the 'New Database' wizard to load existing documents 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.5&r2=1.6 Delta lines: +7 -7 ------------------- --- dbwizsetup.hxx 10 Mar 2005 16:51:17 -0000 1.5 +++ dbwizsetup.hxx 30 Jun 2005 16:34:14 -0000 1.6 @@ -137,7 +137,6 @@ String m_sRM_SpreadSheetText; String m_sRM_AuthentificationText; String m_sRM_FinalText; -// String m_sWizardTitle; INetURLObject m_aDocURL; String m_sWorkPath; OGeneralPage* m_pGeneralPage; @@ -173,11 +172,11 @@ /** returns <TRUE/> if the database should be opened, otherwise <FALSE/>. */ - sal_Bool IsDatabaseDocumentToBeOpened(); + sal_Bool IsDatabaseDocumentToBeOpened() const; /** returns <TRUE/> if the table wizard should be opened, otherwise <FALSE/>. */ - sal_Bool IsTableWizardToBeStarted(); + sal_Bool IsTableWizardToBeStarted() const; protected: /// to override to create new pages @@ -209,18 +208,19 @@ private: void RegisterDataSourceByLocation(const ::rtl::OUString& sPath); sal_Bool SaveDatabaseDocument(); - void activateDatabasePath(OGeneralPage* _pTabpage); + void activateDatabasePath(); void createUniqueFileName(INetURLObject* pURL); void CreateDatabase(); void createUniqueFolderName(INetURLObject* pURL); DATASOURCE_TYPE VerifyDataSourceType(const DATASOURCE_TYPE _DatabaseType) const; - void ToggleFollowingRoadmapSteps(); + void updateTypeDependentStates(); sal_Bool callSaveAsDialog(); -// sal_Bool DocUrlHasValue(); sal_Bool IsConnectionUrlRequired(); DECL_LINK(OnTypeSelected, OGeneralPage*); - DECL_LINK(ImplCreateDBHdl, OGeneralPage*); + DECL_LINK(OnChangeCreationMode, OGeneralPage*); + DECL_LINK(OnRecentDocumentSelected, OGeneralPage*); + DECL_LINK(OnSingleDocumentChosen, OGeneralPage*); DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); DECL_LINK(ImplModifiedHdl, OGenericAdministrationPage*); }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
