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 /toolkit | |
| 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 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index d17a8efb0aaf..bfa45a8c47bc 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_libraries.h> + #include <boost/ptr_container/ptr_vector.hpp> #include <stdio.h> @@ -1230,13 +1232,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( ) { #ifndef DISABLE_DYNLOADING - OUString aLibName = ::vcl::unohelper::CreateLibraryName( -#ifdef LIBO_MERGELIBS - "merged", -#else - "svt", -#endif - true ); + OUString aLibName(LIBO_LIBRARY(svt)); hSvToolsLib = osl_loadModuleRelative( &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); if ( hSvToolsLib ) |