Kaydet (Commit) e8f8f9dd authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Andras Timar

Disable lok_preload_hooks when not dynamically loading.

Change-Id: I00f1e8978607f450d3ad33f4515be1fc962c0332
Reviewed-on: https://gerrit.libreoffice.org/49591Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 93eef21c)
üst 647da8fd
...@@ -267,6 +267,8 @@ void ScDLL::Init() ...@@ -267,6 +267,8 @@ void ScDLL::Init()
// StarOne Services are now handled in the registry // StarOne Services are now handled in the registry
} }
#ifndef DISABLE_DYNLOADING
extern "C" SAL_DLLPUBLIC_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
void lok_preload_hook() void lok_preload_hook()
{ {
...@@ -276,5 +278,6 @@ void lok_preload_hook() ...@@ -276,5 +278,6 @@ void lok_preload_hook()
ScAbstractDialogFactory::Create(); ScAbstractDialogFactory::Create();
} }
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -290,10 +290,14 @@ void SdDLL::Init() ...@@ -290,10 +290,14 @@ void SdDLL::Init()
#endif #endif
} }
#ifndef DISABLE_DYNLOADING
extern "C" SAL_DLLPUBLIC_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
void lok_preload_hook() void lok_preload_hook()
{ {
SdAbstractDialogFactory::Create(); SdAbstractDialogFactory::Create();
} }
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -172,10 +172,14 @@ sw::Filters & SwDLL::getFilters() ...@@ -172,10 +172,14 @@ sw::Filters & SwDLL::getFilters()
return *filters_.get(); return *filters_.get();
} }
#ifndef DISABLE_DYNLOADING
extern "C" SAL_DLLPUBLIC_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
void lok_preload_hook() void lok_preload_hook()
{ {
SwAbstractDialogFactory::Create(); SwAbstractDialogFactory::Create();
} }
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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