mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#84315 quick fix

Browse Source 
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 <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Lionel Elie Mamane
2014-10-01 11:57:30 +02:00
committed by David Tardon
parent 258f4ba9de
commit 08f33ca665
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
svx/Library_svxcore.mk
View File

@@ -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,\

3
svx/source/form/dbtoolsclient.cxx
View File

@@ -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(