[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/Library_svxcore.mk svx/source

[Lionel Elie Mamane]

 svx/Library_svxcore.mk            |    1 +
 svx/source/form/dbtoolsclient.cxx |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 06ec4f077cd3204d685f24bf5d245868df2ac211
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Oct 1 11:57:30 2014 +0200

    fdo#84315 quick fix
    
    In mergedlib case, load ourselves (that is, mergedlib).
    Fixes bug symptoms, while waiting for fully clean solution,
    which is killing svx/dbtoolsclient completely.
    
    Change-Id: Ib8ad34ee4697f89bdc6bbe64d406053f9e7f7521
    Reviewed-on: https://gerrit.libreoffice.org/11739
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index ee4322d..10f7069 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
 $(eval $(call gb_Library_add_defs,svxcore,\
     -DSVX_DLLIMPLEMENTATION \
     -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+    -DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,dbtools))\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,svxcore,\
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index d4a6945..5f46a6c 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -113,8 +113,7 @@ namespace svxform
 
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
-            const OUString sModuleName( SVLIBRARY( "dbtools" )
-            );
+            const static OUString sModuleName( DBTOOLS_DLL_NAME );
 
             // load the dbtools library
             s_hDbtoolsModule = osl_loadModuleRelative(