commit 9984579e96a966c2e47db98ceeb9a83b1adefa00
author Caolán McNamara <caolanm@redhat.com> Mon Nov 13 09:57:26 2017 +0000
committer Caolán McNamara <caolanm@redhat.com> Mon Nov 13 13:09:41 2017 +0100
tree 7fccc7ba951a3d3f84fdfd4ba38bedb186f3760b
parent 1568e51ff288e43b0a97257dbe3d3c81bdb1d386

survive building dbaccess+connectivity with --disable-dynamic-loading

Change-Id: I49387d2b6ec1893bf721e3289f2f620a4ce71fb3
Reviewed-on: https://gerrit.libreoffice.org/44668
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

connectivity/source/drivers/odbc/OFunctions.cxx

diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index dbbcdc7..cb04f30 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -90,6 +90,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath)

    if (bLoaded)
        return true;
#ifndef DISABLE_DYNLOADING
#ifdef _WIN32
    _rPath = "ODBC32.DLL";
#endif
@@ -106,6 +107,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath)

    if ( !pODBCso )
        pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
#endif
    if( !pODBCso)
        return false;

dbaccess/source/ui/dlg/odbcconfig.cxx

diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index c9a8888..5cb07ab 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -73,7 +73,7 @@ typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMA
bool OOdbcEnumeration::load(const sal_Char* _pLibPath)
{
    m_sLibPath = OUString::createFromAscii(_pLibPath);
#ifdef HAVE_ODBC_SUPPORT
#if defined(HAVE_ODBC_SUPPORT) && !defined(DISABLE_DYNLOADING)
    // load the module
    m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW);
    return (nullptr != m_pOdbcLib);
@@ -84,7 +84,7 @@ bool OOdbcEnumeration::load(const sal_Char* _pLibPath)

void OOdbcEnumeration::unload()
{
#ifdef HAVE_ODBC_SUPPORT
#if defined(HAVE_ODBC_SUPPORT) && !defined(DISABLE_DYNLOADING)
    if (isLoaded())
    {
        osl_unloadModule(m_pOdbcLib);