diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-01-08 21:14:04 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2015-01-09 07:17:35 +0100 |
| commit | 5c5edaef89e953d260501678c3d62c47ad9763ac (patch) | |
| tree | 64a4c03d76aeffdeebc5680484bd71999d7bdf2d /sw/source/uibase | |
| parent | 3f34668673e012860b971e24a7633c300df0c4d1 (diff) | |
Revert "Use SVLIBRARY instead of gb_Library_get_runtime_filename"
$(call gb_Library__get_name,foo) returns "libmerged" if library foo is merged.
This reverts commit ee567a63fad9e755b11ca28696da35f00ed3b0fc.
Change-Id: I6ab9b7f0b01262a6f9d5a6834a6cffdd6ffc6f8a
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/dbui/swdbtoolsclient.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/dialog/swabstdlg.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/dbui/swdbtoolsclient.cxx b/sw/source/uibase/dbui/swdbtoolsclient.cxx index 2c1ce9a99551..a7bc6d911f83 100644 --- a/sw/source/uibase/dbui/swdbtoolsclient.cxx +++ b/sw/source/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( diff --git a/sw/source/uibase/dialog/swabstdlg.cxx b/sw/source/uibase/dialog/swabstdlg.cxx index 127ac29d3410..7b5ec71bbe10 100644 --- a/sw/source/uibase/dialog/swabstdlg.cxx +++ b/sw/source/uibase/dialog/swabstdlg.cxx @@ -41,7 +41,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; - static const OUString sLibName(SVLIBRARY("swui")); + static const OUString sLibName(SWUI_DLL_NAME); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( SwAbstractDialogFactory* (SAL_CALL*)() ) |