diff options
Diffstat (limited to 'sc/inc/callform.hxx')
| -rw-r--r-- | sc/inc/callform.hxx | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index 5331ba469b79..7845b8730e0c 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -38,17 +38,11 @@ #define MAXARRSIZE 0xfffe //------------------------------------------------------------------------ -#ifndef WIN #ifndef WNT #define CALLTYPE #else #define CALLTYPE __cdecl #endif -#else -#define PASCAL _pascal -#define FAR _far -#define CALLTYPE FAR PASCAL -#endif extern "C" { typedef void (CALLTYPE* AdvData)( double& nHandle, void* pData ); @@ -73,8 +67,8 @@ friend class FuncCollection; const ModuleData* pModuleData; String aInternalName; String aFuncName; - USHORT nNumber; - USHORT nParamCount; + sal_uInt16 nNumber; + sal_uInt16 nParamCount; ParamType eAsyncType; ParamType eParamType[MAXFUNCPARAM]; private: @@ -83,8 +77,8 @@ public: FuncData(const ModuleData*pModule, const String& rIName, const String& rFName, - USHORT nNo, - USHORT nCount, + sal_uInt16 nNo, + sal_uInt16 nCount, const ParamType* peType, ParamType eType); FuncData(const FuncData& rData); @@ -93,12 +87,12 @@ public: const String& GetModuleName() const; const String& GetInternalName() const { return aInternalName; } const String& GetFuncName() const { return aFuncName; } - USHORT GetParamCount() const { return nParamCount; } - ParamType GetParamType(USHORT nIndex) const { return eParamType[nIndex]; } + sal_uInt16 GetParamCount() const { return nParamCount; } + ParamType GetParamType(sal_uInt16 nIndex) const { return eParamType[nIndex]; } ParamType GetReturnType() const { return eParamType[0]; } ParamType GetAsyncType() const { return eAsyncType; } - BOOL Call(void** ppParam); - BOOL Unadvice(double nHandle); + sal_Bool Call(void** ppParam); + sal_Bool Unadvice(double nHandle); // name and description of parameter nParam. // nParam==0 => Desc := function description, @@ -112,17 +106,17 @@ public: class FuncCollection : public ScSortedCollection { public: - FuncCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : ScSortedCollection ( nLim, nDel, bDup ) {} + FuncCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup = false) : ScSortedCollection ( nLim, nDel, bDup ) {} FuncCollection(const FuncCollection& rFuncCollection) : ScSortedCollection ( rFuncCollection ) {} virtual ScDataObject* Clone() const { return new FuncCollection(*this); } - FuncData* operator[]( const USHORT nIndex) const {return (FuncData*)At(nIndex);} + FuncData* operator[]( const sal_uInt16 nIndex) const {return (FuncData*)At(nIndex);} virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - BOOL SearchFunc( const String& rName, USHORT& rIndex ) const; + sal_Bool SearchFunc( const String& rName, sal_uInt16& rIndex ) const; }; -BOOL InitExternalFunc(const rtl::OUString& rModuleName); +sal_Bool InitExternalFunc(const rtl::OUString& rModuleName); void ExitExternalFunc(); #endif |