vcl/source/app/svapp.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
New commits: commit caa26b7c74fe89f6c33e1a9c28e527b910777b36 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Tue Feb 14 20:09:01 2012 +0200 When using libmerged there is no "tk" library diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 10d7f63..a0bcc15 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1544,7 +1544,13 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) static sal_Bool bAlreadyTriedToCreate = sal_False; 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( &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); if ( hTkLib ) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits