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 /vcl/source/window/abstdlg.cxx | |
| 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 'vcl/source/window/abstdlg.cxx')
| -rw-r--r-- | vcl/source/window/abstdlg.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 652ac5ef7dfb..869800ace32d 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -21,7 +21,6 @@ #include <rtl/ustring.hxx> #include <osl/module.hxx> -#include <tools/solar.h> #include <vcl/abstdlg.hxx> typedef VclAbstractDialogFactory* (SAL_CALL *FuncPtrCreateDialogFactory)(); @@ -39,7 +38,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; if (aDialogLibrary.is() || - aDialogLibrary.loadRelative(&thisModule, SVLIBRARY("cui"), + aDialogLibrary.loadRelative(&thisModule, CUI_DLL_NAME, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY)) { fp = ( VclAbstractDialogFactory* (SAL_CALL*)() ) |