User: ihi Date: 2007-11-21 15:58:14+0000 Modified: dba/dbaccess/source/ui/dlg/generalpage.hxx
Log: INTEGRATION: CWS dba24c (1.18.58); FILE MERGED 2007/10/29 22:44:08 fs 1.18.58.2: merging changes from CWS dba24b herein, to not wait for later resync 2007/09/19 08:51:33 fs 1.18.58.1: dialogcontrolling.hxx is dead, has been re-incarnated as svtools/dialogcontrolling a while ago File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: generalpage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/generalpage.hxx?r1=1.19&r2=1.20 Delta lines: +3 -5 ------------------- --- generalpage.hxx 2007-11-01 15:13:35+0000 1.19 +++ generalpage.hxx 2007-11-21 15:58:12+0000 1.20 @@ -51,6 +51,7 @@ #ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> #endif +#include <svtools/dialogcontrolling.hxx> #include <memory> //......................................................................... @@ -58,7 +59,6 @@ { //......................................................................... class IDatabaseSettingsDialog; - class RadioDependentEnabler; //========================================================================= //= OGeneralPage //========================================================================= @@ -105,10 +105,8 @@ CreationMode m_eOriginalCreationMode; DocumentDescriptor m_aBrowsedDocument; - ::std::auto_ptr< RadioDependentEnabler > - m_pSelectTypeController; - ::std::auto_ptr< RadioDependentEnabler > - m_pOpenDocController; + ::svt::ControlDependencyManager + m_aControlDependencies; ODsnTypeCollection* m_pCollection; /// the DSN type collection instance --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
