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 /sw/source/ui/dialog | |
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 'sw/source/ui/dialog')
-rw-r--r-- | sw/source/ui/dialog/swabstdlg.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index dc459a802fd3..8cf41aa5604d 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -18,11 +18,11 @@ */ #include <config_features.h> +#include <config_libraries.h> #include "swabstdlg.hxx" #include <osl/module.hxx> -#include <vcl/unohelp.hxx> typedef SwAbstractDialogFactory* (SAL_CALL *SwFuncPtrCreateDialogFactory)(); @@ -42,7 +42,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; - static const OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", true)); + static const OUString sLibName(LIBO_LIBRARY(swui)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( SwAbstractDialogFactory* (SAL_CALL*)() ) |