diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:35:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:35:17 +0000 |
| commit | e3ed61ef457a5b42a230c0bc69075c6e245f77fc (patch) | |
| tree | 2436730bbd785f853a64a09bdc989235e471cefe /dbaccess | |
| parent | 5029a6d7ad8896183cbb7e32df32311d114f70cb (diff) | |
INTEGRATION: CWS dba20 (1.8.56); FILE MERGED
2004/12/13 13:24:00 oj 1.8.56.3: RESYNC: (1.9-1.10); FILE MERGED
2004/11/29 09:30:54 oj 1.8.56.2: RESYNC: (1.8-1.9); FILE MERGED
2004/11/22 14:52:57 oj 1.8.56.1: #i36777# disable manage button under sol and linux
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/dsselect.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 626c12a9139c..39b1306fbf84 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dsselect.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2004-11-26 18:19:18 $ + * last change: $Author: obo $ $Date: 2005-01-05 12:35:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,7 +195,7 @@ ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringB } fillListBox(_rDatasources); - +#ifdef HAVE_ODBC_ADMINISTRATION // allow ODBC datasource managenment if ( DST_ODBC == _eType || DST_MYSQL_ODBC == _eType ) { @@ -203,7 +203,7 @@ ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringB m_aManageDatasources.Enable(); m_aManageDatasources.SetClickHdl(LINK(this,ODatasourceSelectDialog,ManageClickHdl)); } - +#endif m_aDatasource.SetDoubleClickHdl(LINK(this,ODatasourceSelectDialog,ListDblClickHdl)); FreeResource(); } @@ -270,13 +270,12 @@ IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, pButton ) return 0L; } // ----------------------------------------------------------------------- +#ifdef HAVE_ODBC_ADMINISTRATION IMPL_LINK( ODatasourceSelectDialog, ManageClickHdl, PushButton*, pButton ) { OOdbcManagement aOdbcConfig; -#ifdef HAVE_ODBC_ADMINISTRATION if (!aOdbcConfig.isLoaded()) { -#endif // show an error message OLocalResourceAccess aLocRes(DLG_DATASOURCE_SELECTION, RSC_MODALDIALOG); String sError(ModuleRes(STR_COULDNOTLOAD_CONFIGLIB)); @@ -286,7 +285,6 @@ IMPL_LINK( ODatasourceSelectDialog, ManageClickHdl, PushButton*, pButton ) m_aDatasource.GrabFocus(); m_aManageDatasources.Disable(); return 1L; -#ifdef HAVE_ODBC_ADMINISTRATION } aOdbcConfig.manageDataSources(GetSystemData()->hWnd); @@ -297,8 +295,8 @@ IMPL_LINK( ODatasourceSelectDialog, ManageClickHdl, PushButton*, pButton ) fillListBox(aOdbcDatasources); return 0L; -#endif } +#endif // ----------------------------------------------------------------------------- void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { |