diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 15:41:03 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-21 15:41:03 +0300 |
| commit | 2f1939eeeba79f320ed1ffcf590b19139a7e6e70 (patch) | |
| tree | 9d7265dd004a19cf1972791b790db0c9654d7c77 /dbaccess/source | |
| parent | 3bedcd5ed403a0e3905fa9193de62666e5fc4023 (diff) | |
Drop OS2
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 13 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.hxx | 4 |
3 files changed, 2 insertions, 18 deletions
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index fe6bb14a2..1d9429bab 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -334,9 +334,6 @@ DBG_NAME(OTextConnectionHelper) String sExtension = GetExtension(); String aErrorText; Control* pErrorWin = NULL; - // if (!m_aFieldSeparator.GetText().Len()) - // if this line is compiled under OS2 (in a product environent) - // -> use a temporary variable String aDelText(m_aFieldSeparator.GetText()); if(!aDelText.Len()) { // Kein FeldTrenner diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 83e3d1ca8..a4579a76e 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -48,10 +48,6 @@ #ifdef HAVE_ODBC_SUPPORT -#if defined(OS2) -#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" @@ -82,11 +78,6 @@ #endif #endif // defined(WNT) -#if defined(OS2) -#define ALLREADY_HAVE_OS2_TYPES -#define DONT_TD_VOID -#endif - #ifdef SYSTEM_ODBC_HEADERS #include <sqlext.h> #else @@ -102,10 +93,6 @@ #endif // defined(WNT) // from here on you can do what you want to -#if defined(OS2) -#define SQL_API _System -#endif // defined(OS2) - #else #define ODBC_LIBRARY "" diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 624338ea1..e35338a19 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -31,11 +31,11 @@ #include "commontypes.hxx" -#if defined(WNT) || defined (UNX) || defined (OS2) +#if defined(WNT) || defined (UNX) #define HAVE_ODBC_SUPPORT #endif -#if ( defined(WNT) || defined (OS2) ) && defined(HAVE_ODBC_SUPPORT) +#if defined(WNT) && defined(HAVE_ODBC_SUPPORT) #define HAVE_ODBC_ADMINISTRATION #endif |