sc/source/ui/app/scdll.cxx     |    3 +++
 sd/source/ui/app/sddll.cxx     |    4 ++++
 sw/source/uibase/app/swdll.cxx |    4 ++++
 3 files changed, 11 insertions(+)

New commits:
commit 93eef21ce1f74c848fcf0ad4f4eab7a8167a39a8
Author: Michael Meeks <michael.me...@collabora.com>
Date:   Mon Feb 12 12:04:23 2018 +0100

    Disable lok_preload_hooks when not dynamically loading.
    
    Change-Id: I00f1e8978607f450d3ad33f4515be1fc962c0332
    Reviewed-on: https://gerrit.libreoffice.org/49591
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 6f8287cd1b9d..6ee59f75efe9 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -267,6 +267,8 @@ void ScDLL::Init()
     //  StarOne Services are now handled in the registry
 }
 
+#ifndef DISABLE_DYNLOADING
+
 extern "C" SAL_DLLPUBLIC_EXPORT
 void lok_preload_hook()
 {
@@ -276,5 +278,6 @@ void lok_preload_hook()
     ScAbstractDialogFactory::Create();
 }
 
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 511b66567d67..b4741e4dd7f6 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -290,10 +290,14 @@ void SdDLL::Init()
 #endif
 }
 
+#ifndef DISABLE_DYNLOADING
+
 extern "C" SAL_DLLPUBLIC_EXPORT
 void lok_preload_hook()
 {
     SdAbstractDialogFactory::Create();
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index 7df0cec3a0db..a126f56524ea 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -172,10 +172,14 @@ sw::Filters & SwDLL::getFilters()
     return *filters_.get();
 }
 
+#ifndef DISABLE_DYNLOADING
+
 extern "C" SAL_DLLPUBLIC_EXPORT
 void lok_preload_hook()
 {
     SwAbstractDialogFactory::Create();
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to