diff options
author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-10-01 11:57:30 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-10-02 08:23:53 +0000 |
commit | 08f33ca66559dfafd29ab0c6073232cf05a6d4e5 (patch) | |
tree | 05fa8d03e855bc9b1fe6bba8b165dabfc62876fc /svx/source/form | |
parent | 258f4ba9de5e40210f8a38817f89cf93ac25ebed (diff) |
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/11738
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'svx/source/form')
-rw-r--r-- | svx/source/form/dbtoolsclient.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
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( |