fdo#84315 quick fix

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/11738Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
Reviewed-by: David Tardon <dtardon@redhat.com>

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

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(