Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 02:37:16+0000 Modified: dba/dbaccess/source/ui/dlg/generalpage.hxx
Log: RESYNC: (1.17-1.20); FILE MERGED 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.17.60.1&r2=1.17.60.2 Delta lines: +6 -11 -------------------- --- generalpage.hxx 2006-10-19 10:17:15+0000 1.17.60.1 +++ generalpage.hxx 2008-01-17 02:37:14+0000 1.17.60.2 @@ -51,17 +51,14 @@ #ifndef _SV_EDIT_HXX #include <vcl/edit.hxx> #endif -#ifndef SVTOOLS_DIALOGCONTROLLING_HXX #include <svtools/dialogcontrolling.hxx> -#endif - #include <memory> //......................................................................... namespace dbaui { //......................................................................... - class IAdminHelper; + class IDatabaseSettingsDialog; //========================================================================= //= OGeneralPage //========================================================================= @@ -109,13 +106,12 @@ DocumentDescriptor m_aBrowsedDocument; ::svt::ControlDependencyManager - m_aControlDepdencies; + m_aControlDependencies; + ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - DECLARE_STL_MAP(DATASOURCE_TYPE, String, ::std::less< DATASOURCE_TYPE >, SelectionHistory); DATASOURCE_TYPE m_eCurrentSelection; /// currently selected type DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered .... - SelectionHistory m_aSelectionHistory; /// last selected ConnectURLs for all types enum SPECIAL_MESSAGE { @@ -165,7 +161,6 @@ protected: void onTypeSelected(const DATASOURCE_TYPE _eType); - void initializeHistory(); void initializeTypeList(); void implSetCurrentType( const DATASOURCE_TYPE _eType ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
