diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/odbcconfig.cxx')
-rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 1f27f2408f17..488be71caad1 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,22 +42,22 @@ #ifdef HAVE_ODBC_SUPPORT #if defined(WIN) || defined(OS2) -#define ODBC_LIBRARY "ODBC.DLL" -#define ODBC_UI_LIBRARY "ODBCINST.DLL" +#define ODBC_LIBRARY "ODBC.DLL" +#define ODBC_UI_LIBRARY "ODBCINST.DLL" #endif #if defined WNT -#define ODBC_LIBRARY "ODBC32.DLL" -#define ODBC_UI_LIBRARY "ODBCCP32.DLL" +#define ODBC_LIBRARY "ODBC32.DLL" +#define ODBC_UI_LIBRARY "ODBCCP32.DLL" #endif #ifdef UNX #ifdef MACOSX -#define ODBC_LIBRARY "libiodbc.dylib" -#define ODBC_UI_LIBRARY "libiodbcinst.dylib" +#define ODBC_LIBRARY "libiodbc.dylib" +#define ODBC_UI_LIBRARY "libiodbcinst.dylib" #else -#define ODBC_LIBRARY_1 "libodbc.so.1" -#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" -#define ODBC_LIBRARY "libodbc.so" -#define ODBC_UI_LIBRARY "libodbcinst.so" +#define ODBC_LIBRARY_1 "libodbc.so.1" +#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1" +#define ODBC_LIBRARY "libodbc.so" +#define ODBC_UI_LIBRARY "libodbcinst.so" #endif #endif @@ -101,10 +101,10 @@ #else -#define ODBC_LIBRARY "" -#define ODBC_UI_LIBRARY "" +#define ODBC_LIBRARY "" +#define ODBC_UI_LIBRARY "" -#endif // HAVE_ODBC_SUPPORT +#endif // HAVE_ODBC_SUPPORT //......................................................................... namespace dbaui @@ -114,10 +114,10 @@ namespace dbaui #ifdef HAVE_ODBC_SUPPORT typedef SQLRETURN (SQL_API* TSQLManageDataSource) (SQLHWND hwndParent); -typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); +typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr); typedef SQLRETURN (SQL_API* TSQLFreeHandle) (SQLSMALLINT HandleType, SQLHANDLE Handle); typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER ValuePtr, SQLINTEGER StringLength); -typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, +typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName, SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr); #define NSQLManageDataSource(a) (*(TSQLManageDataSource)(m_pSQLManageDataSource))(a) @@ -184,10 +184,10 @@ OOdbcLibWrapper::~OOdbcLibWrapper() struct OdbcTypesImpl { #ifdef HAVE_ODBC_SUPPORT - SQLHANDLE hEnvironment; + SQLHANDLE hEnvironment; OdbcTypesImpl() : hEnvironment(0) { } #else - void* pDummy; + void* pDummy; #endif }; DBG_NAME(OOdbcEnumeration) @@ -291,7 +291,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) SQLRETURN nResult = SQL_SUCCESS; rtl_TextEncoding nTextEncoding = osl_getThreadTextEncoding(); - for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); + for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); ; nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_NEXT, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription) ) @@ -382,7 +382,7 @@ bool OOdbcManagement::isRunning() const #endif // HAVE_ODBC_ADMINISTRATION //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |