Tag: cws_src680_dba23b User: fs Date: 2007-07-04 11:48:31+0000 Modified: dba/dbaccess/source/ui/dlg/dsselect.cxx dba/dbaccess/source/ui/dlg/dsselect.hxx
Log: #i10000# File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dsselect.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsselect.cxx?r1=1.19.14.1&r2=1.19.14.2 Delta lines: +4 -6 ------------------- --- dsselect.cxx 2007-07-04 10:34:29+0000 1.19.14.1 +++ dsselect.cxx 2007-07-04 11:48:28+0000 1.19.14.2 @@ -4,9 +4,9 @@ * * $RCSfile: dsselect.cxx,v $ * - * $Revision: 1.19.14.1 $ + * $Revision: 1.19.14.2 $ * - * last change: $Author: fs $ $Date: 2007/07/04 10:34:29 $ + * last change: $Author: fs $ $Date: 2007/07/04 11:48:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,10 +36,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef _DBAUI_ODBC_CONFIG_HXX_ -#include "odbcconfig.hxx" -#endif - #ifndef _DBAUI_DSSELECT_HXX_ #include "dsselect.hxx" #endif @@ -135,7 +131,9 @@ ,m_aOk (this, ModuleRes(PB_OK)) ,m_aCancel (this, ModuleRes(PB_CANCEL)) ,m_aHelp (this, ModuleRes(PB_HELP)) +#ifdef HAVE_ODBC_ADMINISTRATION ,m_aManageDatasources (this, ModuleRes(PB_MANAGE)) +#endif ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE)) ,m_pOutputSet(_pOutputSet) { File [changed]: dsselect.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsselect.hxx?r1=1.6.282.1&r2=1.6.282.2 Delta lines: +11 -20 --------------------- --- dsselect.hxx 2007-07-04 10:34:29+0000 1.6.282.1 +++ dsselect.hxx 2007-07-04 11:48:28+0000 1.6.282.2 @@ -4,9 +4,9 @@ * * $RCSfile: dsselect.hxx,v $ * - * $Revision: 1.6.282.1 $ + * $Revision: 1.6.282.2 $ * - * last change: $Author: fs $ $Date: 2007/07/04 10:34:29 $ + * last change: $Author: fs $ $Date: 2007/07/04 11:48:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,30 +36,16 @@ #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> @@ -69,7 +55,6 @@ { //......................................................................... -class OOdbcManagement; //========================================================================= //= ODatasourceSelector //========================================================================= @@ -81,11 +66,15 @@ 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 ); @@ -98,8 +87,10 @@ 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]
