Kaydet (Commit) dff5dd90 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Just link statically to CreateUnoWrapper() in the DISABLE_DYNLOADING case

üst b08e9f30
...@@ -1536,14 +1536,23 @@ sal_uInt16 Application::GetSystemWindowMode() ...@@ -1536,14 +1536,23 @@ sal_uInt16 Application::GetSystemWindowMode()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#ifdef DISABLE_DYNLOADING
extern "C" { UnoWrapperBase* CreateUnoWrapper(); }
#else
extern "C" { static void SAL_CALL thisModule() {} } extern "C" { static void SAL_CALL thisModule() {} }
#endif
UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
{ {
ImplSVData* pSVData = ImplGetSVData(); ImplSVData* pSVData = ImplGetSVData();
static sal_Bool bAlreadyTriedToCreate = sal_False; static sal_Bool bAlreadyTriedToCreate = sal_False;
if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate ) if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
{ {
#ifndef DISABLE_DYNLOADING
::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
#ifdef LIBO_MERGELIBS #ifdef LIBO_MERGELIBS
"merged", "merged",
...@@ -1563,6 +1572,9 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) ...@@ -1563,6 +1572,9 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
} }
} }
DBG_ASSERT( pSVData->mpUnoWrapper, "UnoWrapper could not be created!" ); DBG_ASSERT( pSVData->mpUnoWrapper, "UnoWrapper could not be created!" );
#else
pSVData->mpUnoWrapper = CreateUnoWrapper();
#endif
bAlreadyTriedToCreate = sal_True; bAlreadyTriedToCreate = sal_True;
} }
return pSVData->mpUnoWrapper; return pSVData->mpUnoWrapper;
......
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