[Libreoffice-commits] core.git: connectivity/source dbaccess/source

[Caolán McNamara]

 connectivity/source/drivers/odbc/OFunctions.cxx |    2 ++
 dbaccess/source/ui/dlg/odbcconfig.cxx           |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9984579e96a966c2e47db98ceeb9a83b1adefa00
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 13 09:57:26 2017 +0000

    survive building dbaccess+connectivity with --disable-dynamic-loading
    
    Change-Id: I49387d2b6ec1893bf721e3289f2f620a4ce71fb3
    Reviewed-on: https://gerrit.libreoffice.org/44668
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index dbbcdc7ff7f0..cb04f307424c 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;
 
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index c9a888815bfd..5cb07ab2ca2e 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);