diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-17 23:53:34 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-04-18 01:23:48 +0300 |
| commit | dff5dd906f1fe6fe949af78d3c46721236c32555 (patch) | |
| tree | 1b4413664d6b9f3b3b0c91f9a75900acd7144236 /vcl | |
| parent | fdo#38635: sw: fix border corner gaps: (diff) | |
| download | core-dff5dd906f1fe6fe949af78d3c46721236c32555.tar.gz core-dff5dd906f1fe6fe949af78d3c46721236c32555.zip | |
Just link statically to CreateUnoWrapper() in the DISABLE_DYNLOADING case
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 0f2c8f4d34d4..43eb6d8e5a83 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1536,14 +1536,23 @@ sal_uInt16 Application::GetSystemWindowMode() // ----------------------------------------------------------------------- +#ifdef DISABLE_DYNLOADING + +extern "C" { UnoWrapperBase* CreateUnoWrapper(); } + +#else + extern "C" { static void SAL_CALL thisModule() {} } +#endif + UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) { ImplSVData* pSVData = ImplGetSVData(); static sal_Bool bAlreadyTriedToCreate = sal_False; if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate ) { +#ifndef DISABLE_DYNLOADING ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( #ifdef LIBO_MERGELIBS "merged", @@ -1563,6 +1572,9 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) } } DBG_ASSERT( pSVData->mpUnoWrapper, "UnoWrapper could not be created!" ); +#else + pSVData->mpUnoWrapper = CreateUnoWrapper(); +#endif bAlreadyTriedToCreate = sal_True; } return pSVData->mpUnoWrapper; |