Tag: cws_src680_oj14 User: oj Date: 2007-06-05 16:49:05+0000 Log: merge prob
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.3&r2=1.4.8.4 Delta lines: +3 -7 ------------------- --- AdabasStatDlg.hxx 2007-06-04 18:32:52+0000 1.4.8.3 +++ AdabasStatDlg.hxx 2007-06-05 16:49:02+0000 1.4.8.4 @@ -4,9 +4,9 @@ * * $RCSfile: AdabasStatDlg.hxx,v $ * - * $Revision: 1.4.8.3 $ + * $Revision: 1.4.8.4 $ * - * last change: $Author: oj $ $Date: 2007/06/04 18:32:52 $ + * last change: $Author: oj $ $Date: 2007/06/05 16:49:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,11 +68,7 @@ /** 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
