diff options
| author | Tsutomu Uchino <hanya@apache.org> | 2015-01-08 16:28:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-09 09:24:44 +0000 |
| commit | a272f5b7b30f356418ecf28eb95d066f081d1624 (patch) | |
| tree | 0bd197ceb34dc57d947c9dd8ccf6a137127b58da /include/basic/sbxmeth.hxx | |
| parent | 89b5423c01ab4e4f05f8d73fe7826f64197abe41 (diff) | |
Resolves: #i63614# fix strange type mismatch when Iif function is used
Second or later compilation uses value type returned by previous execution of code.
Use the defined type as return value of the runtime function of Basic always.
(cherry picked from commit 7470c682e136a4a89c1e9474bbc79b2d61f31048)
Conflicts:
basic/inc/basic/sbxmeth.hxx
basic/inc/basic/sbxobj.hxx
basic/source/runtime/stdobj.cxx
basic/source/sbx/sbxobj.cxx
Change-Id: I3064e8403286a9c1401ef658bf139bedeae11f17
Diffstat (limited to 'include/basic/sbxmeth.hxx')
| -rw-r--r-- | include/basic/sbxmeth.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx index 6d8be5c51d62..e7d9cae5c17e 100644 --- a/include/basic/sbxmeth.hxx +++ b/include/basic/sbxmeth.hxx @@ -25,14 +25,18 @@ class BASIC_DLLPUBLIC SbxMethod : public SbxVariable { + bool mbIsRuntimeFunction; + SbxDataType mbRuntimeFunctionReturnType; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1); TYPEINFO_OVERRIDE(); - SbxMethod( const OUString& r, SbxDataType t ); + SbxMethod( const OUString& r, SbxDataType t, bool bIsRuntimeFunction=false ); SbxMethod( const SbxMethod& r ); virtual ~SbxMethod(); SbxMethod& operator=( const SbxMethod& r ) { SbxVariable::operator=( r ); return *this; } virtual SbxClassType GetClass() const SAL_OVERRIDE; + bool IsRuntimeFunction() const { return mbIsRuntimeFunction; } + SbxDataType GetRuntimeFunctionReturnType() const{ return mbRuntimeFunctionReturnType; } }; #endif |