diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-10-02 15:41:41 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-07 15:52:46 +0000 |
| commit | 80d0985771f40316590ee8368d899ffb835c0035 (patch) | |
| tree | 30bb579071ffce3d4c86bcfbdefb93ad67d3b37d | |
| parent | ff2ec0b6859ef0a9db2809a0ea676e6e8631785b (diff) | |
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@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/Library_sw.mk | 1 | ||||
| -rw-r--r-- | sw/source/core/uibase/dbui/swdbtoolsclient.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index d10fbcff6e4d..d6ec49fd3e77 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 2c1ce9a99551..a7bc6d911f83 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( |