strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#65293# cant compile for linux

Browse source
This commit is contained in:
Oliver Bolte 2000-10-26 12:11:36 +00:00
parent 3540be2bce
commit a91ca1c642
3 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dbaccess/source/ui/dlg/dsselect.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: dsselect.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: fs $ $Date: 2000-10-24 12:13:30 $
* last change: $Author: obo $ $Date: 2000-10-26 13:11:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -176,8 +176,10 @@ IMPL_LINK( ODatasourceSelectDialog, ListDblClickHdl, ListBox *, pListBox )
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));
@ -187,10 +189,12 @@ IMPL_LINK( ODatasourceSelectDialog, ManageClickHdl, PushButton*, pButton )
m_aDatasource.GrabFocus();
m_aManageDatasources.Disable();
return 1L;
#ifdef HAVE_ODBC_ADMINISTRATION
}
aOdbcConfig.manageDataSources(GetSystemData()->hWnd);
return 0L;
#endif
}
//.........................................................................
@ -200,6 +204,9 @@ IMPL_LINK( ODatasourceSelectDialog, ManageClickHdl, PushButton*, pButton )
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
* Revision 1.1 2000/10/24 12:13:30 fs
* initial checkin - dialog for selecting system datasources
*
*
* Revision 1.0 24.10.00 09:25:01 fs
************************************************************************/

23
dbaccess/source/ui/dlg/odbcconfig.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: odbcconfig.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: fs $ $Date: 2000-10-24 12:48:36 $
* last change: $Author: obo $ $Date: 2000-10-26 13:11:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -78,10 +78,12 @@
#ifdef WIN
#define ODBC_LIBRARY "ODBC.DLL"
#define ODBC_UI_LIBRARY "ODBCINST.DLL"
#elif defined WNT
#if defined WNT
#define ODBC_LIBRARY "ODBC32.DLL"
#define ODBC_UI_LIBRARY "ODBCCP32.DLL"
#elif
#endif
#endif
#ifdef UNX
#define ODBC_LIBRARY "libodbc.so"
#define ODBC_UI_LIBRARY "libodbc.so"
#endif
@ -110,11 +112,11 @@ typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEG
typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName,
SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr);
#define NSQLManageDataSource(a) (*static_cast<TSQLManageDataSource>(m_pSQLManageDataSource))(a)
#define NSQLAllocHandle(a,b,c) (*static_cast<TSQLAllocHandle>(m_pAllocHandle))(a,b,c)
#define NSQLFreeHandle(a,b) (*static_cast<TSQLFreeHandle>(m_pFreeHandle))(a,b)
#define NSQLSetEnvAttr(a,b,c,d) (*static_cast<TSQLSetEnvAttr>(m_pSetEnvAttr))(a,b,c,d)
#define NSQLDataSources(a,b,c,d,e,f,g,h) (*static_cast<TSQLDataSources>(m_pDataSources))(a,b,c,d,e,f,g,h)
#define NSQLManageDataSource(a) (*reinterpret_cast<TSQLManageDataSource>(m_pSQLManageDataSource))(a)
#define NSQLAllocHandle(a,b,c) (*reinterpret_cast<TSQLAllocHandle>(m_pAllocHandle))(a,b,c)
#define NSQLFreeHandle(a,b) (*reinterpret_cast<TSQLFreeHandle>(m_pFreeHandle))(a,b)
#define NSQLSetEnvAttr(a,b,c,d) (*reinterpret_cast<TSQLSetEnvAttr>(m_pSetEnvAttr))(a,b,c,d)
#define NSQLDataSources(a,b,c,d,e,f,g,h) (*reinterpret_cast<TSQLDataSources>(m_pDataSources))(a,b,c,d,e,f,g,h)
#endif
//=========================================================================
@ -327,6 +329,9 @@ void OOdbcManagement::manageDataSources(void* _pParentSysWindowHandle)
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
* Revision 1.1 2000/10/24 12:48:36 fs
* initial checkin - wrapping (system) data source related ODBC functionality
*
*
* Revision 1.0 24.10.00 10:14:13 fs
************************************************************************/

10
dbaccess/source/ui/dlg/odbcconfig.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: odbcconfig.hxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: fs $ $Date: 2000-10-24 12:48:44 $
* last change: $Author: obo $ $Date: 2000-10-26 13:11:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -65,6 +65,9 @@
#if defined(WIN) || defined(WNT) || defined (UNX)
#define HAVE_ODBC_SUPPORT
#endif
#if ( defined(WIN) || defined(WNT) ) && defined(HAVE_ODBC_SUPPORT)
#define HAVE_ODBC_ADMINISTRATION
#endif
#ifndef _OSL_MODULE_H_
#include <osl/module.h>
@ -171,6 +174,9 @@ public:
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
* Revision 1.1 2000/10/24 12:48:44 fs
* initial checkin - wrapping (system) data source related ODBC functionality
*
*
* Revision 1.0 24.10.00 10:11:51 fs
************************************************************************/