diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/odbcconfig.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 551202f5ca69..c9c6e73e1dda 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -129,23 +129,23 @@ OOdbcEnumeration::OOdbcEnumeration() bLoaded = load(ODBC_LIBRARY_PLAIN); #endif - if ( bLoaded ) - { + if ( !bLoaded ) + return; + #ifdef HAVE_ODBC_SUPPORT - // load the generic functions - m_pAllocHandle = loadSymbol("SQLAllocHandle"); - m_pFreeHandle = loadSymbol("SQLFreeHandle"); - m_pSetEnvAttr = loadSymbol("SQLSetEnvAttr"); - m_pDataSources = loadSymbol("SQLDataSources"); - - // all or nothing - if (!m_pAllocHandle || !m_pSetEnvAttr || !m_pDataSources || !m_pFreeHandle) - { - unload(); - m_pAllocHandle = m_pFreeHandle = m_pSetEnvAttr = m_pDataSources = nullptr; - } -#endif + // load the generic functions + m_pAllocHandle = loadSymbol("SQLAllocHandle"); + m_pFreeHandle = loadSymbol("SQLFreeHandle"); + m_pSetEnvAttr = loadSymbol("SQLSetEnvAttr"); + m_pDataSources = loadSymbol("SQLDataSources"); + + // all or nothing + if (!m_pAllocHandle || !m_pSetEnvAttr || !m_pDataSources || !m_pFreeHandle) + { + unload(); + m_pAllocHandle = m_pFreeHandle = m_pSetEnvAttr = m_pDataSources = nullptr; } +#endif } OOdbcEnumeration::~OOdbcEnumeration() |