diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-27 14:12:54 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-03-04 03:16:22 -0800 |
| commit | 7bfa3af03b9eb920b7be92a06c8d101db918fe18 (patch) | |
| tree | d87eab3d8270a8d30e9d628b0230344b7ff7009a | |
| parent | 602775ef25ec46a21a2ffebb5d8a0b415cd0509a (diff) | |
Adapt code to changed libkabdrv1lo.so name
broken since LO 3.6, commit 07d512eff12fc89adbfb73e546b3946494f21472
"connectivity: convert kab to gbuild"
(cherry picked from commit d8a2a0b84a9aa570116febf23a6f1d6430fec287)
Conflicts:
connectivity/source/drivers/kab/KDriver.cxx
Change-Id: I65cc32fa55f1d5c0358585489b8b3dc3aaf8004b
Reviewed-on: https://gerrit.libreoffice.org/14672
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit b9df2d7519ab1a36b00ce414ff8136b8bb11f7a8)
| -rw-r--r-- | connectivity/source/drivers/kab/KDriver.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index b023eaa1136f..4a55aa73eb7d 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -31,6 +31,7 @@ #include <cppuhelper/supportsservice.hxx> #include <rtl/ustrbuf.hxx> #include <tools/diagnose_ex.h> +#include <tools/solar.h> #include "resource/kab_res.hrc" #include "resource/sharedresources.hxx" @@ -120,7 +121,7 @@ bool KabImplModule::impl_loadModule() OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc && !m_pApplicationInitFunc && !m_pApplicationShutdownFunc && !m_pKDEVersionCheckFunc, "KabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); - const OUString sModuleName( SAL_MODULENAME( "kabdrv1" )); + const OUString sModuleName( SVLIBRARY( "kabdrv1" )); m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "KabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) |