Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:32:55+0000 Log: RESYNC: (1.4-1.5); FILE MERGED
File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: AdabasStatDlg.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/AdabasStatDlg.hxx?r1=1.4.8.2&r2=1.4.8.3 Delta lines: +8 -3 ------------------- --- AdabasStatDlg.hxx 2006-03-20 07:48:35+0000 1.4.8.2 +++ AdabasStatDlg.hxx 2007-06-04 18:32:52+0000 1.4.8.3 @@ -68,7 +68,11 @@ /** implements the adabas admin dialog */ +<<<<<<< AdabasStatDlg.hxx class OAdabasStatPageDlg : public SfxTabDialog, public IItemSetHelper, public IAdminHelper +======= + class OAdabasStatPageDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient +>>>>>>> 1.5 { OModuleClient m_aModuleClient; ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; @@ -95,6 +99,7 @@ virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); + virtual void enableConfirmSettings( bool _bEnable ); }; //......................................................................... } // namespace dbaui --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
