Tag: cws_src680_oj14
User: oj      
Date: 2007-06-04 18:40:33+0000
Log:
 RESYNC: (1.9-1.10); FILE MERGED

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.7.8.5&r2=1.7.8.6
Delta lines:  +2 -5
-------------------
--- dbwizsetup.hxx      2006-11-07 09:31:01+0000        1.7.8.5
+++ dbwizsetup.hxx      2007-06-04 18:40:30+0000        1.7.8.6
@@ -78,13 +78,12 @@
 //= ODbTypeWizDialogSetup
 //=========================================================================
 class OGeneralPage;
-struct OPageSettings;
 class ODbDataSourceAdministrationHelper;
 /** tab dialog for administrating the office wide registered data sources
 */
 class OMySQLIntroPageSetup;
 
-class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public 
IItemSetHelper, public IAdminHelper
+class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public 
IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient
 {
 
 private:
@@ -140,6 +139,7 @@
        virtual DATASOURCE_TYPE         getDatasourceType(const SfxItemSet& 
_rSet) const;
        virtual void clearPassword();
        virtual void setTitle(const ::rtl::OUString& _sTitle);
+    virtual void enableConfirmSettings( bool _bEnable );
     virtual sal_Bool saveDatasource();
     virtual String  getStateDisplayName( WizardState _nState );
 
@@ -174,9 +174,6 @@
                AR_LEAVE_UNCHANGED,             // no changes were made
                AR_KEEP                                 // don't leave the page 
(e.g. because an error occured)
        };
-       /** apply all changes made
-       */
-       ApplyResult     implApplyChanges();
 
 private:
     void RegisterDataSourceByLocation(const ::rtl::OUString& sPath);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to