diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-02-24 15:06:52 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-24 16:46:48 +0000 |
| commit | 63ac26703974f8481b112b1a881329fa7a8bca96 (patch) | |
| tree | be94836c7b0f545a1b5a02ff030a3d5a4f0b4cfe /toolkit | |
| parent | 1543f1ec6deba898f71b04d242af8bed74dcd8d6 (diff) | |
toolkit: fix module name for svt to 'merged' when using mergedlibs
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 3a8e2c625182..fe21cc616283 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1094,7 +1094,13 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( // try to load the lib if ( !fnSvtCreateWindow && !hSvToolsLib ) { - ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "svt", sal_True ); + ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( +#ifdef LIBO_MERGELIBS + "merged", +#else + "svt", +#endif + sal_True ); hSvToolsLib = osl_loadModuleRelative( &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); if ( hSvToolsLib ) |