diff options
Diffstat (limited to 'dbaccess/source/ui/dlg/odbcconfig.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index e6308c7557a2..25e53dbdc149 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -76,7 +76,7 @@ bool OOdbcEnumeration::load(const sal_Char* _pLibPath) #ifdef HAVE_ODBC_SUPPORT // load the module m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); - return (NULL != m_pOdbcLib); + return (nullptr != m_pOdbcLib); #else return sal_False; #endif @@ -88,7 +88,7 @@ void OOdbcEnumeration::unload() if (isLoaded()) { osl_unloadModule(m_pOdbcLib); - m_pOdbcLib = NULL; + m_pOdbcLib = nullptr; } #endif } @@ -103,19 +103,19 @@ struct OdbcTypesImpl { #ifdef HAVE_ODBC_SUPPORT SQLHANDLE hEnvironment; - OdbcTypesImpl() : hEnvironment(0) { } + OdbcTypesImpl() : hEnvironment(nullptr) { } #else void* pDummy; #endif }; OOdbcEnumeration::OOdbcEnumeration() - :m_pOdbcLib(NULL) + :m_pOdbcLib(nullptr) #ifdef HAVE_ODBC_SUPPORT - ,m_pAllocHandle(NULL) - ,m_pFreeHandle(NULL) - ,m_pSetEnvAttr(NULL) - ,m_pDataSources(NULL) + ,m_pAllocHandle(nullptr) + ,m_pFreeHandle(nullptr) + ,m_pSetEnvAttr(nullptr) + ,m_pDataSources(nullptr) ,m_pImpl(new OdbcTypesImpl) #endif { @@ -138,7 +138,7 @@ OOdbcEnumeration::OOdbcEnumeration() if (!m_pAllocHandle || !m_pSetEnvAttr || !m_pDataSources || !m_pFreeHandle) { unload(); - m_pAllocHandle = m_pFreeHandle = m_pSetEnvAttr = m_pDataSources = NULL; + m_pAllocHandle = m_pFreeHandle = m_pSetEnvAttr = m_pDataSources = nullptr; } #endif } @@ -179,7 +179,7 @@ void OOdbcEnumeration::freeEnv() #ifdef HAVE_ODBC_SUPPORT if (m_pImpl->hEnvironment) NSQLFreeHandle(SQL_HANDLE_ENV, m_pImpl->hEnvironment); - m_pImpl->hEnvironment = 0; + m_pImpl->hEnvironment = nullptr; #endif } |