diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-24 16:51:31 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-25 09:05:09 +0100 |
| commit | c47496fdf9f0ec396f15fb9ddde6bd8d244a1797 (patch) | |
| tree | 739b259a6d79e53ddfc673c5c7d40ebc4c634387 /vcl/source/window/abstdlg.cxx | |
| parent | 9d17966632a8e756c26b6569ff5e282a719a1ac1 (diff) | |
Add config_libraries.h definitions to get library names easily.
Works for libmerged too, so we can get rid of LIBO_MERGELIBS.
And remove few more #defines in vcl.
It's generated by gbuild, so probably abusing config_host directory.
Open to improvements.
Change-Id: I87ab109bf109e42751766011daf076e9cdf8f5ee
Diffstat (limited to 'vcl/source/window/abstdlg.cxx')
| -rw-r--r-- | vcl/source/window/abstdlg.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx index 7cb7cdcd5cdc..5cdb7575579a 100644 --- a/vcl/source/window/abstdlg.cxx +++ b/vcl/source/window/abstdlg.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include <config_libraries.h> #include <rtl/ustring.hxx> #include <osl/module.hxx> @@ -37,7 +38,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create() #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; - if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, OUString( CUI_DLL_NAME ), + if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, LIBO_LIBRARY(cui), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( VclAbstractDialogFactory* (SAL_CALL*)() ) aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") ); |