[Libreoffice-commits] core.git: 2 commits - sc/source

[Tor Lillqvist]

 sc/source/core/tool/callform.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 644cf72f7c5bb217ea2c3769e5cfd958346e2c7f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 27 13:31:09 2013 +0200

    WaE: macro is not used
    
    Change-Id: I51ffa344e414d549daf642ad961e489a83b2be37

diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index d46409b..8fd8ea2 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -65,6 +65,7 @@ typedef void (CALLTYPE* FARPROC) ( void );
 
 }
 
+#ifndef DISABLE_DYNLOADING
 #define GETFUNCTIONCOUNT        "GetFunctionCount"
 #define GETFUNCTIONDATA         "GetFunctionData"
 #define SETLANGUAGE             "SetLanguage"
@@ -72,6 +73,7 @@ typedef void (CALLTYPE* FARPROC) ( void );
 #define ISASYNC                 "IsAsync"
 #define ADVICE                  "Advice"
 #define UNADVICE                "Unadvice"
+#endif
 
 class ModuleData
 {
commit 1c48417cf7f726e86bbb84a5403b56d925ce5610
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 27 13:29:01 2013 +0200

    Bypass FuncData::getParamDesc() too in the DISABLE_DYNLOADING case
    
    Change-Id: Ia115355af6e556fb848235691be68edd2462752d

diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 7117c71..d46409b 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -391,6 +391,12 @@ const OUString& FuncData::GetModuleName() const
 
 bool FuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const
 {
+#ifdef DISABLE_DYNLOADING
+    (void) aName;
+    (void) aDesc;
+    (void) nParam;
+    return false;
+#else
     bool bRet = false;
     if ( nParam <= nParamCount )
     {
@@ -414,6 +420,7 @@ bool FuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam
         aDesc = OUString();
     }
     return bRet;
+#endif
 }
 
 FuncCollection::FuncCollection() {}