From 97593ae24a98daca89fad176dc2492e582b3a821 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Oct 2012 07:52:26 +0300 Subject: Handle lack of module loading/unloading API when DISABLE_DYNLOADING There are basicically two classes of cases: 1) Where the code is for obscure historical reasons or what I see as misguided "optimization" split into a more libraries than necessary, and these then are loaded at run-time. Instead, just use direct linking. 2) Where dynamic loading is part of the functionality offered to some upper (scripting etc) layer, or where some system-specific non-LO library is loaded dynamically, as it is not necessarily present on end-user machines. Can't have such in the DISABLE_DYNLOADING case. Change-Id: I9eceac5fb635245def2f4f3320821447bb7cd8c0 --- dbaccess/source/ui/dlg/odbcconfig.cxx | 4 ++++ dbaccess/source/ui/dlg/odbcconfig.hxx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 5adbbf36b4af..c6047a15639d 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -133,6 +133,8 @@ sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) // load the module m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); return (NULL != m_pOdbcLib); +#else + return sal_False; #endif } @@ -289,6 +291,8 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) _rNames.insert(aCurrentDsn); } } +#else + (void) _rNames; #endif } diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index d24b57afd6ab..7ecadd29c9e9 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -22,7 +22,7 @@ #include "commontypes.hxx" -#if defined(WNT) || defined (UNX) +#if defined(WNT) || (defined (UNX) && !defined(ANDROID) && !defined(IOS)) #define HAVE_ODBC_SUPPORT #endif -- cgit