[Libreoffice-commits] core.git: sw/Library_sw.mk sw/source

[Matúš Kukan]

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

New commits:
commit 3c6f3290955cfaeaff4d1e38cb1b9d125eac4d61
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
    
    Change-Id: I04f11a3821cb3793e5f993995b0c10fc7a62420b

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 66eb006..825a193 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_sdk_api,sw))
 $(eval $(call gb_Library_add_defs,sw,\
     -DSW_DLLIMPLEMENTATION \
 	-DSWUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,swui))\" \
+	-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/uibase/dbui/swdbtoolsclient.cxx b/sw/source/uibase/dbui/swdbtoolsclient.cxx
index 2c1ce9a..d94228e 100644
--- a/sw/source/uibase/dbui/swdbtoolsclient.cxx
+++ b/sw/source/uibase/dbui/swdbtoolsclient.cxx
@@ -102,11 +102,9 @@ void SwDbtoolsClient::registerClient()
 
 #if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
-        const OUString sModuleName(SVLIBRARY("dbtools"));
-
         // load the dbtools library
         getDbToolsClientModule() = osl_loadModuleRelative(
-            &thisModule, sModuleName.pData, 0);
+            &thisModule, DBTOOLS_DLL_NAME, 0);
         OSL_ENSURE(NULL != getDbToolsClientModule(), "SwDbtoolsClient::registerClient: could not load the dbtools library!");
         if (NULL != getDbToolsClientModule())
         {