Skip to content

C
core
Kaydet (Commit) 60323f6b authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Tor Lillqvist
Dosyalara gözat
Seçenekler

When using libmerged there is no "tk" library

üst 3a2cbe73
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
vcl/source/app/svapp.cxx
Dosyayı görüntüle @ 60323f6b
...@@ -1544,7 +1544,13 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) ...@@ -1544,7 +1544,13 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
static sal_Bool bAlreadyTriedToCreate = sal_False; static sal_Bool bAlreadyTriedToCreate = sal_False;
if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate ) if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
{ {
::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "tk", sal_True ); ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
#ifdef LIBO_MERGELIBS
"merged",
#else
"tk",
#endif
sal_True );
oslModule hTkLib = osl_loadModuleRelative( oslModule hTkLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hTkLib ) if ( hTkLib )
......
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