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

[Matúš Kukan]

 sw/Library_sw.mk                               |    1 +
 sw/source/core/uibase/dbui/swdbtoolsclient.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 80d0985771f40316590ee8368d899ffb835c0035
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Oct 2 15:41:41 2014 +0200

    fdo#84315: quick fix for sw too
    
    Similar to 08f33ca66559dfafd29ab0c6073232cf05a6d4e5
    
    (cherry picked from commit 3c6f3290955cfaeaff4d1e38cb1b9d125eac4d61
    and commit 37c00bff114fe39e553ea6f1b8e68d6c6ff93eba)
    
    Change-Id: I04f11a3821cb3793e5f993995b0c10fc7a62420b
    Reviewed-on: https://gerrit.libreoffice.org/11765
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index d10fbcf..d6ec49f 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_sdk_api,sw))
 
 $(eval $(call gb_Library_add_defs,sw,\
     -DSW_DLLIMPLEMENTATION \
+	-DDBTOOLS_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,dbtools))\" \
 ))
 
 $(eval $(call gb_Library_use_libraries,sw,\
diff --git a/sw/source/core/uibase/dbui/swdbtoolsclient.cxx b/sw/source/core/uibase/dbui/swdbtoolsclient.cxx
index 2c1ce9a..a7bc6d9 100644
--- a/sw/source/core/uibase/dbui/swdbtoolsclient.cxx
+++ b/sw/source/core/uibase/dbui/swdbtoolsclient.cxx
@@ -102,7 +102,7 @@ void SwDbtoolsClient::registerClient()
 
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
-        const OUString sModuleName(SVLIBRARY("dbtools"));
+        const OUString sModuleName(DBTOOLS_DLL_NAME);
 
         // load the dbtools library
         getDbToolsClientModule() = osl_loadModuleRelative(