[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - connectivity/source

[Stephan Bergmann]

 connectivity/source/drivers/kab/KDriver.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 88b84c106e43f5c9c3b3adb72c84cb8a03581061
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 27 14:12:54 2015 +0100

    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/14669
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 94a890e..8fb6642 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 )