User: kz Date: 05/01/21 09:18:58 Modified: /dba/dbaccess/source/ui/inc/ dbwizsetup.hxx
Log: INTEGRATION: CWS dba22 (1.2.24); FILE MERGED 2005/01/06 12:43:58 oj 1.2.24.3: #i39321# extend createConnection to return a pair now 2005/01/04 11:48:43 oj 1.2.24.2: #i39671# remove some unused code for dbwiz 2004/12/07 13:46:21 oj 1.2.24.1: #i37012# remove unused code 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.2&r2=1.3 Delta lines: +6 -7 ------------------- --- dbwizsetup.hxx 27 Oct 2004 13:06:19 -0000 1.2 +++ dbwizsetup.hxx 21 Jan 2005 17:18:56 -0000 1.3 @@ -162,7 +162,7 @@ // forwards to ODbDataSourceAdministrationHelper virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > createConnection(); + 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; virtual void clearPassword(); @@ -200,12 +200,11 @@ private: sal_Bool StartTableWizard(); //const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB - void RegisterDataSourceByLocation(::rtl::OUString sPath); - void OpenDatabaseDocument(::rtl::OUString sPath); + void RegisterDataSourceByLocation(const ::rtl::OUString& sPath); + void OpenDatabaseDocument(const ::rtl::OUString& _sPath); sal_Bool SaveDatabaseDocument(); void activateDatabasePath(OGeneralPage* _pTabpage); void createUniqueFileName(INetURLObject* pURL); - ::rtl::OUString createUniqueName(com::sun::star::uno::Sequence< ::rtl::OUString > sContent, ::rtl::OUString _ElementName); void CreateDatabase(); void createUniqueFolderName(INetURLObject* pURL); DATASOURCE_TYPE VerifyDataSourceType(const DATASOURCE_TYPE _DatabaseType) const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
