summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-02-14 20:09:01 +0200
committerTor Lillqvist <tml@iki.fi>2012-02-15 16:20:02 +0200
commit60323f6bcf75cb80b203ae50f328ca78d035851b (patch)
treed1d6aa14a5e9893fa651607f5e37be6d4d24d505
parent3a2cbe739db31139e03beacd4c886a486acf6922 (diff)
When using libmerged there is no "tk" library
-rw-r--r--vcl/source/app/svapp.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 10d7f63a9147..a0bcc15599c3 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 )