[Libreoffice-commits] core.git: sfx2/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Apr 15 11:20:54 UTC 2020


 sfx2/source/appl/getbasctlfunction.cxx |    2 ++
 sfx2/source/appl/getbasctlfunction.hxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 98f8e3a94a1b0346311dbd5eb1d0d6206eaa13e7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 15 11:10:26 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 15 13:20:16 2020 +0200

    ofz#21701 fix DISABLE_DYNLOADING case
    
    Change-Id: I8b63c032e8421d3001bb318ddbdc8cffcfa5212b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92253
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/appl/getbasctlfunction.cxx b/sfx2/source/appl/getbasctlfunction.cxx
index 4f272919174a..fd7f4873017e 100644
--- a/sfx2/source/appl/getbasctlfunction.cxx
+++ b/sfx2/source/appl/getbasctlfunction.cxx
@@ -30,6 +30,7 @@
 #include "getbasctlfunction.hxx"
 
 #if HAVE_FEATURE_SCRIPTING
+#ifndef DISABLE_DYNLOADING
 
 extern "C" { static void thisModule() {} }
 
@@ -57,6 +58,7 @@ oslGenericFunction sfx2::getBasctlFunction(char const* name)
     return pSymbol;
 }
 
+#endif
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sfx2/source/appl/getbasctlfunction.hxx b/sfx2/source/appl/getbasctlfunction.hxx
index 98f9db47a929..5fa4bc557094 100644
--- a/sfx2/source/appl/getbasctlfunction.hxx
+++ b/sfx2/source/appl/getbasctlfunction.hxx
@@ -24,6 +24,7 @@
 
 #include <osl/module.h>
 
+#ifndef DISABLE_DYNLOADING
 #if HAVE_FEATURE_SCRIPTING
 
 namespace sfx2
@@ -31,6 +32,7 @@ namespace sfx2
 oslGenericFunction getBasctlFunction(char const* name);
 }
 
+#endif
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */


More information about the Libreoffice-commits mailing list