diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-15 15:37:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-15 15:37:47 +0000 |
| commit | 9110185d80316f428c8578f93ff2ce8aad27a68a (patch) | |
| tree | 9d1fb11d7fea228c7e1caa6867a6c3781a677002 /basic | |
| parent | 6da4d12ee857bdeeac218f8ea735bfb9d664d4ea (diff) | |
INTEGRATION: CWS texteng03 (1.12.58); FILE MERGED
2004/11/05 07:26:30 ab 1.12.58.4: #118121# RTL function InStrRev
2004/11/04 15:17:48 ab 1.12.58.3: #117765# RTL function to access RTL library explicitely
2004/10/22 07:15:57 ab 1.12.58.2: #118117# Added AscW and ChrW
2004/10/12 14:10:24 ab 1.12.58.1: #i17884# Fixed handling of parameters/return values > 0x7fff in Asc, InStr, Left
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/stdobj.cxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx index f18956e60b76..373cea71710a 100644 --- a/basic/source/runtime/stdobj.cxx +++ b/basic/source/runtime/stdobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: stdobj.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: pjunck $ $Date: 2004-11-02 11:58:24 $ + * last change: $Author: rt $ $Date: 2004-11-15 16:37:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,7 +111,9 @@ static Methods aMethods[] = { { "Abs", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Abs) }, { "number", SbxDOUBLE }, { "Array", SbxOBJECT, _FUNCTION, RTLNAME(Array) }, -{ "Asc", SbxINTEGER, 1 | _FUNCTION, RTLNAME(Asc) }, +{ "Asc", SbxLONG, 1 | _FUNCTION, RTLNAME(Asc) }, + { "string", SbxSTRING }, +{ "AscW", SbxLONG, 1 | _FUNCTION | _COMPTMASK, RTLNAME(Asc) }, { "string", SbxSTRING }, { "Atn", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Atn) }, { "number", SbxDOUBLE }, @@ -156,6 +158,8 @@ static Methods aMethods[] = { { "Chr", SbxSTRING, 1 | _FUNCTION, RTLNAME(Chr) }, { "string", SbxINTEGER }, +{ "ChrW", SbxSTRING, 1 | _FUNCTION | _COMPTMASK, RTLNAME(Chr) }, + { "string", SbxINTEGER }, { "CInt", SbxINTEGER, 1 | _FUNCTION, RTLNAME(CInt) }, { "expression", SbxVARIANT }, @@ -341,10 +345,15 @@ static Methods aMethods[] = { { "Default", SbxSTRING, _OPT }, { "XPosTwips", SbxLONG, _OPT }, { "YPosTwips", SbxLONG, _OPT }, -{ "InStr", SbxINTEGER, 4 | _FUNCTION, RTLNAME(InStr) }, - { "StartPos", SbxSTRING, _OPT }, +{ "InStr", SbxLONG, 4 | _FUNCTION, RTLNAME(InStr) }, + { "Start", SbxSTRING, _OPT }, + { "String1", SbxSTRING }, + { "String2", SbxSTRING }, + { "Compare", SbxINTEGER, _OPT }, +{ "InStrRev", SbxLONG, 4 | _FUNCTION | _COMPTMASK, RTLNAME(InStrRev)}, { "String1", SbxSTRING }, { "String2", SbxSTRING }, + { "Start", SbxSTRING, _OPT }, { "Compare", SbxINTEGER, _OPT }, { "Int", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Int) }, { "number", SbxDOUBLE }, @@ -466,6 +475,7 @@ static Methods aMethods[] = { { "Numdecimalplaces", SbxINTEGER, _OPT }, { "Rnd", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Rnd) }, { "Number", SbxDOUBLE, _OPT }, +{ "RTL", SbxOBJECT, 0 | _FUNCTION | _COMPTMASK, RTLNAME(RTL) }, { "RTrim", SbxSTRING, 1 | _FUNCTION, RTLNAME(RTrim) }, { "string", SbxSTRING }, { "SavePicture", SbxNULL, 2 | _FUNCTION, RTLNAME(SavePicture) }, |