Kaydet (Commit) 63ac2670 authored tarafından Michael Meeks's avatar Michael Meeks

toolkit: fix module name for svt to 'merged' when using mergedlibs

üst 1543f1ec
...@@ -1094,7 +1094,13 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( ...@@ -1094,7 +1094,13 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
// try to load the lib // try to load the lib
if ( !fnSvtCreateWindow && !hSvToolsLib ) 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( hSvToolsLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hSvToolsLib ) if ( hSvToolsLib )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment