User: rt Date: 2007-07-24 12:08:22+0000 Modified: dba/dbaccess/source/ui/dlg/dsselect.hxx
Log: INTEGRATION: CWS dba23b (1.6.282); FILE MERGED 2007/07/04 11:48:28 fs 1.6.282.2: #i10000# 2007/07/04 10:34:29 fs 1.6.282.1: #i78733# managing data sources now done by an external process File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dsselect.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsselect.hxx?r1=1.6&r2=1.7 Delta lines: +18 -18 --------------------- --- dsselect.hxx 2005-09-08 15:03:18+0000 1.6 +++ dsselect.hxx 2007-07-24 12:08:19+0000 1.7 @@ -36,30 +36,18 @@ #ifndef _DBAUI_DSSELECT_HXX_ #define _DBAUI_DSSELECT_HXX_ -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef _SV_DIALOG_HXX +#include "odbcconfig.hxx" +#include "commontypes.hxx" + #include <vcl/dialog.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _SV_GROUP_HXX #include <vcl/group.hxx> -#endif -#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ -#include "commontypes.hxx" -#endif + +#include <memory> class SfxItemSet; //......................................................................... @@ -78,19 +66,31 @@ OKButton m_aOk; CancelButton m_aCancel; HelpButton m_aHelp; +#ifdef HAVE_ODBC_ADMINISTRATION PushButton m_aManageDatasources; +#endif PushButton m_aCreateAdabasDB; SfxItemSet* m_pOutputSet; +#ifdef HAVE_ODBC_ADMINISTRATION + ::std::auto_ptr< OOdbcManagement > + m_pODBCManagement; +#endif public: - ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, DATASOURCE_TYPE _eType,SfxItemSet* _pOutputSet = NULL); + ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, DATASOURCE_TYPE _eType,SfxItemSet* _pOutputSet = NULL ); + ~ODatasourceSelectDialog(); inline String GetSelected() const { return m_aDatasource.GetSelectEntry();} void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); } + virtual BOOL Close(); + protected: DECL_LINK( ListDblClickHdl, ListBox * ); +#ifdef HAVE_ODBC_ADMINISTRATION DECL_LINK( ManageClickHdl, PushButton * ); + DECL_LINK( ManageProcessFinished, void* ); +#endif DECL_LINK( CreateDBClickHdl, PushButton * ); void fillListBox(const StringBag& _rDatasources); }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
