From 08f33ca66559dfafd29ab0c6073232cf05a6d4e5 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Wed, 1 Oct 2014 11:57:30 +0200 Subject: fdo#84315 quick fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/11738 Reviewed-by: Matúš Kukan Tested-by: Matúš Kukan Reviewed-by: David Tardon --- svx/Library_svxcore.mk | 1 + svx/source/form/dbtoolsclient.cxx | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'svx') diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 24b5788512ef..7efaf278d413 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 766877ad6491..d19635bb79aa 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( -- cgit