diff options
Diffstat (limited to 'basic/source/runtime/methods.cxx')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 2348 |
1 files changed, 1098 insertions, 1250 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index d8c0c3f9a583..4dfcdc210ea3 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -24,11 +24,10 @@ #include <basic/sbuno.hxx> #include <osl/process.h> #include <vcl/dibtools.hxx> -#include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/sound.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/stdtext.hxx> #include <vcl/weld.hxx> #include <basic/sbx.hxx> @@ -39,6 +38,7 @@ #include <osl/time.h> #include <unotools/charclass.hxx> #include <unotools/ucbstreamhelper.hxx> +#include <unotools/wincodepage.hxx> #include <tools/wldcrd.hxx> #include <i18nlangtag/lang.h> #include <rtl/string.hxx> @@ -59,6 +59,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/script/XErrorQuery.hpp> +#include <ooo/vba/VbStrConv.hpp> #include <ooo/vba/VbTriState.hpp> #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp> #include <memory> @@ -66,11 +67,12 @@ #include <string_view> #include <o3tl/char16_t2wchar_t.hxx> -using namespace comphelper; -using namespace osl; -using namespace com::sun::star; -using namespace com::sun::star::lang; -using namespace com::sun::star::uno; +// include search util +#include <com/sun/star/i18n/Transliteration.hpp> +#include <com/sun/star/util/SearchAlgorithms2.hpp> +#include <i18nutil/searchopt.hxx> +#include <unotools/textsearch.hxx> +#include <svl/numformat.hxx> #include <date.hxx> #include <sbstdobj.hxx> @@ -99,10 +101,16 @@ using namespace com::sun::star::uno; #include <unistd.h> #endif -#include <com/sun/star/i18n/XCharacterClassification.hpp> -#include <vcl/unohelp.hxx> #include <vcl/TypeSerializer.hxx> +using namespace comphelper; +using namespace osl; +using namespace com::sun::star; +using namespace com::sun::star::lang; +using namespace com::sun::star::uno; + +static sal_Int32 GetDayDiff(const Date& rDate) { return rDate - Date(1899'12'30); } + #if HAVE_FEATURE_SCRIPTING static void FilterWhiteSpace( OUString& rStr ) @@ -126,8 +134,6 @@ static void FilterWhiteSpace( OUString& rStr ) rStr = aRet.makeStringAndClear(); } -static tools::Long GetDayDiff( const Date& rDate ); - static const CharClass& GetCharClass() { static CharClass aCharClass( Application::GetSettings().GetLanguageTag() ); @@ -175,16 +181,17 @@ static uno::Reference< ucb::XSimpleFileAccess3 > const & getFileAccess() void SbRtl_CreateObject(StarBASIC * pBasic, SbxArray & rPar, bool) { - OUString aClass( rPar.Get32(1)->GetOUString() ); + if( rPar.Count() < 2 ) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + OUString aClass(rPar.Get(1)->GetOUString()); SbxObjectRef p = SbxBase::CreateObject( aClass ); if( !p.is() ) - StarBASIC::Error( ERRCODE_BASIC_CANNOT_LOAD ); - else - { - // Convenience: enter BASIC as parent - p->SetParent( pBasic ); - rPar.Get32(0)->PutObject( p.get() ); - } + return StarBASIC::Error( ERRCODE_BASIC_CANNOT_LOAD ); + + // Convenience: enter BASIC as parent + p->SetParent( pBasic ); + rPar.Get(0)->PutObject(p.get()); } // Error( n ) @@ -192,161 +199,139 @@ void SbRtl_CreateObject(StarBASIC * pBasic, SbxArray & rPar, bool) void SbRtl_Error(StarBASIC * pBasic, SbxArray & rPar, bool) { if( !pBasic ) - StarBASIC::Error( ERRCODE_BASIC_INTERNAL_ERROR ); + return StarBASIC::Error( ERRCODE_BASIC_INTERNAL_ERROR ); + + OUString aErrorMsg; + ErrCode nErr = ERRCODE_NONE; + sal_Int32 nCode = 0; + if (rPar.Count() == 1) + { + nErr = StarBASIC::GetErrBasic(); + aErrorMsg = StarBASIC::GetErrorMsg(); + } else { - OUString aErrorMsg; - ErrCode nErr = ERRCODE_NONE; - sal_Int32 nCode = 0; - if( rPar.Count32() == 1 ) - { - nErr = StarBASIC::GetErrBasic(); - aErrorMsg = StarBASIC::GetErrorMsg(); - } - else + nCode = rPar.Get(1)->GetLong(); + if( nCode > 65535 ) { - nCode = rPar.Get32(1)->GetLong(); - if( nCode > 65535 ) - { - StarBASIC::Error( ERRCODE_BASIC_CONVERSION ); - } - else - { - nErr = StarBASIC::GetSfxFromVBError( static_cast<sal_uInt16>(nCode) ); - } - } - - bool bVBA = SbiRuntime::isVBAEnabled(); - OUString tmpErrMsg; - if( bVBA && !aErrorMsg.isEmpty()) - { - tmpErrMsg = aErrorMsg; + StarBASIC::Error( ERRCODE_BASIC_CONVERSION ); } else { - StarBASIC::MakeErrorText( nErr, aErrorMsg ); - tmpErrMsg = StarBASIC::GetErrorText(); + nErr = StarBASIC::GetSfxFromVBError( static_cast<sal_uInt16>(nCode) ); } - // If this rtlfunc 'Error' passed an errcode the same as the active Err Objects's - // current err then return the description for the error message if it is set - // ( complicated isn't it ? ) - if ( bVBA && rPar.Count32() > 1 ) + } + bool bVBA = SbiRuntime::isVBAEnabled(); + OUString tmpErrMsg; + if( bVBA && !aErrorMsg.isEmpty()) + { + tmpErrMsg = aErrorMsg; + } + else + { + StarBASIC::MakeErrorText( nErr, aErrorMsg ); + tmpErrMsg = StarBASIC::GetErrorText(); + } + // If this rtlfunc 'Error' passed an errcode the same as the active Err Objects's + // current err then return the description for the error message if it is set + // ( complicated isn't it ? ) + if (bVBA && rPar.Count() > 1) + { + uno::Reference< ooo::vba::XErrObject > xErrObj( SbxErrObject::getUnoErrObject() ); + if ( xErrObj.is() && xErrObj->getNumber() == nCode && !xErrObj->getDescription().isEmpty() ) { - uno::Reference< ooo::vba::XErrObject > xErrObj( SbxErrObject::getUnoErrObject() ); - if ( xErrObj.is() && xErrObj->getNumber() == nCode && !xErrObj->getDescription().isEmpty() ) - { - tmpErrMsg = xErrObj->getDescription(); - } + tmpErrMsg = xErrObj->getDescription(); } - rPar.Get32(0)->PutString( tmpErrMsg ); } + rPar.Get(0)->PutString(tmpErrMsg); } // Sinus void SbRtl_Sin(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - else - { - SbxVariableRef pArg = rPar.Get32(1); - rPar.Get32(0)->PutDouble( sin( pArg->GetDouble() ) ); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + rPar.Get(0)->PutDouble(sin(pArg->GetDouble())); } void SbRtl_Cos(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - else - { - SbxVariableRef pArg = rPar.Get32(1); - rPar.Get32(0)->PutDouble( cos( pArg->GetDouble() ) ); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + rPar.Get(0)->PutDouble(cos(pArg->GetDouble())); } void SbRtl_Atn(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - else - { - SbxVariableRef pArg = rPar.Get32(1); - rPar.Get32(0)->PutDouble( atan( pArg->GetDouble() ) ); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + rPar.Get(0)->PutDouble(atan(pArg->GetDouble())); } void SbRtl_Abs(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - SbxVariableRef pArg = rPar.Get32(1); - rPar.Get32(0)->PutDouble( fabs( pArg->GetDouble() ) ); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + rPar.Get(0)->PutDouble(fabs(pArg->GetDouble())); } void SbRtl_Asc(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + OUString aStr( pArg->GetOUString() ); + if ( aStr.isEmpty()) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + rPar.Get(0)->PutEmpty(); + return; } - else - { - SbxVariableRef pArg = rPar.Get32(1); - OUString aStr( pArg->GetOUString() ); - if ( aStr.isEmpty()) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - rPar.Get32(0)->PutEmpty(); - } - else - { - sal_Unicode aCh = aStr[0]; - rPar.Get32(0)->PutLong( aCh ); - } - } + sal_Unicode aCh = aStr[0]; + rPar.Get(0)->PutLong(aCh); } static void implChr( SbxArray& rPar, bool bChrW ) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + + OUString aStr; + if( !bChrW && SbiRuntime::isVBAEnabled() ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + char c = static_cast<char>(pArg->GetByte()); + aStr = OUString(&c, 1, osl_getThreadTextEncoding()); } else { - SbxVariableRef pArg = rPar.Get32(1); - - OUString aStr; - if( !bChrW && SbiRuntime::isVBAEnabled() ) + // Map negative 16-bit values to large positive ones, so that code like Chr(&H8000) + // still works after the fix for tdf#62326 changed those four-digit hex notations to + // produce negative values: + sal_Int32 aCh = pArg->GetLong(); + if (aCh < -0x8000 || aCh > 0xFFFF) { - char c = static_cast<char>(pArg->GetByte()); - aStr = OUString(&c, 1, osl_getThreadTextEncoding()); + StarBASIC::Error(ERRCODE_BASIC_MATH_OVERFLOW); + aCh = 0; } - else - { - // Map negative 16-bit values to large positive ones, so that code like Chr(&H8000) - // still works after the fix for tdf#62326 changed those four-digit hex notations to - // produce negative values: - sal_Int32 aCh = pArg->GetLong(); - if (aCh < -0x8000 || aCh > 0xFFFF) { - StarBASIC::Error(ERRCODE_BASIC_MATH_OVERFLOW); - aCh = 0; - } - aStr = OUString(static_cast<sal_Unicode>(aCh)); - } - rPar.Get32(0)->PutString( aStr ); + aStr = OUString(static_cast<sal_Unicode>(aCh)); } + rPar.Get(0)->PutString(aStr); } void SbRtl_Chr(StarBASIC *, SbxArray & rPar, bool) @@ -379,32 +364,28 @@ extern "C" void invalidParameterHandler( #endif -void SbRtl_CurDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) +void SbRtl_CurDir(StarBASIC *, SbxArray & rPar, bool) { - (void)pBasic; - (void)bWrite; - // #57064 Although this function doesn't work with DirEntry, it isn't touched // by the adjustment to virtual URLs, as, using the DirEntry-functionality, // there's no possibility to detect the current one in a way that a virtual URL // could be delivered. + if (rPar.Count() > 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + #if defined(_WIN32) int nCurDir = 0; // Current dir // JSM - if ( rPar.Count32() == 2 ) + if (rPar.Count() == 2) { - OUString aDrive = rPar.Get32(1)->GetOUString(); + OUString aDrive = rPar.Get(1)->GetOUString(); if ( aDrive.getLength() != 1 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; - } + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + auto c = rtl::toAsciiUpperCase(aDrive[0]); if ( !rtl::isAsciiUpperCase( c ) ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; - } + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + nCurDir = c - 'A' + 1; } wchar_t pBuffer[ _MAX_PATH ]; @@ -414,14 +395,10 @@ void SbRtl_CurDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) auto const handler = _set_thread_local_invalid_parameter_handler(&invalidParameterHandler); auto const ok = _wgetdcwd( nCurDir, pBuffer, _MAX_PATH ) != nullptr; _set_thread_local_invalid_parameter_handler(handler); - if ( ok ) - { - rPar.Get32(0)->PutString( OUString(o3tl::toU(pBuffer)) ); - } - else - { - StarBASIC::Error( ERRCODE_BASIC_NO_DEVICE ); - } + if ( !ok ) + return StarBASIC::Error( ERRCODE_BASIC_NO_DEVICE ); + + rPar.Get(0)->PutString(OUString(o3tl::toU(pBuffer))); #else @@ -430,53 +407,44 @@ void SbRtl_CurDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) int nSize = PATH_INCR; std::unique_ptr<char[]> pMem; while( true ) - { + { pMem.reset(new char[nSize]); if( !pMem ) - { - StarBASIC::Error( ERRCODE_BASIC_NO_MEMORY ); - return; - } + return StarBASIC::Error( ERRCODE_BASIC_NO_MEMORY ); + if( getcwd( pMem.get(), nSize-1 ) != nullptr ) - { - rPar.Get32(0)->PutString( OUString::createFromAscii(pMem.get()) ); + { + rPar.Get(0)->PutString(OUString::createFromAscii(pMem.get())); return; - } + } if( errno != ERANGE ) - { - StarBASIC::Error( ERRCODE_BASIC_INTERNAL_ERROR ); - return; - } + return StarBASIC::Error( ERRCODE_BASIC_INTERNAL_ERROR ); + nSize += PATH_INCR; - }; + }; #endif } void SbRtl_ChDir(StarBASIC * pBasic, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - if (rPar.Count32() == 2) - { - // VBA: track current directory per document type (separately for Writer, Calc, Impress, etc.) - if( SbiRuntime::isVBAEnabled() ) - { - ::basic::vba::registerCurrentDirectory( getDocumentModel( pBasic ), rPar.Get32(1)->GetOUString() ); - } - } - else + rPar.Get(0)->PutEmpty(); + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + // VBA: track current directory per document type (separately for Writer, Calc, Impress, etc.) + if( SbiRuntime::isVBAEnabled() ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + ::basic::vba::registerCurrentDirectory(getDocumentModel(pBasic), + rPar.Get(1)->GetOUString()); } } void SbRtl_ChDrive(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - if (rPar.Count32() != 2) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } + rPar.Get(0)->PutEmpty(); + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } @@ -524,130 +492,120 @@ void implStepRenameOSL( const OUString& aSource, const OUString& aDest ) void SbRtl_FileCopy(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - if (rPar.Count32() == 3) + rPar.Get(0)->PutEmpty(); + if (rPar.Count() != 3) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + OUString aSource = rPar.Get(1)->GetOUString(); + OUString aDest = rPar.Get(2)->GetOUString(); + if( hasUno() ) { - OUString aSource = rPar.Get32(1)->GetOUString(); - OUString aDest = rPar.Get32(2)->GetOUString(); - if( hasUno() ) + const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); + if( xSFI.is() ) { - const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); - if( xSFI.is() ) + try { - try - { - xSFI->copy( getFullPath( aSource ), getFullPath( aDest ) ); - } - catch(const Exception & ) - { - StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); - } + xSFI->copy( getFullPath( aSource ), getFullPath( aDest ) ); } - } - else - { - FileBase::RC nRet = File::copy( getFullPath( aSource ), getFullPath( aDest ) ); - if( nRet != FileBase::E_None ) + catch(const Exception & ) { StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); } } } else - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + { + FileBase::RC nRet = File::copy( getFullPath( aSource ), getFullPath( aDest ) ); + if( nRet != FileBase::E_None ) + { + StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); + } + } } void SbRtl_Kill(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - if (rPar.Count32() == 2) - { - OUString aFileSpec = rPar.Get32(1)->GetOUString(); + rPar.Get(0)->PutEmpty(); + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - if( hasUno() ) + OUString aFileSpec = rPar.Get(1)->GetOUString(); + + if( hasUno() ) + { + const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); + if( xSFI.is() ) { - const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); - if( xSFI.is() ) + OUString aFullPath = getFullPath( aFileSpec ); + if( !xSFI->exists( aFullPath ) || xSFI->isFolder( aFullPath ) ) { - OUString aFullPath = getFullPath( aFileSpec ); - if( !xSFI->exists( aFullPath ) || xSFI->isFolder( aFullPath ) ) - { - StarBASIC::Error( ERRCODE_BASIC_FILE_NOT_FOUND ); - return; - } - try - { - xSFI->kill( aFullPath ); - } - catch(const Exception & ) - { - StarBASIC::Error( ERRCODE_IO_GENERAL ); - } + StarBASIC::Error( ERRCODE_BASIC_FILE_NOT_FOUND ); + return; + } + try + { + xSFI->kill( aFullPath ); + } + catch(const Exception & ) + { + StarBASIC::Error( ERRCODE_IO_GENERAL ); } - } - else - { - File::remove( getFullPath( aFileSpec ) ); } } else { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + File::remove( getFullPath( aFileSpec ) ); } } void SbRtl_MkDir(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) { - rPar.Get32(0)->PutEmpty(); - if (rPar.Count32() == 2) + rPar.Get(0)->PutEmpty(); + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + OUString aPath = rPar.Get(1)->GetOUString(); + if ( SbiRuntime::isVBAEnabled() ) { - OUString aPath = rPar.Get32(1)->GetOUString(); - if ( SbiRuntime::isVBAEnabled() ) + // In vba if the full path is not specified then + // folder is created relative to the curdir + INetURLObject aURLObj( getFullPath( aPath ) ); + if ( aURLObj.GetProtocol() != INetProtocol::File ) { - // In vba if the full path is not specified then - // folder is created relative to the curdir - INetURLObject aURLObj( getFullPath( aPath ) ); - if ( aURLObj.GetProtocol() != INetProtocol::File ) - { - SbxArrayRef pPar = new SbxArray(); - SbxVariableRef pResult = new SbxVariable(); - SbxVariableRef pParam = new SbxVariable(); - pPar->Insert32( pResult.get(), pPar->Count32() ); - pPar->Insert32( pParam.get(), pPar->Count32() ); - SbRtl_CurDir( pBasic, *pPar, bWrite ); - - OUString sCurPathURL; - File::getFileURLFromSystemPath( pPar->Get32(0)->GetOUString(), sCurPathURL ); - - aURLObj.SetURL( sCurPathURL ); - aURLObj.Append( aPath ); - File::getSystemPathFromFileURL(aURLObj.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ),aPath ) ; - } + SbxArrayRef pPar = new SbxArray(); + SbxVariableRef pResult = new SbxVariable(); + SbxVariableRef pParam = new SbxVariable(); + pPar->Insert(pResult.get(), pPar->Count()); + pPar->Insert(pParam.get(), pPar->Count()); + SbRtl_CurDir( pBasic, *pPar, bWrite ); + + OUString sCurPathURL; + File::getFileURLFromSystemPath(pPar->Get(0)->GetOUString(), sCurPathURL); + + aURLObj.SetURL( sCurPathURL ); + aURLObj.Append( aPath ); + File::getSystemPathFromFileURL(aURLObj.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ),aPath ) ; } + } - if( hasUno() ) + if( hasUno() ) + { + const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); + if( xSFI.is() ) { - const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); - if( xSFI.is() ) + try { - try - { - xSFI->createFolder( getFullPath( aPath ) ); - } - catch(const Exception & ) - { - StarBASIC::Error( ERRCODE_IO_GENERAL ); - } + xSFI->createFolder( getFullPath( aPath ) ); + } + catch(const Exception & ) + { + StarBASIC::Error( ERRCODE_IO_GENERAL ); } - } - else - { - Directory::create( getFullPath( aPath ) ); } } else { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + Directory::create( getFullPath( aPath ) ); } } @@ -665,16 +623,14 @@ static void implRemoveDirRecursive( const OUString& aDirPath ) if( !bExists || !bFolder ) { - StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); - return; + return StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); } Directory aDir( aDirPath ); nRet = aDir.open(); if( nRet != FileBase::E_None ) { - StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); - return; + return StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); } aDir.close(); @@ -684,10 +640,10 @@ static void implRemoveDirRecursive( const OUString& aDirPath ) void SbRtl_RmDir(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - if (rPar.Count32() == 2) + rPar.Get(0)->PutEmpty(); + if (rPar.Count() == 2) { - OUString aPath = rPar.Get32(1)->GetOUString(); + OUString aPath = rPar.Get(1)->GetOUString(); if( hasUno() ) { const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); @@ -697,8 +653,7 @@ void SbRtl_RmDir(StarBASIC *, SbxArray & rPar, bool) { if( !xSFI->isFolder( aPath ) ) { - StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); - return; + return StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND ); } SbiInstance* pInst = GetSbData()->pInst; bool bCompatibility = ( pInst && pInst->IsCompatibility() ); @@ -707,8 +662,7 @@ void SbRtl_RmDir(StarBASIC *, SbxArray & rPar, bool) Sequence< OUString > aContent = xSFI->getFolderContents( aPath, true ); if( aContent.hasElements() ) { - StarBASIC::Error( ERRCODE_BASIC_ACCESS_ERROR ); - return; + return StarBASIC::Error( ERRCODE_BASIC_ACCESS_ERROR ); } } @@ -733,79 +687,72 @@ void SbRtl_RmDir(StarBASIC *, SbxArray & rPar, bool) void SbRtl_SendKeys(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); + rPar.Get(0)->PutEmpty(); StarBASIC::Error(ERRCODE_BASIC_NOT_IMPLEMENTED); } void SbRtl_Exp(StarBASIC *, SbxArray & rPar, bool) { - if( rPar.Count32() < 2 ) - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - else - { - double aDouble = rPar.Get32(1)->GetDouble(); - aDouble = exp( aDouble ); - checkArithmeticOverflow( aDouble ); - rPar.Get32(0)->PutDouble( aDouble ); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + double aDouble = rPar.Get(1)->GetDouble(); + aDouble = exp( aDouble ); + checkArithmeticOverflow( aDouble ); + rPar.Get(0)->PutDouble(aDouble); } void SbRtl_FileLen(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - else + + SbxVariableRef pArg = rPar.Get(1); + OUString aStr( pArg->GetOUString() ); + sal_Int32 nLen = 0; + if( hasUno() ) { - SbxVariableRef pArg = rPar.Get32(1); - OUString aStr( pArg->GetOUString() ); - sal_Int32 nLen = 0; - if( hasUno() ) + const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); + if( xSFI.is() ) { - const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI = getFileAccess(); - if( xSFI.is() ) + try { - try - { - nLen = xSFI->getSize( getFullPath( aStr ) ); - } - catch(const Exception & ) - { - StarBASIC::Error( ERRCODE_IO_GENERAL ); - } + nLen = xSFI->getSize( getFullPath( aStr ) ); + } + catch(const Exception & ) + { + StarBASIC::Error( ERRCODE_IO_GENERAL ); } } - else - { - DirectoryItem aItem; - (void)DirectoryItem::get( getFullPath( aStr ), aItem ); - FileStatus aFileStatus( osl_FileStatus_Mask_FileSize ); - (void)aItem.getFileStatus( aFileStatus ); - nLen = static_cast<sal_Int32>(aFileStatus.getFileSize()); - } - rPar.Get32(0)->PutLong( static_cast<tools::Long>(nLen) ); } + else + { + DirectoryItem aItem; + (void)DirectoryItem::get( getFullPath( aStr ), aItem ); + FileStatus aFileStatus( osl_FileStatus_Mask_FileSize ); + (void)aItem.getFileStatus( aFileStatus ); + nLen = static_cast<sal_Int32>(aFileStatus.getFileSize()); + } + rPar.Get(0)->PutLong(nLen); } + void SbRtl_Hex(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else + if (rPar.Count() < 2) { - SbxVariableRef pArg = rPar.Get32(1); - // converting value to unsigned and limit to 2 or 4 byte representation - sal_uInt32 nVal = pArg->IsInteger() ? - static_cast<sal_uInt16>(pArg->GetInteger()) : - static_cast<sal_uInt32>(pArg->GetLong()); - OUString aStr(OUString::number( nVal, 16 )); - aStr = aStr.toAsciiUpperCase(); - rPar.Get32(0)->PutString( aStr ); + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } + + SbxVariableRef pArg = rPar.Get(1); + // converting value to unsigned and limit to 2 or 4 byte representation + sal_uInt32 nVal = pArg->IsInteger() ? + static_cast<sal_uInt16>(pArg->GetInteger()) : + static_cast<sal_uInt32>(pArg->GetLong()); + rPar.Get(0)->PutString(OUString::number(nVal, 16).toAsciiUpperCase()); } void SbRtl_FuncCaller(StarBASIC *, SbxArray & rPar, bool) @@ -813,11 +760,11 @@ void SbRtl_FuncCaller(StarBASIC *, SbxArray & rPar, bool) if ( SbiRuntime::isVBAEnabled() && GetSbData()->pInst && GetSbData()->pInst->pRun ) { if ( GetSbData()->pInst->pRun->GetExternalCaller() ) - *rPar.Get32(0) = *GetSbData()->pInst->pRun->GetExternalCaller(); + *rPar.Get(0) = *GetSbData()->pInst->pRun->GetExternalCaller(); else { SbxVariableRef pVar = new SbxVariable(SbxVARIANT); - *rPar.Get32(0) = *pVar; + *rPar.Get(0) = *pVar; } } else @@ -830,7 +777,7 @@ void SbRtl_FuncCaller(StarBASIC *, SbxArray & rPar, bool) void SbRtl_InStr(StarBASIC *, SbxArray & rPar, bool) { - const sal_uInt32 nArgCount = rPar.Count32()-1; + const sal_uInt32 nArgCount = rPar.Count() - 1; if ( nArgCount < 2 ) StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); else @@ -840,7 +787,7 @@ void SbRtl_InStr(StarBASIC *, SbxArray & rPar, bool) if ( nArgCount >= 3 ) { - nStartPos = rPar.Get32(1)->GetLong(); + nStartPos = rPar.Get(1)->GetLong(); if( nStartPos <= 0 ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); @@ -863,10 +810,10 @@ void SbRtl_InStr(StarBASIC *, SbxArray & rPar, bool) } if ( nArgCount == 4 ) { - bTextMode = rPar.Get32(4)->GetInteger(); + bTextMode = rPar.Get(4)->GetInteger(); } sal_Int32 nPos; - const OUString& rToken = rPar.Get32(nFirstStringPos+1)->GetOUString(); + const OUString& rToken = rPar.Get(nFirstStringPos + 1)->GetOUString(); // #97545 Always find empty string if( rToken.isEmpty() ) @@ -875,23 +822,35 @@ void SbRtl_InStr(StarBASIC *, SbxArray & rPar, bool) } else { - if( !bTextMode ) + const OUString& rStr1 = rPar.Get(nFirstStringPos)->GetOUString(); + const sal_Int32 nrStr1Len = rStr1.getLength(); + if (nStartPos > nrStr1Len) { - const OUString& rStr1 = rPar.Get32(nFirstStringPos)->GetOUString(); - nPos = rStr1.indexOf( rToken, nStartPos - 1 ) + 1; + // Start position is greater than the string being searched + nPos = 0; } else { - OUString aStr1 = rPar.Get32(nFirstStringPos)->GetOUString(); - OUString aToken = rToken; - - aStr1 = aStr1.toAsciiUpperCase(); - aToken = aToken.toAsciiUpperCase(); - - nPos = aStr1.indexOf( aToken, nStartPos-1 ) + 1; + if( !bTextMode ) + { + nPos = rStr1.indexOf( rToken, nStartPos - 1 ) + 1; + } + else + { + // tdf#139840 - case-insensitive operation for non-ASCII characters + i18nutil::SearchOptions2 aSearchOptions; + aSearchOptions.searchString = rToken; + aSearchOptions.AlgorithmType2 = util::SearchAlgorithms2::ABSOLUTE; + aSearchOptions.transliterateFlags |= TransliterationFlags::IGNORE_CASE; + utl::TextSearch textSearch(aSearchOptions); + + sal_Int32 nStart = nStartPos - 1; + sal_Int32 nEnd = nrStr1Len; + nPos = textSearch.SearchForward(rStr1, &nStart, &nEnd) ? nStart + 1 : 0; + } } } - rPar.Get32(0)->PutLong( nPos ); + rPar.Get(0)->PutLong(nPos); } } @@ -900,75 +859,79 @@ void SbRtl_InStr(StarBASIC *, SbxArray & rPar, bool) void SbRtl_InStrRev(StarBASIC *, SbxArray & rPar, bool) { - const sal_uInt32 nArgCount = rPar.Count32()-1; + const sal_uInt32 nArgCount = rPar.Count() - 1; if ( nArgCount < 2 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - else - { - OUString aStr1 = rPar.Get32(1)->GetOUString(); - OUString aToken = rPar.Get32(2)->GetOUString(); - sal_Int32 nStartPos = -1; - if ( nArgCount >= 3 ) - { - nStartPos = rPar.Get32(3)->GetLong(); - if( nStartPos <= 0 && nStartPos != -1 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - nStartPos = -1; - } - } + const OUString aStr1 = rPar.Get(1)->GetOUString(); + const OUString aToken = rPar.Get(2)->GetOUString(); - SbiInstance* pInst = GetSbData()->pInst; - bool bTextMode; - bool bCompatibility = ( pInst && pInst->IsCompatibility() ); - if( bCompatibility ) - { - SbiRuntime* pRT = pInst->pRun; - bTextMode = pRT && pRT->IsImageFlag( SbiImageFlags::COMPARETEXT ); - } - else - { - bTextMode = true; - } - if ( nArgCount == 4 ) + sal_Int32 nStartPos = -1; + if ( nArgCount >= 3 ) + { + nStartPos = rPar.Get(3)->GetLong(); + if( nStartPos <= 0 && nStartPos != -1 ) { - bTextMode = rPar.Get32(4)->GetInteger(); + StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + nStartPos = -1; } - sal_Int32 nStrLen = aStr1.getLength(); - if( nStartPos == -1 ) + } + + SbiInstance* pInst = GetSbData()->pInst; + bool bTextMode; + bool bCompatibility = ( pInst && pInst->IsCompatibility() ); + if( bCompatibility ) + { + SbiRuntime* pRT = pInst->pRun; + bTextMode = pRT && pRT->IsImageFlag( SbiImageFlags::COMPARETEXT ); + } + else + { + bTextMode = true; + } + if ( nArgCount == 4 ) + { + bTextMode = rPar.Get(4)->GetInteger(); + } + const sal_Int32 nStrLen = aStr1.getLength(); + if( nStartPos == -1 ) + { + nStartPos = nStrLen; + } + + sal_Int32 nPos = 0; + if( nStartPos <= nStrLen ) + { + sal_Int32 nTokenLen = aToken.getLength(); + if( !nTokenLen ) { - nStartPos = nStrLen; + // Always find empty string + nPos = nStartPos; } - - sal_Int32 nPos = 0; - if( nStartPos <= nStrLen ) + else if( nStrLen > 0 ) { - sal_Int32 nTokenLen = aToken.getLength(); - if( !nTokenLen ) + if( !bTextMode ) { - // Always find empty string - nPos = nStartPos; + nPos = aStr1.lastIndexOf( aToken, nStartPos ) + 1; } - else if( nStrLen > 0 ) + else { - if( !bTextMode ) - { - nPos = aStr1.lastIndexOf( aToken, nStartPos ) + 1; - } - else - { - aStr1 = aStr1.toAsciiUpperCase(); - aToken = aToken.toAsciiUpperCase(); - - nPos = aStr1.lastIndexOf( aToken, nStartPos ) + 1; - } + // tdf#143332 - case-insensitive operation for non-ASCII characters + i18nutil::SearchOptions2 aSearchOptions; + aSearchOptions.searchString = aToken; + aSearchOptions.AlgorithmType2 = util::SearchAlgorithms2::ABSOLUTE; + aSearchOptions.transliterateFlags |= TransliterationFlags::IGNORE_CASE; + utl::TextSearch textSearch(aSearchOptions); + + sal_Int32 nStart = 0; + sal_Int32 nEnd = nStartPos; + nPos = textSearch.SearchBackward(aStr1, &nEnd, &nStart) ? nStart : 0; } } - rPar.Get32(0)->PutLong( nPos ); } + rPar.Get(0)->PutLong(nPos); } @@ -981,111 +944,87 @@ void SbRtl_InStrRev(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Int(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - else - { - SbxVariableRef pArg = rPar.Get32(1); - double aDouble= pArg->GetDouble(); - /* - floor( 2.8 ) = 2.0 - floor( -2.8 ) = -3.0 - */ - aDouble = floor( aDouble ); - rPar.Get32(0)->PutDouble( aDouble ); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + double aDouble= pArg->GetDouble(); + /* + floor( 2.8 ) = 2.0 + floor( -2.8 ) = -3.0 + */ + aDouble = floor( aDouble ); + rPar.Get(0)->PutDouble(aDouble); } void SbRtl_Fix(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + double aDouble = pArg->GetDouble(); + if ( aDouble >= 0.0 ) + aDouble = floor( aDouble ); else - { - SbxVariableRef pArg = rPar.Get32(1); - double aDouble = pArg->GetDouble(); - if ( aDouble >= 0.0 ) - aDouble = floor( aDouble ); - else - aDouble = ceil( aDouble ); - rPar.Get32(0)->PutDouble( aDouble ); - } + aDouble = ceil( aDouble ); + rPar.Get(0)->PutDouble(aDouble); } void SbRtl_LCase(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - const CharClass& rCharClass = GetCharClass(); - OUString aStr( rPar.Get32(1)->GetOUString() ); - aStr = rCharClass.lowercase(aStr); - rPar.Get32(0)->PutString( aStr ); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + const CharClass& rCharClass = GetCharClass(); + OUString aStr(rPar.Get(1)->GetOUString()); + aStr = rCharClass.lowercase(aStr); + rPar.Get(0)->PutString(aStr); } void SbRtl_Left(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 3 ) + if (rPar.Count() < 3) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + OUString aStr(rPar.Get(1)->GetOUString()); + sal_Int32 nResultLen = rPar.Get(2)->GetLong(); + if( nResultLen < 0 ) { + nResultLen = 0; StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - else + else if(nResultLen > aStr.getLength()) { - OUString aStr( rPar.Get32(1)->GetOUString() ); - sal_Int32 nResultLen = rPar.Get32(2)->GetLong(); - if( nResultLen < 0 ) - { - nResultLen = 0; - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else if(nResultLen > aStr.getLength()) - { - nResultLen = aStr.getLength(); - } - aStr = aStr.copy(0, nResultLen ); - rPar.Get32(0)->PutString( aStr ); + nResultLen = aStr.getLength(); } + aStr = aStr.copy(0, nResultLen ); + rPar.Get(0)->PutString(aStr); } void SbRtl_Log(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - double aArg = rPar.Get32(1)->GetDouble(); - if ( aArg > 0 ) - { - double d = log( aArg ); - checkArithmeticOverflow( d ); - rPar.Get32(0)->PutDouble( d ); - } - else - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + double aArg = rPar.Get(1)->GetDouble(); + if ( aArg <= 0 ) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + double d = log( aArg ); + checkArithmeticOverflow( d ); + rPar.Get(0)->PutDouble(d); } void SbRtl_LTrim(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - OUString aStr(comphelper::string::stripStart(rPar.Get32(1)->GetOUString(), ' ')); - rPar.Get32(0)->PutString(aStr); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + OUString aStr(comphelper::string::stripStart(rPar.Get(1)->GetOUString(), ' ')); + rPar.Get(0)->PutString(aStr); } @@ -1093,7 +1032,7 @@ void SbRtl_LTrim(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Mid(StarBASIC *, SbxArray & rPar, bool bWrite) { - int nArgCount = rPar.Count32()-1; + int nArgCount = rPar.Count() - 1; if ( nArgCount < 2 ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); @@ -1108,8 +1047,8 @@ void SbRtl_Mid(StarBASIC *, SbxArray & rPar, bool bWrite) { bWrite = true; } - OUString aArgStr = rPar.Get32(1)->GetOUString(); - sal_Int32 nStartPos = rPar.Get32(2)->GetLong(); + OUString aArgStr = rPar.Get(1)->GetOUString(); + sal_Int32 nStartPos = rPar.Get(2)->GetLong(); if ( nStartPos < 1 ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); @@ -1121,7 +1060,7 @@ void SbRtl_Mid(StarBASIC *, SbxArray & rPar, bool bWrite) bool bWriteNoLenParam = false; if ( nArgCount == 3 || bWrite ) { - sal_Int32 n = rPar.Get32(3)->GetLong(); + sal_Int32 n = rPar.Get(3)->GetLong(); if( bWrite && n == -1 ) { bWriteNoLenParam = true; @@ -1137,13 +1076,12 @@ void SbRtl_Mid(StarBASIC *, SbxArray & rPar, bool bWrite) bool bCompatibility = ( pInst && pInst->IsCompatibility() ); if( bCompatibility ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } nStartPos = nArgLen; } - OUString aReplaceStr = rPar.Get32(4)->GetOUString(); + OUString aReplaceStr = rPar.Get(4)->GetOUString(); sal_Int32 nReplaceStrLen = aReplaceStr.getLength(); sal_Int32 nReplaceLen; if( bWriteNoLenParam ) @@ -1159,13 +1097,13 @@ void SbRtl_Mid(StarBASIC *, SbxArray & rPar, bool bWrite) } } - OUStringBuffer aResultStr = aArgStr; + OUStringBuffer aResultStr(aArgStr); sal_Int32 nErase = nReplaceLen; aResultStr.remove( nStartPos, nErase ); aResultStr.insert( nStartPos, aReplaceStr.getStr(), std::min(nReplaceLen, nReplaceStrLen)); - rPar.Get32(1)->PutString( aResultStr.makeStringAndClear() ); + rPar.Get(1)->PutString(aResultStr.makeStringAndClear()); } else { @@ -1189,7 +1127,7 @@ void SbRtl_Mid(StarBASIC *, SbxArray & rPar, bool bWrite) if (nLen > 0) aResultStr = aArgStr.copy( nStartPos, nLen ); } - rPar.Get32(0)->PutString( aResultStr ); + rPar.Get(0)->PutString(aResultStr); } } } @@ -1197,69 +1135,56 @@ void SbRtl_Mid(StarBASIC *, SbxArray & rPar, bool bWrite) void SbRtl_Oct(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - char aBuffer[16]; - SbxVariableRef pArg = rPar.Get32(1); - if ( pArg->IsInteger() ) - { - snprintf( aBuffer, sizeof(aBuffer), "%o", pArg->GetInteger() ); - } - else - { - snprintf( aBuffer, sizeof(aBuffer), "%lo", static_cast<long unsigned int>(pArg->GetLong()) ); - } - rPar.Get32(0)->PutString( OUString::createFromAscii( aBuffer ) ); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariableRef pArg = rPar.Get(1); + // converting value to unsigned and limit to 2 or 4 byte representation + sal_uInt32 nVal = pArg->IsInteger() ? + static_cast<sal_uInt16>(pArg->GetInteger()) : + static_cast<sal_uInt32>(pArg->GetLong()); + rPar.Get(0)->PutString(OUString::number(nVal, 8)); } // Replace(expression, find, replace[, start[, count[, compare]]]) void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool) { - const sal_uInt32 nArgCount = rPar.Count32()-1; + const sal_uInt32 nArgCount = rPar.Count() - 1; if ( nArgCount < 3 || nArgCount > 6 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; - } + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); sal_Int32 lStartPos = 1; if (nArgCount >= 4) { - if (rPar.Get32(4)->GetType() != SbxEMPTY) + if (rPar.Get(4)->GetType() != SbxEMPTY) { - lStartPos = rPar.Get32(4)->GetLong(); + lStartPos = rPar.Get(4)->GetLong(); } if (lStartPos < 1) { - StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); - return; + return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); } } + --lStartPos; // Make it 0-based sal_Int32 lCount = -1; if (nArgCount >= 5) { - if (rPar.Get32(5)->GetType() != SbxEMPTY) + if (rPar.Get(5)->GetType() != SbxEMPTY) { - lCount = rPar.Get32(5)->GetLong(); + lCount = rPar.Get(5)->GetLong(); } if (lCount < -1) { - StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); - return; + return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); } } bool bCaseInsensitive; if (nArgCount == 6) { - bCaseInsensitive = rPar.Get32(6)->GetInteger(); + bCaseInsensitive = rPar.Get(6)->GetInteger(); } else { @@ -1275,150 +1200,136 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool) } } - const OUString aExpStr = rPar.Get32(1)->GetOUString(); - OUString aFindStr = rPar.Get32(2)->GetOUString(); - const OUString aReplaceStr = rPar.Get32(3)->GetOUString(); - const sal_Int32 nExpStrLen = aExpStr.getLength(); - const sal_Int32 nFindStrLen = aFindStr.getLength(); + const OUString aExpStr = rPar.Get(1)->GetOUString(); + OUString aFindStr = rPar.Get(2)->GetOUString(); + const OUString aReplaceStr = rPar.Get(3)->GetOUString(); OUString aSrcStr(aExpStr); + sal_Int32 nPrevPos = std::min(lStartPos, aSrcStr.getLength()); + css::uno::Sequence<sal_Int32> aOffset; if (bCaseInsensitive) { - // tdf#132389 - case-insensitive operation for non-ASCII characters - const css::lang::Locale& rLocale = Application::GetSettings().GetUILanguageTag().getLocale(); - css::uno::Reference < i18n::XCharacterClassification > xCharClass = vcl::unohelper::CreateCharacterClassification(); - aSrcStr = xCharClass->toUpper(aSrcStr, 0, aSrcStr.getLength(), rLocale); - aFindStr = xCharClass->toUpper(aFindStr, 0, aSrcStr.getLength(), rLocale); - } + // tdf#132389: case-insensitive operation for non-ASCII characters + // tdf#142487: use css::i18n::Transliteration to correctly handle ß -> ss expansion + // tdf#132388: We can't use utl::TextSearch (css::i18n::XTextSearch), because each call to + // css::i18n::XTextSearch::SearchForward transliterates input string, making + // performance of repeated calls unacceptable + auto xTrans = css::i18n::Transliteration::create(comphelper::getProcessComponentContext()); + xTrans->loadModule(css::i18n::TransliterationModules_IGNORE_CASE, {}); + aFindStr = xTrans->transliterate(aFindStr, 0, aFindStr.getLength(), aOffset); + aSrcStr = xTrans->transliterate(aSrcStr, nPrevPos, aSrcStr.getLength() - nPrevPos, aOffset); + nPrevPos = std::distance(aOffset.begin(), + std::lower_bound(aOffset.begin(), aOffset.end(), nPrevPos)); + } + + auto getExpStrPos = [aOffset, nExpLen = aExpStr.getLength()](sal_Int32 nSrcStrPos) -> sal_Int32 + { + assert(!aOffset.hasElements() || aOffset.getLength() >= nSrcStrPos); + if (!aOffset.hasElements()) + return nSrcStrPos; + return aOffset.getLength() > nSrcStrPos ? aOffset[nSrcStrPos] : nExpLen; + }; // Note: the result starts from lStartPos, removing everything to the left. See i#94895. - sal_Int32 nPrevPos = std::min(lStartPos - 1, nExpStrLen); - OUStringBuffer sResult(nExpStrLen - nPrevPos); + OUStringBuffer sResult(aSrcStr.getLength() - nPrevPos); sal_Int32 nCounts = 0; while (lCount == -1 || lCount > nCounts) { sal_Int32 nPos = aSrcStr.indexOf(aFindStr, nPrevPos); - if (nPos >= 0) - { - sResult.append(aExpStr.getStr() + nPrevPos, nPos - nPrevPos); - sResult.append(aReplaceStr); - nPrevPos = nPos + nFindStrLen; - nCounts++; - } - else - { + if (nPos < 0) break; - } + + lStartPos = getExpStrPos(nPrevPos); + sResult.append(aExpStr.getStr() + lStartPos, getExpStrPos(nPos) - lStartPos); + sResult.append(aReplaceStr); + nPrevPos = nPos + aFindStr.getLength(); + nCounts++; } - sResult.append(aExpStr.getStr() + nPrevPos, nExpStrLen - nPrevPos); - rPar.Get32(0)->PutString(sResult.makeStringAndClear()); + lStartPos = getExpStrPos(nPrevPos); + sResult.append(aExpStr.getStr() + lStartPos, aExpStr.getLength() - lStartPos); + rPar.Get(0)->PutString(sResult.makeStringAndClear()); } void SbRtl_Right(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 3 ) + if (rPar.Count() < 3) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + const OUString& rStr = rPar.Get(1)->GetOUString(); + int nResultLen = rPar.Get(2)->GetLong(); + if( nResultLen < 0 ) { + nResultLen = 0; StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - else + int nStrLen = rStr.getLength(); + if ( nResultLen > nStrLen ) { - const OUString& rStr = rPar.Get32(1)->GetOUString(); - int nResultLen = rPar.Get32(2)->GetLong(); - if( nResultLen < 0 ) - { - nResultLen = 0; - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - int nStrLen = rStr.getLength(); - if ( nResultLen > nStrLen ) - { - nResultLen = nStrLen; - } - OUString aResultStr = rStr.copy( nStrLen - nResultLen ); - rPar.Get32(0)->PutString( aResultStr ); + nResultLen = nStrLen; } + OUString aResultStr = rStr.copy( nStrLen - nResultLen ); + rPar.Get(0)->PutString(aResultStr); } void SbRtl_RTL(StarBASIC * pBasic, SbxArray & rPar, bool) { - rPar.Get32(0)->PutObject( pBasic->getRTL().get() ); + rPar.Get(0)->PutObject(pBasic->getRTL().get()); } void SbRtl_RTrim(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - OUString aStr(comphelper::string::stripEnd(rPar.Get32(1)->GetOUString(), ' ')); - rPar.Get32(0)->PutString(aStr); - } + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + OUString aStr(comphelper::string::stripEnd(rPar.Get(1)->GetOUString(), ' ')); + rPar.Get(0)->PutString(aStr); } void SbRtl_Sgn(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - double aDouble = rPar.Get32(1)->GetDouble(); - sal_Int16 nResult = 0; - if ( aDouble > 0 ) - { - nResult = 1; - } - else if ( aDouble < 0 ) - { - nResult = -1; - } - rPar.Get32(0)->PutInteger( nResult ); - } -} + if (rPar.Count() < 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); -void SbRtl_Space(StarBASIC *, SbxArray & rPar, bool) -{ - if ( rPar.Count32() < 2 ) + double aDouble = rPar.Get(1)->GetDouble(); + sal_Int16 nResult = 0; + if ( aDouble > 0 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + nResult = 1; } - else + else if ( aDouble < 0 ) { - OUStringBuffer aBuf; - string::padToLength(aBuf, rPar.Get32(1)->GetLong(), ' '); - rPar.Get32(0)->PutString(aBuf.makeStringAndClear()); + nResult = -1; } + rPar.Get(0)->PutInteger(nResult); } -void SbRtl_Spc(StarBASIC *, SbxArray & rPar, bool) +void SbRtl_Space(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - OUStringBuffer aBuf; - string::padToLength(aBuf, rPar.Get32(1)->GetLong(), ' '); - rPar.Get32(0)->PutString(aBuf.makeStringAndClear()); + const sal_Int32 nCount = rPar.Get(1)->GetLong(); + OUStringBuffer aBuf(nCount); + string::padToLength(aBuf, nCount, ' '); + rPar.Get(0)->PutString(aBuf.makeStringAndClear()); } } void SbRtl_Sqr(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - double aDouble = rPar.Get32(1)->GetDouble(); + double aDouble = rPar.Get(1)->GetDouble(); if ( aDouble >= 0 ) { - rPar.Get32(0)->PutDouble( sqrt( aDouble )); + rPar.Get(0)->PutDouble(sqrt(aDouble)); } else { @@ -1429,7 +1340,7 @@ void SbRtl_Sqr(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Str(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } @@ -1437,7 +1348,7 @@ void SbRtl_Str(StarBASIC *, SbxArray & rPar, bool) { OUString aStr; OUString aStrNew(""); - SbxVariableRef pArg = rPar.Get32(1); + SbxVariableRef pArg = rPar.Get(1); pArg->Format( aStr ); // Numbers start with a space @@ -1484,20 +1395,20 @@ void SbRtl_Str(StarBASIC *, SbxArray & rPar, bool) { aStrNew = aStr; } - rPar.Get32(0)->PutString( aStrNew ); + rPar.Get(0)->PutString(aStrNew); } } void SbRtl_StrComp(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 3 ) + if (rPar.Count() < 3) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - rPar.Get32(0)->PutEmpty(); + rPar.Get(0)->PutEmpty(); return; } - const OUString& rStr1 = rPar.Get32(1)->GetOUString(); - const OUString& rStr2 = rPar.Get32(2)->GetOUString(); + const OUString& rStr1 = rPar.Get(1)->GetOUString(); + const OUString& rStr2 = rPar.Get(2)->GetOUString(); SbiInstance* pInst = GetSbData()->pInst; bool bTextCompare; @@ -1511,8 +1422,8 @@ void SbRtl_StrComp(StarBASIC *, SbxArray & rPar, bool) { bTextCompare = true; } - if ( rPar.Count32() == 4 ) - bTextCompare = rPar.Get32(3)->GetInteger(); + if (rPar.Count() == 4) + bTextCompare = rPar.Get(3)->GetInteger(); if( !bCompatibility ) { @@ -1550,85 +1461,83 @@ void SbRtl_StrComp(StarBASIC *, SbxArray & rPar, bool) nRetValue = 1; } } - rPar.Get32(0)->PutInteger( sal::static_int_cast< sal_Int16 >( nRetValue ) ); + rPar.Get(0)->PutInteger(sal::static_int_cast<sal_Int16>(nRetValue)); } void SbRtl_String(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { sal_Unicode aFiller; - sal_Int32 lCount = rPar.Get32(1)->GetLong(); + sal_Int32 lCount = rPar.Get(1)->GetLong(); if( lCount < 0 || lCount > 0xffff ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - if( rPar.Get32(2)->GetType() == SbxINTEGER ) + if (rPar.Get(2)->GetType() == SbxINTEGER) { - aFiller = static_cast<sal_Unicode>(rPar.Get32(2)->GetInteger()); + aFiller = static_cast<sal_Unicode>(rPar.Get(2)->GetInteger()); } else { - const OUString& rStr = rPar.Get32(2)->GetOUString(); + const OUString& rStr = rPar.Get(2)->GetOUString(); aFiller = rStr[0]; } OUStringBuffer aBuf(lCount); string::padToLength(aBuf, lCount, aFiller); - rPar.Get32(0)->PutString(aBuf.makeStringAndClear()); + rPar.Get(0)->PutString(aBuf.makeStringAndClear()); } } void SbRtl_Tab(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); else { - OUStringBuffer aStr; - comphelper::string::padToLength(aStr, rPar.Get32(1)->GetLong(), '\t'); - rPar.Get32(0)->PutString(aStr.makeStringAndClear()); + const sal_Int32 nCount = std::max(rPar.Get(1)->GetLong(), sal_Int32(0)); + OUStringBuffer aStr(nCount); + comphelper::string::padToLength(aStr, nCount, '\t'); + rPar.Get(0)->PutString(aStr.makeStringAndClear()); } } void SbRtl_Tan(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - SbxVariableRef pArg = rPar.Get32(1); - rPar.Get32(0)->PutDouble( tan( pArg->GetDouble() ) ); + SbxVariableRef pArg = rPar.Get(1); + rPar.Get(0)->PutDouble(tan(pArg->GetDouble())); } } void SbRtl_UCase(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { const CharClass& rCharClass = GetCharClass(); - OUString aStr( rPar.Get32(1)->GetOUString() ); + OUString aStr(rPar.Get(1)->GetOUString()); aStr = rCharClass.uppercase( aStr ); - rPar.Get32(0)->PutString( aStr ); + rPar.Get(0)->PutString(aStr); } } -void SbRtl_Val(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) +void SbRtl_Val(StarBASIC *, SbxArray & rPar, bool) { - (void)pBasic; - (void)bWrite; - - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } @@ -1637,7 +1546,7 @@ void SbRtl_Val(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) double nResult = 0.0; char* pEndPtr; - OUString aStr( rPar.Get32(1)->GetOUString() ); + OUString aStr(rPar.Get(1)->GetOUString()); FilterWhiteSpace( aStr ); if ( aStr.getLength() > 1 && aStr[0] == '&' ) @@ -1677,7 +1586,7 @@ void SbRtl_Val(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) #endif } - rPar.Get32(0)->PutDouble( nResult ); + rPar.Get(0)->PutDouble(nResult); } } @@ -1685,9 +1594,8 @@ void SbRtl_Val(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) // Helper functions for date conversion sal_Int16 implGetDateDay( double aDate ) { - aDate -= 2.0; // standardize: 1.1.1900 => 0.0 aDate = floor( aDate ); - Date aRefDate( 1, 1, 1900 ); + Date aRefDate(1899'12'30); aRefDate.AddDays( aDate ); sal_Int16 nRet = static_cast<sal_Int16>( aRefDate.GetDay() ); @@ -1696,9 +1604,8 @@ sal_Int16 implGetDateDay( double aDate ) sal_Int16 implGetDateMonth( double aDate ) { - Date aRefDate( 1,1,1900 ); + Date aRefDate(1899'12'30); sal_Int32 nDays = static_cast<sal_Int32>(aDate); - nDays -= 2; // standardize: 1.1.1900 => 0.0 aRefDate.AddDays( nDays ); sal_Int16 nRet = static_cast<sal_Int16>( aRefDate.GetMonth() ); return nRet; @@ -1728,28 +1635,26 @@ void SbxDateFromUNODate( SbxValue *pVal, const css::util::Date& aUnoDate) // Function to convert date to UNO date (com.sun.star.util.Date) void SbRtl_CDateToUnoDate(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - unoToSbxValue(rPar.Get32(0), Any(SbxDateToUNODate(rPar.Get32(1)))); + unoToSbxValue(rPar.Get(0), Any(SbxDateToUNODate(rPar.Get(1)))); } // Function to convert date from UNO date (com.sun.star.util.Date) void SbRtl_CDateFromUnoDate(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 || rPar.Get32(1)->GetType() != SbxOBJECT ) + if (rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - Any aAny (sbxToUnoValue(rPar.Get32(1), cppu::UnoType<css::util::Date>::get())); + Any aAny(sbxToUnoValue(rPar.Get(1), cppu::UnoType<css::util::Date>::get())); css::util::Date aUnoDate; if(aAny >>= aUnoDate) - SbxDateFromUNODate(rPar.Get32(0), aUnoDate); + SbxDateFromUNODate(rPar.Get(0), aUnoDate); else SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); } @@ -1775,28 +1680,26 @@ void SbxDateFromUNOTime( SbxValue *pVal, const css::util::Time& aUnoTime) // Function to convert date to UNO time (com.sun.star.util.Time) void SbRtl_CDateToUnoTime(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - unoToSbxValue(rPar.Get32(0), Any(SbxDateToUNOTime(rPar.Get32(1)))); + unoToSbxValue(rPar.Get(0), Any(SbxDateToUNOTime(rPar.Get(1)))); } // Function to convert date from UNO time (com.sun.star.util.Time) void SbRtl_CDateFromUnoTime(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 || rPar.Get32(1)->GetType() != SbxOBJECT ) + if (rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - Any aAny (sbxToUnoValue(rPar.Get32(1), cppu::UnoType<css::util::Time>::get())); + Any aAny(sbxToUnoValue(rPar.Get(1), cppu::UnoType<css::util::Time>::get())); css::util::Time aUnoTime; if(aAny >>= aUnoTime) - SbxDateFromUNOTime(rPar.Get32(0), aUnoTime); + SbxDateFromUNOTime(rPar.Get(0), aUnoTime); else SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); } @@ -1831,28 +1734,26 @@ void SbxDateFromUNODateTime( SbxValue *pVal, const css::util::DateTime& aUnoDT) // Function to convert date to UNO date (com.sun.star.util.Date) void SbRtl_CDateToUnoDateTime(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - unoToSbxValue(rPar.Get32(0), Any(SbxDateToUNODateTime(rPar.Get32(1)))); + unoToSbxValue(rPar.Get(0), Any(SbxDateToUNODateTime(rPar.Get(1)))); } // Function to convert date from UNO date (com.sun.star.util.Date) void SbRtl_CDateFromUnoDateTime(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 || rPar.Get32(1)->GetType() != SbxOBJECT ) + if (rPar.Count() != 2 || rPar.Get(1)->GetType() != SbxOBJECT) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - Any aAny (sbxToUnoValue(rPar.Get32(1), cppu::UnoType<css::util::DateTime>::get())); + Any aAny(sbxToUnoValue(rPar.Get(1), cppu::UnoType<css::util::DateTime>::get())); css::util::DateTime aUnoDT; if(aAny >>= aUnoDT) - SbxDateFromUNODateTime(rPar.Get32(0), aUnoDT); + SbxDateFromUNODateTime(rPar.Get(0), aUnoDT); else SbxBase::SetError( ERRCODE_BASIC_CONVERSION ); } @@ -1860,9 +1761,9 @@ void SbRtl_CDateFromUnoDateTime(StarBASIC *, SbxArray & rPar, bool) // Function to convert date to ISO 8601 date format YYYYMMDD void SbRtl_CDateToIso(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() == 2 ) + if (rPar.Count() == 2) { - double aDate = rPar.Get32(1)->GetDate(); + double aDate = rPar.Get(1)->GetDate(); // Date may actually even be -YYYYYMMDD char Buffer[11]; @@ -1872,7 +1773,7 @@ void SbRtl_CDateToIso(StarBASIC *, SbxArray & rPar, bool) static_cast<int>(implGetDateMonth( aDate )), static_cast<int>(implGetDateDay( aDate )) ); OUString aRetStr = OUString::createFromAscii( Buffer ); - rPar.Get32(0)->PutString( aRetStr ); + rPar.Get(0)->PutString(aRetStr); } else { @@ -1884,11 +1785,11 @@ void SbRtl_CDateToIso(StarBASIC *, SbxArray & rPar, bool) // And even YYMMDD for compatibility, sigh... void SbRtl_CDateFromIso(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() == 2 ) + if (rPar.Count() == 2) { do { - OUString aStr = rPar.Get32(1)->GetOUString(); + OUString aStr = rPar.Get(1)->GetOUString(); if (aStr.isEmpty()) break; @@ -1915,7 +1816,7 @@ void SbRtl_CDateFromIso(StarBASIC *, SbxArray & rPar, bool) break; bool bUseTwoDigitYear = false; - OUString aYearStr, aMonthStr, aDayStr; + std::u16string_view aYearStr, aMonthStr, aDayStr; if (nLen == 6 || nLen == 8 || nLen == 9) { // ((Y)YY)YYMMDD @@ -1925,9 +1826,9 @@ void SbRtl_CDateFromIso(StarBASIC *, SbxArray & rPar, bool) const sal_Int32 nMonthPos = (nLen == 8 ? 4 : (nLen == 6 ? 2 : 5)); if (nMonthPos == 2) bUseTwoDigitYear = true; - aYearStr = aStr.copy( 0, nMonthPos ); - aMonthStr = aStr.copy( nMonthPos, 2 ); - aDayStr = aStr.copy( nMonthPos + 2, 2 ); + aYearStr = aStr.subView( 0, nMonthPos ); + aMonthStr = aStr.subView( nMonthPos, 2 ); + aDayStr = aStr.subView( nMonthPos + 2, 2 ); } else { @@ -1938,9 +1839,9 @@ void SbRtl_CDateFromIso(StarBASIC *, SbxArray & rPar, bool) if (aStr.indexOf('-', nMonthSep + 1) != nMonthSep + 3) break; - aYearStr = aStr.copy( 0, nMonthSep ); - aMonthStr = aStr.copy( nMonthSep + 1, 2 ); - aDayStr = aStr.copy( nMonthSep + 4, 2 ); + aYearStr = aStr.subView( 0, nMonthSep ); + aMonthStr = aStr.subView( nMonthSep + 1, 2 ); + aDayStr = aStr.subView( nMonthSep + 4, 2 ); if ( !comphelper::string::isdigitAsciiString(aYearStr) || !comphelper::string::isdigitAsciiString(aMonthStr) || !comphelper::string::isdigitAsciiString(aDayStr)) @@ -1948,12 +1849,12 @@ void SbRtl_CDateFromIso(StarBASIC *, SbxArray & rPar, bool) } double dDate; - if (!implDateSerial( static_cast<sal_Int16>(nSign * aYearStr.toInt32()), - static_cast<sal_Int16>(aMonthStr.toInt32()), static_cast<sal_Int16>(aDayStr.toInt32()), + if (!implDateSerial( static_cast<sal_Int16>(nSign * o3tl::toInt32(aYearStr)), + static_cast<sal_Int16>(o3tl::toInt32(aMonthStr)), static_cast<sal_Int16>(o3tl::toInt32(aDayStr)), bUseTwoDigitYear, SbDateCorrection::None, dDate )) break; - rPar.Get32(0)->PutDate( dDate ); + rPar.Get(0)->PutDate(dDate); return; } @@ -1969,50 +1870,47 @@ void SbRtl_CDateFromIso(StarBASIC *, SbxArray & rPar, bool) void SbRtl_DateSerial(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 4 ) + if (rPar.Count() < 4) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - sal_Int16 nYear = rPar.Get32(1)->GetInteger(); - sal_Int16 nMonth = rPar.Get32(2)->GetInteger(); - sal_Int16 nDay = rPar.Get32(3)->GetInteger(); + sal_Int16 nYear = rPar.Get(1)->GetInteger(); + sal_Int16 nMonth = rPar.Get(2)->GetInteger(); + sal_Int16 nDay = rPar.Get(3)->GetInteger(); double dDate; if( implDateSerial( nYear, nMonth, nDay, true, SbDateCorrection::RollOver, dDate ) ) { - rPar.Get32(0)->PutDate( dDate ); + rPar.Get(0)->PutDate(dDate); } } void SbRtl_TimeSerial(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 4 ) + if (rPar.Count() < 4) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - sal_Int16 nHour = rPar.Get32(1)->GetInteger(); + sal_Int16 nHour = rPar.Get(1)->GetInteger(); if ( nHour == 24 ) { nHour = 0; // because of UNO DateTimes, which go till 24 o'clock } - sal_Int16 nMinute = rPar.Get32(2)->GetInteger(); - sal_Int16 nSecond = rPar.Get32(3)->GetInteger(); + sal_Int16 nMinute = rPar.Get(2)->GetInteger(); + sal_Int16 nSecond = rPar.Get(3)->GetInteger(); if ((nHour < 0 || nHour > 23) || (nMinute < 0 || nMinute > 59 ) || (nSecond < 0 || nSecond > 59 )) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - rPar.Get32(0)->PutDate( implTimeSerial(nHour, nMinute, nSecond) ); // JSM + rPar.Get(0)->PutDate(implTimeSerial(nHour, nMinute, nSecond)); // JSM } void SbRtl_DateValue(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } @@ -2033,7 +1931,7 @@ void SbRtl_DateValue(StarBASIC *, SbxArray & rPar, bool) LanguageType eLangType = Application::GetSettings().GetLanguageTag().getLanguageType(); sal_uInt32 nIndex = pFormatter->GetStandardIndex( eLangType); double fResult; - OUString aStr( rPar.Get32(1)->GetOUString() ); + OUString aStr(rPar.Get(1)->GetOUString()); bool bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult ); SvNumFormatType nType = pFormatter->GetType( nIndex ); @@ -2062,7 +1960,7 @@ void SbRtl_DateValue(StarBASIC *, SbxArray & rPar, bool) fResult = ceil( fResult ); } } - rPar.Get32(0)->PutDate( fResult ); + rPar.Get(0)->PutDate(fResult); } else { @@ -2073,7 +1971,7 @@ void SbRtl_DateValue(StarBASIC *, SbxArray & rPar, bool) void SbRtl_TimeValue(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } @@ -2090,7 +1988,7 @@ void SbRtl_TimeValue(StarBASIC *, SbxArray & rPar, bool) sal_uInt32 nIndex = 0; double fResult; - bool bSuccess = pFormatter->IsNumberFormat( rPar.Get32(1)->GetOUString(), + bool bSuccess = pFormatter->IsNumberFormat(rPar.Get(1)->GetOUString(), nIndex, fResult ); SvNumFormatType nType = pFormatter->GetType(nIndex); if(bSuccess && (nType==SvNumFormatType::TIME||nType==SvNumFormatType::DATETIME)) @@ -2100,7 +1998,7 @@ void SbRtl_TimeValue(StarBASIC *, SbxArray & rPar, bool) // cut days fResult = fmod( fResult, 1 ); } - rPar.Get32(0)->PutDate( fResult ); + rPar.Get(0)->PutDate(fResult); } else { @@ -2111,30 +2009,30 @@ void SbRtl_TimeValue(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Day(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - SbxVariableRef pArg = rPar.Get32(1); + SbxVariableRef pArg = rPar.Get(1); double aDate = pArg->GetDate(); sal_Int16 nDay = implGetDateDay( aDate ); - rPar.Get32(0)->PutInteger( nDay ); + rPar.Get(0)->PutInteger(nDay); } } void SbRtl_Year(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - sal_Int16 nYear = implGetDateYear( rPar.Get32(1)->GetDate() ); - rPar.Get32(0)->PutInteger( nYear ); + sal_Int16 nYear = implGetDateYear(rPar.Get(1)->GetDate()); + rPar.Get(0)->PutInteger(nYear); } } @@ -2149,42 +2047,42 @@ sal_Int16 implGetHour( double dDate ) void SbRtl_Hour(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - double nArg = rPar.Get32(1)->GetDate(); + double nArg = rPar.Get(1)->GetDate(); sal_Int16 nHour = implGetHour( nArg ); - rPar.Get32(0)->PutInteger( nHour ); + rPar.Get(0)->PutInteger(nHour); } } void SbRtl_Minute(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - double nArg = rPar.Get32(1)->GetDate(); + double nArg = rPar.Get(1)->GetDate(); sal_Int16 nMin = implGetMinute( nArg ); - rPar.Get32(0)->PutInteger( nMin ); + rPar.Get(0)->PutInteger(nMin); } } void SbRtl_Month(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - sal_Int16 nMonth = implGetDateMonth( rPar.Get32(1)->GetDate() ); - rPar.Get32(0)->PutInteger( nMonth ); + sal_Int16 nMonth = implGetDateMonth(rPar.Get(1)->GetDate()); + rPar.Get(0)->PutInteger(nMonth); } } @@ -2204,15 +2102,15 @@ sal_Int16 implGetSecond( double dDate ) void SbRtl_Second(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() < 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - double nArg = rPar.Get32(1)->GetDate(); + double nArg = rPar.Get(1)->GetDate(); sal_Int16 nSecond = implGetSecond( nArg ); - rPar.Get32(0)->PutInteger( nSecond ); + rPar.Get(0)->PutInteger(nSecond); } } @@ -2231,10 +2129,7 @@ double Now_Impl() // Date Now() -void SbRtl_Now(StarBASIC *, SbxArray & rPar, bool) -{ - rPar.Get32(0)->PutDate( Now_Impl() ); -} +void SbRtl_Now(StarBASIC*, SbxArray& rPar, bool) { rPar.Get(0)->PutDate(Now_Impl()); } // Date Time() @@ -2243,7 +2138,7 @@ void SbRtl_Time(StarBASIC *, SbxArray & rPar, bool bWrite) if ( !bWrite ) { tools::Time aTime( tools::Time::SYSTEM ); - SbxVariable* pMeth = rPar.Get32(0); + SbxVariable* pMeth = rPar.Get(0); OUString aRes; if( pMeth->IsFixed() ) { @@ -2293,7 +2188,7 @@ void SbRtl_Timer(StarBASIC *, SbxArray & rPar, bool) nSeconds *= 3600; nSeconds += aTime.GetMin() * 60; nSeconds += aTime.GetSec(); - rPar.Get32(0)->PutDate( static_cast<double>(nSeconds) ); + rPar.Get(0)->PutDate(static_cast<double>(nSeconds)); } @@ -2303,7 +2198,7 @@ void SbRtl_Date(StarBASIC *, SbxArray & rPar, bool bWrite) { Date aToday( Date::SYSTEM ); double nDays = static_cast<double>(GetDayDiff( aToday )); - SbxVariable* pMeth = rPar.Get32(0); + SbxVariable* pMeth = rPar.Get(0); if( pMeth->IsString() ) { OUString aRes; @@ -2338,176 +2233,144 @@ void SbRtl_Date(StarBASIC *, SbxArray & rPar, bool bWrite) void SbRtl_IsArray(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - rPar.Get32(0)->PutBool((rPar.Get32(1)->GetType() & SbxARRAY) != 0); - } + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) != 0); } void SbRtl_IsObject(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - SbxVariable* pVar = rPar.Get32(1); - bool bObject = pVar->IsObject(); - SbxBase* pObj = (bObject ? pVar->GetObject() : nullptr); + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - if( auto pUnoClass = dynamic_cast<SbUnoClass*>( pObj) ) - { - bObject = pUnoClass->getUnoClass().is(); - } - rPar.Get32(0)->PutBool( bObject ); + SbxVariable* pVar = rPar.Get(1); + bool bObject = pVar->IsObject(); + SbxBase* pObj = (bObject ? pVar->GetObject() : nullptr); + + if( auto pUnoClass = dynamic_cast<SbUnoClass*>( pObj) ) + { + bObject = pUnoClass->getUnoClass().is(); } + rPar.Get(0)->PutBool(bObject); } void SbRtl_IsDate(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + // #46134 only string is converted, all other types result in sal_False + SbxVariableRef xArg = rPar.Get(1); + SbxDataType eType = xArg->GetType(); + bool bDate = false; + + if( eType == SbxDATE ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + bDate = true; } - else + else if( eType == SbxSTRING ) { - // #46134 only string is converted, all other types result in sal_False - SbxVariableRef xArg = rPar.Get32(1); - SbxDataType eType = xArg->GetType(); - bool bDate = false; - - if( eType == SbxDATE ) - { - bDate = true; - } - else if( eType == SbxSTRING ) - { - ErrCode nPrevError = SbxBase::GetError(); - SbxBase::ResetError(); + ErrCode nPrevError = SbxBase::GetError(); + SbxBase::ResetError(); - // force conversion of the parameter to SbxDATE - xArg->SbxValue::GetDate(); + // force conversion of the parameter to SbxDATE + xArg->SbxValue::GetDate(); - bDate = !SbxBase::IsError(); + bDate = !SbxBase::IsError(); - SbxBase::ResetError(); - SbxBase::SetError( nPrevError ); - } - rPar.Get32(0)->PutBool( bDate ); + SbxBase::ResetError(); + SbxBase::SetError( nPrevError ); } + rPar.Get(0)->PutBool(bDate); } void SbRtl_IsEmpty(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariable* pVar = nullptr; + if( SbiRuntime::isVBAEnabled() ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + pVar = getDefaultProp(rPar.Get(1)); + } + if ( pVar ) + { + pVar->Broadcast( SfxHintId::BasicDataWanted ); + rPar.Get(0)->PutBool(pVar->IsEmpty()); } else { - SbxVariable* pVar = nullptr; - if( SbiRuntime::isVBAEnabled() ) - { - pVar = getDefaultProp( rPar.Get32(1) ); - } - if ( pVar ) - { - pVar->Broadcast( SfxHintId::BasicDataWanted ); - rPar.Get32(0)->PutBool( pVar->IsEmpty() ); - } - else - { - rPar.Get32(0)->PutBool( rPar.Get32(1)->IsEmpty() ); - } + rPar.Get(0)->PutBool(rPar.Get(1)->IsEmpty()); } } void SbRtl_IsError(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxVariable* pVar = rPar.Get(1); + SbUnoObject* pObj = dynamic_cast<SbUnoObject*>( pVar ); + if ( !pObj ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + if ( SbxBase* pBaseObj = (pVar->IsObject() ? pVar->GetObject() : nullptr) ) + { + pObj = dynamic_cast<SbUnoObject*>( pBaseObj ); + } + } + uno::Reference< script::XErrorQuery > xError; + if ( pObj ) + { + xError.set( pObj->getUnoAny(), uno::UNO_QUERY ); + } + if ( xError.is() ) + { + rPar.Get(0)->PutBool(xError->hasError()); } else { - SbxVariable* pVar =rPar.Get32(1); - SbUnoObject* pObj = dynamic_cast<SbUnoObject*>( pVar ); - if ( !pObj ) - { - if ( SbxBase* pBaseObj = (pVar->IsObject() ? pVar->GetObject() : nullptr) ) - { - pObj = dynamic_cast<SbUnoObject*>( pBaseObj ); - } - } - uno::Reference< script::XErrorQuery > xError; - if ( pObj ) - { - xError.set( pObj->getUnoAny(), uno::UNO_QUERY ); - } - if ( xError.is() ) - { - rPar.Get32(0)->PutBool( xError->hasError() ); - } - else - { - rPar.Get32(0)->PutBool( rPar.Get32(1)->IsErr() ); - } + rPar.Get(0)->PutBool(rPar.Get(1)->IsErr()); } } void SbRtl_IsNull(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + // #51475 because of Uno-objects return true + // even if the pObj value is NULL + SbxVariableRef pArg = rPar.Get(1); + bool bNull = rPar.Get(1)->IsNull(); + if( !bNull && pArg->GetType() == SbxOBJECT ) { - // #51475 because of Uno-objects return true - // even if the pObj value is NULL - SbxVariableRef pArg = rPar.Get32(1); - bool bNull = rPar.Get32(1)->IsNull(); - if( !bNull && pArg->GetType() == SbxOBJECT ) + SbxBase* pObj = pArg->GetObject(); + if( !pObj ) { - SbxBase* pObj = pArg->GetObject(); - if( !pObj ) - { - bNull = true; - } + bNull = true; } - rPar.Get32(0)->PutBool( bNull ); } + rPar.Get(0)->PutBool(bNull); } void SbRtl_IsNumeric(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - rPar.Get32(0)->PutBool( rPar.Get32(1)->IsNumericRTL() ); - } + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + rPar.Get(0)->PutBool(rPar.Get(1)->IsNumericRTL()); } void SbRtl_IsMissing(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() < 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - } - else - { - // #57915 Missing is reported by an error - rPar.Get32(0)->PutBool( rPar.Get32(1)->IsErr() ); - } + if (rPar.Count() != 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + // #57915 Missing is reported by an error + rPar.Get(0)->PutBool(rPar.Get(1)->IsErr()); } // Function looks for wildcards, removes them and always returns the pure path @@ -2518,7 +2381,7 @@ static OUString implSetupWildcard(const OUString& rFileParam, SbiRTLData& rRTLDa static const char cWild1 = '*'; static const char cWild2 = '?'; - rRTLData.pWildCard.reset(); + rRTLData.moWildCard.reset(); rRTLData.sFullNameToBeChecked.clear(); OUString aFileParam = rFileParam; @@ -2572,7 +2435,7 @@ static OUString implSetupWildcard(const OUString& rFileParam, SbiRTLData& rRTLDa // invalid anyway because it was not accepted by OSL before if (aPureFileName != "*") { - rRTLData.pWildCard = std::make_unique<WildCard>(aPureFileName); + rRTLData.moWildCard.emplace(aPureFileName); } return aPathStr; } @@ -2581,15 +2444,15 @@ static bool implCheckWildcard(std::u16string_view rName, SbiRTLData const& rRTLD { bool bMatch = true; - if (rRTLData.pWildCard) + if (rRTLData.moWildCard) { - bMatch = rRTLData.pWildCard->Matches(rName); + bMatch = rRTLData.moWildCard->Matches(rName); } return bMatch; } -static bool isRootDir( const OUString& aDirURLStr ) +static bool isRootDir( std::u16string_view aDirURLStr ) { INetURLObject aDirURLObj( aDirURLStr ); bool bRoot = false; @@ -2624,7 +2487,7 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) { OUString aPath; - const sal_uInt32 nParCount = rPar.Count32(); + const sal_uInt32 nParCount = rPar.Count(); if( nParCount > 3 ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); @@ -2640,7 +2503,7 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) { if ( nParCount >= 2 ) { - OUString aFileParam = rPar.Get32(1)->GetOUString(); + OUString aFileParam = rPar.Get(1)->GetOUString(); OUString aFileURLStr = implSetupWildcard(aFileParam, rRTLData); if (!rRTLData.sFullNameToBeChecked.isEmpty()) @@ -2656,7 +2519,7 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) aNameOnlyStr = aFileURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ); } - rPar.Get32(0)->PutString( aNameOnlyStr ); + rPar.Get(0)->PutString(aNameOnlyStr); return; } @@ -2671,14 +2534,14 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) } else { - rPar.Get32(0)->PutString( "" ); + rPar.Get(0)->PutString(""); } SbAttributes nFlags = SbAttributes::NONE; if ( nParCount > 2 ) { rRTLData.nDirFlags = nFlags - = static_cast<SbAttributes>(rPar.Get32(2)->GetInteger()); + = static_cast<SbAttributes>(rPar.Get(2)->GetInteger()); } else { @@ -2778,7 +2641,7 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) break; } } - rPar.Get32(0)->PutString( aPath ); + rPar.Get(0)->PutString(aPath); } } else @@ -2786,7 +2649,7 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) // TODO: OSL if ( nParCount >= 2 ) { - OUString aFileParam = rPar.Get32(1)->GetOUString(); + OUString aFileParam = rPar.Get(1)->GetOUString(); OUString aDirURL = implSetupWildcard(aFileParam, rRTLData); @@ -2794,7 +2657,7 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) if ( nParCount > 2 ) { rRTLData.nDirFlags = nFlags - = static_cast<SbAttributes>(rPar.Get32(2)->GetInteger()); + = static_cast<SbAttributes>(rPar.Get(2)->GetInteger()); } else { @@ -2808,7 +2671,7 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) if( nRet != FileBase::E_None ) { rRTLData.pDir.reset(); - rPar.Get32(0)->PutString( OUString() ); + rPar.Get(0)->PutString(OUString()); return; } @@ -2889,18 +2752,15 @@ void SbRtl_Dir(StarBASIC *, SbxArray & rPar, bool) break; } } - rPar.Get32(0)->PutString( aPath ); + rPar.Get(0)->PutString(aPath); } } } -void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) +void SbRtl_GetAttr(StarBASIC *, SbxArray & rPar, bool) { - (void)pBasic; - (void)bWrite; - - if ( rPar.Count32() == 2 ) + if (rPar.Count() == 2) { sal_Int16 nFlags = 0; @@ -2909,7 +2769,7 @@ void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) #if defined(_WIN32) if( SbiRuntime::isVBAEnabled() ) { - OUString aPathURL = getFullPath( rPar.Get32(1)->GetOUString() ); + OUString aPathURL = getFullPath(rPar.Get(1)->GetOUString()); OUString aPath; FileBase::getSystemPathFromFileURL( aPathURL, aPath ); DWORD nRealFlags = GetFileAttributesW (o3tl::toW(aPath.getStr())); @@ -2925,7 +2785,7 @@ void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) { StarBASIC::Error( ERRCODE_BASIC_FILE_NOT_FOUND ); } - rPar.Get32(0)->PutInteger( nFlags ); + rPar.Get(0)->PutInteger(nFlags); return; } @@ -2938,14 +2798,13 @@ void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) { try { - OUString aPath = getFullPath( rPar.Get32(1)->GetOUString() ); + OUString aPath = getFullPath(rPar.Get(1)->GetOUString()); bool bExists = false; try { bExists = xSFI->exists( aPath ); } catch(const Exception & ) {} if( !bExists ) { - StarBASIC::Error( ERRCODE_BASIC_FILE_NOT_FOUND ); - return; + return StarBASIC::Error( ERRCODE_BASIC_FILE_NOT_FOUND ); } bool bReadOnly = xSFI->isReadOnly( aPath ); @@ -2973,7 +2832,7 @@ void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) else { DirectoryItem aItem; - (void)DirectoryItem::get( getFullPath( rPar.Get32(1)->GetOUString() ), aItem ); + (void)DirectoryItem::get(getFullPath(rPar.Get(1)->GetOUString()), aItem); FileStatus aFileStatus( osl_FileStatus_Mask_Attributes | osl_FileStatus_Mask_Type ); (void)aItem.getFileStatus( aFileStatus ); sal_uInt64 nAttributes = aFileStatus.getAttributes(); @@ -2990,7 +2849,7 @@ void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) nFlags |= sal_uInt16(SbAttributes::DIRECTORY); } } - rPar.Get32(0)->PutInteger( nFlags ); + rPar.Get(0)->PutInteger(nFlags); } else { @@ -3001,13 +2860,13 @@ void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) void SbRtl_FileDateTime(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - OUString aPath = rPar.Get32(1)->GetOUString(); + OUString aPath = rPar.Get(1)->GetOUString(); tools::Time aTime( tools::Time::EMPTY ); Date aDate( Date::EMPTY ); if( hasUno() ) @@ -3093,7 +2952,7 @@ void SbRtl_FileDateTime(StarBASIC *, SbxArray & rPar, bool) pFormatter->GetOutputString( fSerial, nIndex, aRes, &pCol ); } - rPar.Get32(0)->PutString( aRes ); + rPar.Get(0)->PutString(aRes); } } @@ -3101,19 +2960,18 @@ void SbRtl_FileDateTime(StarBASIC *, SbxArray & rPar, bool) void SbRtl_EOF(StarBASIC *, SbxArray & rPar, bool) { // No changes for UCB - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - sal_Int16 nChannel = rPar.Get32(1)->GetInteger(); + sal_Int16 nChannel = rPar.Get(1)->GetInteger(); SbiIoSystem* pIO = GetSbData()->pInst->GetIoSystem(); SbiStream* pSbStrm = pIO->GetStream( nChannel ); if ( !pSbStrm ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); } bool beof; SvStream* pSvStrm = pSbStrm->GetStrm(); @@ -3131,7 +2989,7 @@ void SbRtl_EOF(StarBASIC *, SbxArray & rPar, bool) { beof = pSvStrm->eof(); // for binary data! } - rPar.Get32(0)->PutBool( beof ); + rPar.Get(0)->PutBool(beof); } } @@ -3142,22 +3000,21 @@ void SbRtl_FileAttr(StarBASIC *, SbxArray & rPar, bool) // not touched by the adjustment to virtual URLs, as it only works on // already opened files and the name doesn't matter there. - if ( rPar.Count32() != 3 ) + if (rPar.Count() != 3) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - sal_Int16 nChannel = rPar.Get32(1)->GetInteger(); + sal_Int16 nChannel = rPar.Get(1)->GetInteger(); SbiIoSystem* pIO = GetSbData()->pInst->GetIoSystem(); SbiStream* pSbStrm = pIO->GetStream( nChannel ); if ( !pSbStrm ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); } sal_Int16 nRet; - if ( rPar.Get32(2)->GetInteger() == 1 ) + if (rPar.Get(2)->GetInteger() == 1) { nRet = static_cast<sal_Int16>(pSbStrm->GetMode()); } @@ -3165,25 +3022,24 @@ void SbRtl_FileAttr(StarBASIC *, SbxArray & rPar, bool) { nRet = 0; // System file handle not supported } - rPar.Get32(0)->PutInteger( nRet ); + rPar.Get(0)->PutInteger(nRet); } } void SbRtl_Loc(StarBASIC *, SbxArray & rPar, bool) { // No changes for UCB - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - sal_Int16 nChannel = rPar.Get32(1)->GetInteger(); + sal_Int16 nChannel = rPar.Get(1)->GetInteger(); SbiIoSystem* pIO = GetSbData()->pInst->GetIoSystem(); SbiStream* pSbStrm = pIO->GetStream( nChannel ); if ( !pSbStrm ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); } SvStream* pSvStrm = pSbStrm->GetStrm(); std::size_t nPos; @@ -3209,30 +3065,29 @@ void SbRtl_Loc(StarBASIC *, SbxArray & rPar, bool) { nPos = pSvStrm->Tell(); } - rPar.Get32(0)->PutLong( static_cast<sal_Int32>(nPos) ); + rPar.Get(0)->PutLong(static_cast<sal_Int32>(nPos)); } } void SbRtl_Lof(StarBASIC *, SbxArray & rPar, bool) { // No changes for UCB - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - sal_Int16 nChannel = rPar.Get32(1)->GetInteger(); + sal_Int16 nChannel = rPar.Get(1)->GetInteger(); SbiIoSystem* pIO = GetSbData()->pInst->GetIoSystem(); SbiStream* pSbStrm = pIO->GetStream( nChannel ); if ( !pSbStrm ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); } SvStream* pSvStrm = pSbStrm->GetStrm(); sal_uInt64 const nLen = pSvStrm->TellEnd(); - rPar.Get32(0)->PutLong( static_cast<sal_Int32>(nLen) ); + rPar.Get(0)->PutLong(static_cast<sal_Int32>(nLen)); } } @@ -3240,19 +3095,17 @@ void SbRtl_Lof(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Seek(StarBASIC *, SbxArray & rPar, bool) { // No changes for UCB - int nArgs = static_cast<int>(rPar.Count32()); + int nArgs = static_cast<int>(rPar.Count()); if ( nArgs < 2 || nArgs > 3 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - sal_Int16 nChannel = rPar.Get32(1)->GetInteger(); + sal_Int16 nChannel = rPar.Get(1)->GetInteger(); SbiIoSystem* pIO = GetSbData()->pInst->GetIoSystem(); SbiStream* pSbStrm = pIO->GetStream( nChannel ); if ( !pSbStrm ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_CHANNEL ); } SvStream* pStrm = pSbStrm->GetStrm(); @@ -3264,15 +3117,14 @@ void SbRtl_Seek(StarBASIC *, SbxArray & rPar, bool) nPos = nPos / pSbStrm->GetBlockLen(); } nPos++; // Basic counts from 1 - rPar.Get32(0)->PutLong( static_cast<sal_Int32>(nPos) ); + rPar.Get(0)->PutLong(static_cast<sal_Int32>(nPos)); } else // Seek-Statement { - sal_Int32 nPos = rPar.Get32(2)->GetLong(); + sal_Int32 nPos = rPar.Get(2)->GetLong(); if ( nPos < 1 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } nPos--; // Basic counts from 1, SvStreams count from 0 pSbStrm->SetExpandOnWriteTo( 0 ); @@ -3287,7 +3139,7 @@ void SbRtl_Seek(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Format(StarBASIC *, SbxArray & rPar, bool) { - const sal_uInt32 nArgCount = rPar.Count32(); + const sal_uInt32 nArgCount = rPar.Count(); if ( nArgCount < 2 || nArgCount > 3 ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); @@ -3297,37 +3149,56 @@ void SbRtl_Format(StarBASIC *, SbxArray & rPar, bool) OUString aResult; if( nArgCount == 2 ) { - rPar.Get32(1)->Format( aResult ); + rPar.Get(1)->Format(aResult); } else { - OUString aFmt( rPar.Get32(2)->GetOUString() ); - rPar.Get32(1)->Format( aResult, &aFmt ); + OUString aFmt(rPar.Get(2)->GetOUString()); + rPar.Get(1)->Format(aResult, &aFmt); } - rPar.Get32(0)->PutString( aResult ); + rPar.Get(0)->PutString(aResult); } } -// https://msdn.microsoft.com/en-us/vba/language-reference-vba/articles/formatnumber-function -void SbRtl_FormatNumber(StarBASIC*, SbxArray& rPar, bool) +static bool IsMissing(SbxArray& rPar, const sal_uInt32 i) { - const sal_uInt32 nArgCount = rPar.Count32(); + const sal_uInt32 nArgCount = rPar.Count(); + if (nArgCount <= i) + return true; + + SbxVariable* aPar = rPar.Get(i); + return (aPar->GetType() == SbxERROR && SbiRuntime::IsMissing(aPar, 1)); +} + +static sal_Int16 GetOptionalIntegerParamOrDefault(SbxArray& rPar, const sal_uInt32 i, + const sal_Int16 defaultValue) +{ + return IsMissing(rPar, i) ? defaultValue : rPar.Get(i)->GetInteger(); +} + +static OUString GetOptionalOUStringParamOrDefault(SbxArray& rPar, const sal_uInt32 i, + const OUString& defaultValue) +{ + return IsMissing(rPar, i) ? defaultValue : rPar.Get(i)->GetOUString(); +} + +static void lcl_FormatNumberPercent(SbxArray& rPar, bool isPercent) +{ + const sal_uInt32 nArgCount = rPar.Count(); if (nArgCount < 2 || nArgCount > 6) { - StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); - return; + return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); } // The UI locale never changes -> we can use static value here static const LocaleDataWrapper localeData(Application::GetSettings().GetUILanguageTag()); sal_Int16 nNumDigitsAfterDecimal = -1; - if (nArgCount > 2 && !rPar.Get32(2)->IsEmpty()) + if (nArgCount > 2 && !rPar.Get(2)->IsEmpty()) { - nNumDigitsAfterDecimal = rPar.Get32(2)->GetInteger(); + nNumDigitsAfterDecimal = rPar.Get(2)->GetInteger(); if (nNumDigitsAfterDecimal < -1) { - StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); - return; + return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); } else if (nNumDigitsAfterDecimal > 255) nNumDigitsAfterDecimal %= 256; @@ -3336,9 +3207,9 @@ void SbRtl_FormatNumber(StarBASIC*, SbxArray& rPar, bool) nNumDigitsAfterDecimal = LocaleDataWrapper::getNumDigits(); bool bIncludeLeadingDigit = LocaleDataWrapper::isNumLeadingZero(); - if (nArgCount > 3 && !rPar.Get32(3)->IsEmpty()) + if (nArgCount > 3 && !rPar.Get(3)->IsEmpty()) { - switch (rPar.Get32(3)->GetInteger()) + switch (rPar.Get(3)->GetInteger()) { case ooo::vba::VbTriState::vbFalse: bIncludeLeadingDigit = false; @@ -3350,15 +3221,14 @@ void SbRtl_FormatNumber(StarBASIC*, SbxArray& rPar, bool) // do nothing; break; default: - StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); - return; + return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); } } bool bUseParensForNegativeNumbers = false; - if (nArgCount > 4 && !rPar.Get32(4)->IsEmpty()) + if (nArgCount > 4 && !rPar.Get(4)->IsEmpty()) { - switch (rPar.Get32(4)->GetInteger()) + switch (rPar.Get(4)->GetInteger()) { case ooo::vba::VbTriState::vbFalse: case ooo::vba::VbTriState::vbUseDefault: @@ -3368,15 +3238,14 @@ void SbRtl_FormatNumber(StarBASIC*, SbxArray& rPar, bool) bUseParensForNegativeNumbers = true; break; default: - StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); - return; + return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); } } bool bGroupDigits = false; - if (nArgCount > 5 && !rPar.Get32(5)->IsEmpty()) + if (nArgCount > 5 && !rPar.Get(5)->IsEmpty()) { - switch (rPar.Get32(5)->GetInteger()) + switch (rPar.Get(5)->GetInteger()) { case ooo::vba::VbTriState::vbFalse: case ooo::vba::VbTriState::vbUseDefault: @@ -3386,53 +3255,59 @@ void SbRtl_FormatNumber(StarBASIC*, SbxArray& rPar, bool) bGroupDigits = true; break; default: - StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); - return; + return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); } } - double fVal = rPar.Get32(1)->GetDouble(); + double fVal = rPar.Get(1)->GetDouble(); + if (isPercent) + fVal *= 100; const bool bNegative = fVal < 0; if (bNegative) fVal = fabs(fVal); // Always work with non-negatives, to easily handle leading zero static const sal_Unicode decSep = localeData.getNumDecimalSep().toChar(); - OUString aResult = rtl::math::doubleToUString( + OUStringBuffer aResult; + rtl::math::doubleToUStringBuffer(aResult, fVal, rtl_math_StringFormat_F, nNumDigitsAfterDecimal, decSep, bGroupDigits ? localeData.getDigitGrouping().getConstArray() : nullptr, localeData.getNumThousandSep().toChar()); - if (!bIncludeLeadingDigit && aResult.getLength() > 1 && aResult.startsWith("0")) - aResult = aResult.copy(1); + if (!bIncludeLeadingDigit && aResult.getLength() > 1) + aResult.stripStart('0'); if (nNumDigitsAfterDecimal > 0) { - sal_Int32 nActualDigits; const sal_Int32 nSepPos = aResult.indexOf(decSep); - if (nSepPos == -1) - nActualDigits = 0; - else - nActualDigits = aResult.getLength() - nSepPos - 1; // VBA allows up to 255 digits; rtl::math::doubleToUString outputs up to 15 digits // for ~small numbers, so pad them as appropriate. - if (nActualDigits < nNumDigitsAfterDecimal) - { - OUStringBuffer sBuf; - comphelper::string::padToLength(sBuf, nNumDigitsAfterDecimal - nActualDigits, '0'); - aResult += sBuf; - } + if (nSepPos >= 0) + comphelper::string::padToLength(aResult, nSepPos + nNumDigitsAfterDecimal + 1, '0'); } if (bNegative) { if (bUseParensForNegativeNumbers) - aResult = "(" + aResult + ")"; + aResult.insert(0, '(').append(')'); else - aResult = "-" + aResult; + aResult.insert(0, '-'); } + if (isPercent) + aResult.append('%'); + rPar.Get(0)->PutString(aResult.makeStringAndClear()); +} - rPar.Get32(0)->PutString(aResult); +// https://docs.microsoft.com/en-us/office/vba/Language/Reference/User-Interface-Help/formatnumber-function +void SbRtl_FormatNumber(StarBASIC*, SbxArray& rPar, bool) +{ + return lcl_FormatNumberPercent(rPar, false); +} + +// https://docs.microsoft.com/en-us/office/vba/Language/Reference/User-Interface-Help/formatpercent-function +void SbRtl_FormatPercent(StarBASIC*, SbxArray& rPar, bool) +{ + return lcl_FormatNumberPercent(rPar, true); } namespace { @@ -3463,35 +3338,39 @@ struct RandomNumberGenerator } }; -class theRandomNumberGenerator : public rtl::Static<RandomNumberGenerator, theRandomNumberGenerator> {}; +RandomNumberGenerator& theRandomNumberGenerator() +{ + static RandomNumberGenerator theGenerator; + return theGenerator; +} } void SbRtl_Randomize(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() > 2 ) + if (rPar.Count() > 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - if( rPar.Count32() == 2 ) + if (rPar.Count() == 2) { - int nSeed = static_cast<int>(rPar.Get32(1)->GetInteger()); - theRandomNumberGenerator::get().global_rng.seed(nSeed); + int nSeed = static_cast<int>(rPar.Get(1)->GetInteger()); + theRandomNumberGenerator().global_rng.seed(nSeed); } // without parameter, no need to do anything - RNG is seeded at first use } void SbRtl_Rnd(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() > 2 ) + if (rPar.Count() > 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { std::uniform_real_distribution<double> dist(0.0, 1.0); - double const tmp(dist(theRandomNumberGenerator::get().global_rng)); - rPar.Get32(0)->PutDouble(tmp); + double const tmp(dist(theRandomNumberGenerator().global_rng)); + rPar.Get(0)->PutDouble(tmp); } } @@ -3507,21 +3386,21 @@ void SbRtl_Rnd(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool) { - const sal_uInt32 nArgCount = rPar.Count32(); + const sal_uInt32 nArgCount = rPar.Count(); if ( nArgCount < 2 || nArgCount > 5 ) { - rPar.Get32(0)->PutLong(0); + rPar.Get(0)->PutLong(0); StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { oslProcessOption nOptions = osl_Process_SEARCHPATH | osl_Process_DETACHED; - OUString aCmdLine = rPar.Get32(1)->GetOUString(); + OUString aCmdLine = rPar.Get(1)->GetOUString(); // attach additional parameters - everything must be parsed anyway if( nArgCount >= 4 ) { - OUString tmp = rPar.Get32(3)->GetOUString().trim(); + OUString tmp = rPar.Get(3)->GetOUString().trim(); if (!tmp.isEmpty()) { aCmdLine += " " + tmp; @@ -3592,7 +3471,7 @@ void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool) sal_Int16 nWinStyle = 0; if( nArgCount >= 3 ) { - nWinStyle = rPar.Get32(2)->GetInteger(); + nWinStyle = rPar.Get(2)->GetInteger(); switch( nWinStyle ) { case 2: @@ -3609,7 +3488,7 @@ void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool) bool bSync = false; if( nArgCount >= 5 ) { - bSync = rPar.Get32(4)->GetBool(); + bSync = rPar.Get(4)->GetBool(); } if( bSync ) { @@ -3664,21 +3543,21 @@ void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool) } else { - rPar.Get32(0)->PutLong( 0 ); + rPar.Get(0)->PutLong(0); } } } void SbRtl_VarType(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - SbxDataType eType = rPar.Get32(1)->GetType(); - rPar.Get32(0)->PutInteger( static_cast<sal_Int16>(eType) ); + SbxDataType eType = rPar.Get(1)->GetType(); + rPar.Get(0)->PutInteger(static_cast<sal_Int16>(eType)); } } @@ -3728,7 +3607,7 @@ OUString getBasicTypeName( SbxDataType eType ) }; size_t nPos = static_cast<size_t>(eType) & 0x0FFF; - const size_t nTypeNameCount = SAL_N_ELEMENTS( pTypeNames ); + const size_t nTypeNameCount = std::size( pTypeNames ); if ( nPos >= nTypeNameCount ) { nPos = nTypeNameCount - 1; @@ -3801,19 +3680,19 @@ static OUString getObjectTypeName( SbxVariable* pVar ) void SbRtl_TypeName(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - SbxDataType eType = rPar.Get32(1)->GetType(); + SbxDataType eType = rPar.Get(1)->GetType(); bool bIsArray = ( ( eType & SbxARRAY ) != 0 ); OUString aRetStr; if ( SbiRuntime::isVBAEnabled() && eType == SbxOBJECT ) { - aRetStr = getObjectTypeName( rPar.Get32(1) ); + aRetStr = getObjectTypeName(rPar.Get(1)); } else { @@ -3823,33 +3702,32 @@ void SbRtl_TypeName(StarBASIC *, SbxArray & rPar, bool) { aRetStr += "()"; } - rPar.Get32(0)->PutString( aRetStr ); + rPar.Get(0)->PutString(aRetStr); } } void SbRtl_Len(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } else { - const OUString& rStr = rPar.Get32(1)->GetOUString(); - rPar.Get32(0)->PutLong( rStr.getLength() ); + const OUString& rStr = rPar.Get(1)->GetOUString(); + rPar.Get(0)->PutLong(rStr.getLength()); } } void SbRtl_DDEInitiate(StarBASIC *, SbxArray & rPar, bool) { - int nArgs = static_cast<int>(rPar.Count32()); + int nArgs = static_cast<int>(rPar.Count()); if ( nArgs != 3 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - const OUString& rApp = rPar.Get32(1)->GetOUString(); - const OUString& rTopic = rPar.Get32(2)->GetOUString(); + const OUString& rApp = rPar.Get(1)->GetOUString(); + const OUString& rTopic = rPar.Get(2)->GetOUString(); SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl(); size_t nChannel; @@ -3860,20 +3738,20 @@ void SbRtl_DDEInitiate(StarBASIC *, SbxArray & rPar, bool) } else { - rPar.Get32(0)->PutInteger( static_cast<sal_Int16>(nChannel) ); + rPar.Get(0)->PutInteger(static_cast<sal_Int16>(nChannel)); } } void SbRtl_DDETerminate(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - int nArgs = static_cast<int>(rPar.Count32()); + rPar.Get(0)->PutEmpty(); + int nArgs = static_cast<int>(rPar.Count()); if ( nArgs != 2 ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); return; } - size_t nChannel = rPar.Get32(1)->GetInteger(); + size_t nChannel = rPar.Get(1)->GetInteger(); SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl(); ErrCode nDdeErr = pDDE->Terminate( nChannel ); if( nDdeErr ) @@ -3884,12 +3762,11 @@ void SbRtl_DDETerminate(StarBASIC *, SbxArray & rPar, bool) void SbRtl_DDETerminateAll(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - int nArgs = static_cast<int>(rPar.Count32()); + rPar.Get(0)->PutEmpty(); + int nArgs = static_cast<int>(rPar.Count()); if ( nArgs != 1 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl(); @@ -3902,14 +3779,13 @@ void SbRtl_DDETerminateAll(StarBASIC *, SbxArray & rPar, bool) void SbRtl_DDERequest(StarBASIC *, SbxArray & rPar, bool) { - int nArgs = static_cast<int>(rPar.Count32()); + int nArgs = static_cast<int>(rPar.Count()); if ( nArgs != 3 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - size_t nChannel = rPar.Get32(1)->GetInteger(); - const OUString& rItem = rPar.Get32(2)->GetOUString(); + size_t nChannel = rPar.Get(1)->GetInteger(); + const OUString& rItem = rPar.Get(2)->GetOUString(); SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl(); OUString aResult; ErrCode nDdeErr = pDDE->Request( nChannel, rItem, aResult ); @@ -3919,21 +3795,20 @@ void SbRtl_DDERequest(StarBASIC *, SbxArray & rPar, bool) } else { - rPar.Get32(0)->PutString( aResult ); + rPar.Get(0)->PutString(aResult); } } void SbRtl_DDEExecute(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - int nArgs = static_cast<int>(rPar.Count32()); + rPar.Get(0)->PutEmpty(); + int nArgs = static_cast<int>(rPar.Count()); if ( nArgs != 3 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - size_t nChannel = rPar.Get32(1)->GetInteger(); - const OUString& rCommand = rPar.Get32(2)->GetOUString(); + size_t nChannel = rPar.Get(1)->GetInteger(); + const OUString& rCommand = rPar.Get(2)->GetOUString(); SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl(); ErrCode nDdeErr = pDDE->Execute( nChannel, rCommand ); if( nDdeErr ) @@ -3944,16 +3819,15 @@ void SbRtl_DDEExecute(StarBASIC *, SbxArray & rPar, bool) void SbRtl_DDEPoke(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - int nArgs = static_cast<int>(rPar.Count32()); + rPar.Get(0)->PutEmpty(); + int nArgs = static_cast<int>(rPar.Count()); if ( nArgs != 4 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - size_t nChannel = rPar.Get32(1)->GetInteger(); - const OUString& rItem = rPar.Get32(2)->GetOUString(); - const OUString& rData = rPar.Get32(3)->GetOUString(); + size_t nChannel = rPar.Get(1)->GetInteger(); + const OUString& rItem = rPar.Get(2)->GetOUString(); + const OUString& rData = rPar.Get(3)->GetOUString(); SbiDdeControl* pDDE = GetSbData()->pInst->GetDdeControl(); ErrCode nDdeErr = pDDE->Poke( nChannel, rItem, rData ); if( nDdeErr ) @@ -3965,10 +3839,9 @@ void SbRtl_DDEPoke(StarBASIC *, SbxArray & rPar, bool) void SbRtl_FreeFile(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 1 ) + if (rPar.Count() != 1) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } SbiIoSystem* pIO = GetSbData()->pInst->GetIoSystem(); short nChannel = 1; @@ -3977,7 +3850,7 @@ void SbRtl_FreeFile(StarBASIC *, SbxArray & rPar, bool) SbiStream* pStrm = pIO->GetStream( nChannel ); if( !pStrm ) { - rPar.Get32(0)->PutInteger( nChannel ); + rPar.Get(0)->PutInteger(nChannel); return; } nChannel++; @@ -3987,66 +3860,57 @@ void SbRtl_FreeFile(StarBASIC *, SbxArray & rPar, bool) void SbRtl_LBound(StarBASIC *, SbxArray & rPar, bool) { - const sal_uInt32 nParCount = rPar.Count32(); + const sal_uInt32 nParCount = rPar.Count(); if ( nParCount != 3 && nParCount != 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; - } - SbxBase* pParObj = rPar.Get32(1)->GetObject(); + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + + SbxBase* pParObj = rPar.Get(1)->GetObject(); SbxDimArray* pArr = dynamic_cast<SbxDimArray*>( pParObj ); - if( pArr ) - { - sal_Int32 nLower, nUpper; - short nDim = (nParCount == 3) ? static_cast<short>(rPar.Get32(2)->GetInteger()) : 1; - if( !pArr->GetDim32( nDim, nLower, nUpper ) ) - StarBASIC::Error( ERRCODE_BASIC_OUT_OF_RANGE ); - else - rPar.Get32(0)->PutLong( nLower ); - } - else - StarBASIC::Error( ERRCODE_BASIC_MUST_HAVE_DIMS ); + if( !pArr ) + return StarBASIC::Error( ERRCODE_BASIC_MUST_HAVE_DIMS ); + + sal_Int32 nLower, nUpper; + short nDim = (nParCount == 3) ? static_cast<short>(rPar.Get(2)->GetInteger()) : 1; + if (!pArr->GetDim(nDim, nLower, nUpper)) + return StarBASIC::Error( ERRCODE_BASIC_OUT_OF_RANGE ); + rPar.Get(0)->PutLong(nLower); } void SbRtl_UBound(StarBASIC *, SbxArray & rPar, bool) { - const sal_uInt32 nParCount = rPar.Count32(); + const sal_uInt32 nParCount = rPar.Count(); if ( nParCount != 3 && nParCount != 2 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; - } + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - SbxBase* pParObj = rPar.Get32(1)->GetObject(); + SbxBase* pParObj = rPar.Get(1)->GetObject(); SbxDimArray* pArr = dynamic_cast<SbxDimArray*>( pParObj ); - if( pArr ) - { - sal_Int32 nLower, nUpper; - short nDim = (nParCount == 3) ? static_cast<short>(rPar.Get32(2)->GetInteger()) : 1; - if( !pArr->GetDim32( nDim, nLower, nUpper ) ) - StarBASIC::Error( ERRCODE_BASIC_OUT_OF_RANGE ); - else - rPar.Get32(0)->PutLong( nUpper ); - } - else - StarBASIC::Error( ERRCODE_BASIC_MUST_HAVE_DIMS ); + if( !pArr ) + return StarBASIC::Error( ERRCODE_BASIC_MUST_HAVE_DIMS ); + + sal_Int32 nLower, nUpper; + short nDim = (nParCount == 3) ? static_cast<short>(rPar.Get(2)->GetInteger()) : 1; + if (!pArr->GetDim(nDim, nLower, nUpper)) + return StarBASIC::Error( ERRCODE_BASIC_OUT_OF_RANGE ); + rPar.Get(0)->PutLong(nUpper); } void SbRtl_RGB(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 4 ) - { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; - } + if (rPar.Count() != 4) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - sal_Int32 nRed = rPar.Get32(1)->GetInteger() & 0xFF; - sal_Int32 nGreen = rPar.Get32(2)->GetInteger() & 0xFF; - sal_Int32 nBlue = rPar.Get32(3)->GetInteger() & 0xFF; + sal_Int32 nRed = rPar.Get(1)->GetInteger() & 0xFF; + sal_Int32 nGreen = rPar.Get(2)->GetInteger() & 0xFF; + sal_Int32 nBlue = rPar.Get(3)->GetInteger() & 0xFF; sal_Int32 nRGB; SbiInstance* pInst = GetSbData()->pInst; bool bCompatibility = ( pInst && pInst->IsCompatibility() ); + // See discussion in tdf#145725, here's the quotation from a link indicated in the bugtracker + // which explains why we need to manage RGB differently according to VB compatibility + // "In other words, the individual color components are stored in the opposite order one would expect. + // VB stores the red color component in the low-order byte of the long integer's low-order word, + // the green color in the high-order byte of the low-order word, and the blue color in the low-order byte of the high-order word" if( bCompatibility ) { nRGB = (nBlue << 16) | (nGreen << 8) | nRed; @@ -4055,7 +3919,7 @@ void SbRtl_RGB(StarBASIC *, SbxArray & rPar, bool) { nRGB = (nRed << 16) | (nGreen << 8) | nBlue; } - rPar.Get32(0)->PutLong( nRGB ); + rPar.Get(0)->PutLong(nRGB); } void SbRtl_QBColor(StarBASIC *, SbxArray & rPar, bool) @@ -4080,177 +3944,186 @@ void SbRtl_QBColor(StarBASIC *, SbxArray & rPar, bool) 0xFFFFFF, }; - if ( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - sal_Int16 nCol = rPar.Get32(1)->GetInteger(); + sal_Int16 nCol = rPar.Get(1)->GetInteger(); if( nCol < 0 || nCol > 15 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } sal_Int32 nRGB = pRGB[ nCol ]; - rPar.Get32(0)->PutLong( nRGB ); + rPar.Get(0)->PutLong(nRGB); } -// StrConv(string, conversion, LCID) -void SbRtl_StrConv(StarBASIC *, SbxArray & rPar, bool) +static std::vector<sal_uInt8> byteArray2Vec(SbxArray* pArr) { - const sal_uInt32 nArgCount = rPar.Count32()-1; - if( nArgCount < 2 || nArgCount > 3 ) + std::vector<sal_uInt8> result; + if (pArr) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + const sal_uInt32 nCount = pArr->Count(); + result.reserve(nCount + 1); // to avoid reallocation when padding in vbFromUnicode + for (sal_uInt32 i = 0; i < nCount; i++) + result.push_back(pArr->Get(i)->GetByte()); } + return result; +} - OUString aOldStr = rPar.Get32(1)->GetOUString(); - sal_Int32 nConversion = rPar.Get32(2)->GetLong(); +// Makes sure to get the byte array if passed, or the string converted to the bytes using +// StringToByteArray in basic/source/sbx/sbxstr.cxx +static std::vector<sal_uInt8> getByteArray(SbxValue& val) +{ + if (val.GetFullType() == SbxOBJECT) + if (auto pObj = val.GetObject()) + if (pObj->GetType() == (SbxARRAY | SbxBYTE)) + if (auto pArr = dynamic_cast<SbxArray*>(pObj)) + return byteArray2Vec(pArr); - sal_Int32 nOldLen = aOldStr.getLength(); - if( nOldLen == 0 ) - { - // null string,return - rPar.Get32(0)->PutString(aOldStr); - return; - } + // Convert to string + tools::SvRef<SbxValue> pStringValue(new SbxValue(SbxSTRING)); + *pStringValue = val; - TransliterationFlags nType = TransliterationFlags::NONE; - if ( (nConversion & 0x03) == 3 ) // vbProperCase - { - const CharClass& rCharClass = GetCharClass(); - aOldStr = rCharClass.titlecase( aOldStr.toAsciiLowerCase(), 0, nOldLen ); - } - else if ( (nConversion & 0x01) == 1 ) // vbUpperCase - { - nType |= TransliterationFlags::LOWERCASE_UPPERCASE; - } - else if ( (nConversion & 0x02) == 2 ) // vbLowerCase - { - nType |= TransliterationFlags::UPPERCASE_LOWERCASE; - } - if ( (nConversion & 0x04) == 4 ) // vbWide - { - nType |= TransliterationFlags::HALFWIDTH_FULLWIDTH; - } - else if ( (nConversion & 0x08) == 8 ) // vbNarrow - { - nType |= TransliterationFlags::FULLWIDTH_HALFWIDTH; - } - if ( (nConversion & 0x10) == 16) // vbKatakana + // Convert string to byte array + tools::SvRef<SbxValue> pValue(new SbxValue(SbxOBJECT)); + pValue->PutObject(new SbxArray(SbxBYTE)); + *pValue = *pStringValue; // Does the magic of conversion of strings to byte arrays + return byteArray2Vec(dynamic_cast<SbxArray*>(pValue->GetObject())); +} + +// StrConv(string, conversion, LCID) +void SbRtl_StrConv(StarBASIC *, SbxArray & rPar, bool) +{ + const sal_uInt32 nArgCount = rPar.Count() - 1; + if( nArgCount < 2 || nArgCount > 3 ) { - nType |= TransliterationFlags::HIRAGANA_KATAKANA; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - else if ( (nConversion & 0x20) == 32 ) // vbHiragana + + sal_Int32 nConversion = rPar.Get(2)->GetLong(); + LanguageType nLanguage = LANGUAGE_SYSTEM; + if (nArgCount == 3) { - nType |= TransliterationFlags::KATAKANA_HIRAGANA; + sal_Int32 lcid = rPar.Get(3)->GetLong(); + nLanguage = LanguageType(lcid); } - OUString aNewStr( aOldStr ); - if( nType != TransliterationFlags::NONE ) + + if (nConversion == ooo::vba::VbStrConv::vbUnicode) // This mode does not combine { - uno::Reference< uno::XComponentContext > xContext = getProcessComponentContext(); - ::utl::TransliterationWrapper aTransliterationWrapper( xContext, nType ); - uno::Sequence<sal_Int32> aOffsets; - LanguageType nLanguage = LANGUAGE_SYSTEM; - aTransliterationWrapper.loadModuleIfNeeded( nLanguage ); - aNewStr = aTransliterationWrapper.transliterate( aOldStr, nLanguage, 0, nOldLen, &aOffsets ); + // Assume that the passed byte array is encoded in the defined encoding, convert to + // UTF-16 and store as string. Passed strings are converted to byte array first. + auto inArray = getByteArray(*rPar.Get(1)); + std::string_view s(reinterpret_cast<char*>(inArray.data()), inArray.size() / sizeof(char)); + const auto encoding = utl_getWinTextEncodingFromLangStr(LanguageTag(nLanguage).getBcp47()); + OUString aOUStr = OStringToOUString(s, encoding); + rPar.Get(0)->PutString(aOUStr); + return; } - if ( (nConversion & 0x40) == 64 ) // vbUnicode + if (nConversion == ooo::vba::VbStrConv::vbFromUnicode) // This mode does not combine { - // convert the string to byte string, preserving unicode (2 bytes per character) - sal_Int32 nSize = aNewStr.getLength()*2; - const sal_Unicode* pSrc = aNewStr.getStr(); - std::unique_ptr<char[]> pChar(new char[nSize+1]); - for( sal_Int32 i=0; i < nSize; i++ ) + // Assume that the passed byte array is UTF-16-encoded (system-endian), convert to specified + // encoding and store as byte array. Passed strings are converted to byte array first. + auto inArray = getByteArray(*rPar.Get(1)); + while (inArray.size() % sizeof(sal_Unicode)) + inArray.push_back('\0'); + std::u16string_view s(reinterpret_cast<sal_Unicode*>(inArray.data()), + inArray.size() / sizeof(sal_Unicode)); + const auto encoding = utl_getWinTextEncodingFromLangStr(LanguageTag(nLanguage).getBcp47()); + OString aOStr = OUStringToOString(s, encoding); + const sal_Int32 lb = IsBaseIndexOne() ? 1 : 0; + const sal_Int32 ub = lb + aOStr.getLength() - 1; + SbxDimArray* pArray = new SbxDimArray(SbxBYTE); + pArray->unoAddDim(lb, ub); + + for (sal_Int32 i = 0; i < aOStr.getLength(); ++i) { - pChar[i] = static_cast< char >( (i%2) ? ((*pSrc) >> 8) & 0xff : (*pSrc) & 0xff ); - if( i%2 ) - { - pSrc++; - } + SbxVariable* pNew = new SbxVariable(SbxBYTE); + pNew->PutByte(aOStr[i]); + pArray->Put(pNew, i); } - pChar[nSize] = '\0'; - OString aOStr(pChar.get()); - // there is no concept about default codepage in unix. so it is incorrectly in unix - OUString aOUStr = OStringToOUString(aOStr, osl_getThreadTextEncoding()); - rPar.Get32(0)->PutString( aOUStr ); + SbxVariable* retVar = rPar.Get(0); + SbxFlagBits nFlags = retVar->GetFlags(); + retVar->ResetFlag(SbxFlagBits::Fixed); + retVar->PutObject(pArray); + retVar->SetFlags(nFlags); + retVar->SetParameters(nullptr); return; } - else if ( (nConversion & 0x80) == 128 ) // vbFromUnicode + + std::vector<TransliterationFlags> aTranslitSet; + auto check = [&nConversion, &aTranslitSet](sal_Int32 conv, TransliterationFlags flag) { - // there is no concept about default codepage in unix. so it is incorrectly in unix - OString aOStr = OUStringToOString(aNewStr,osl_getThreadTextEncoding()); - const char* pChar = aOStr.getStr(); - sal_Int32 nArraySize = aOStr.getLength(); - SbxDimArray* pArray = new SbxDimArray(SbxBYTE); - bool bIncIndex = IsBaseIndexOne(); - if(nArraySize) + if ((nConversion & conv) != conv) + return false; + + aTranslitSet.push_back(flag); + nConversion &= ~conv; + return true; + }; + + // Check mutually exclusive bits together + + if (!check(ooo::vba::VbStrConv::vbProperCase, TransliterationFlags::TITLE_CASE)) + if (!check(ooo::vba::VbStrConv::vbUpperCase, TransliterationFlags::LOWERCASE_UPPERCASE)) + check(ooo::vba::VbStrConv::vbLowerCase, TransliterationFlags::UPPERCASE_LOWERCASE); + + if (!check(ooo::vba::VbStrConv::vbWide, TransliterationFlags::HALFWIDTH_FULLWIDTH)) + check(ooo::vba::VbStrConv::vbNarrow, TransliterationFlags::FULLWIDTH_HALFWIDTH); + + if (!check(ooo::vba::VbStrConv::vbKatakana, TransliterationFlags::HIRAGANA_KATAKANA)) + check(ooo::vba::VbStrConv::vbHiragana, TransliterationFlags::KATAKANA_HIRAGANA); + + if (nConversion) // unknown / incorrectly combined bits + return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT); + + OUString aStr = rPar.Get(1)->GetOUString(); + if (!aStr.isEmpty() && !aTranslitSet.empty()) + { + uno::Reference< uno::XComponentContext > xContext = getProcessComponentContext(); + + for (auto transliterationFlag : aTranslitSet) { - if( bIncIndex ) + if (transliterationFlag == TransliterationFlags::TITLE_CASE) { - pArray->AddDim32( 1, nArraySize ); + // TransliterationWrapper only handles the first character of the passed string + // when handling TITLE_CASE; see Transliteration_titlecase::transliterateImpl in + // i18npool/source/transliteration/transliteration_body.cxx + CharClass aCharClass{ xContext, LanguageTag(nLanguage) }; + aStr = aCharClass.titlecase(aCharClass.lowercase(aStr)); } else { - pArray->AddDim32( 0, nArraySize-1 ); + utl::TransliterationWrapper aWrapper(xContext, transliterationFlag); + aStr = aWrapper.transliterate(aStr, nLanguage, 0, aStr.getLength(), nullptr); } } - else - { - pArray->unoAddDim32( 0, -1 ); - } - - for( sal_Int32 i=0; i< nArraySize; i++) - { - SbxVariable* pNew = new SbxVariable( SbxBYTE ); - pNew->PutByte(*pChar); - pChar++; - pNew->SetFlag( SbxFlagBits::Write ); - sal_Int32 aIdx[1]; - aIdx[0] = i; - if( bIncIndex ) - { - ++aIdx[0]; - } - pArray->Put32(pNew, aIdx); - } - - SbxVariableRef refVar = rPar.Get32(0); - SbxFlagBits nFlags = refVar->GetFlags(); - refVar->ResetFlag( SbxFlagBits::Fixed ); - refVar->PutObject( pArray ); - refVar->SetFlags( nFlags ); - refVar->SetParameters( nullptr ); - return; } - rPar.Get32(0)->PutString(aNewStr); + + rPar.Get(0)->PutString(aStr); } void SbRtl_Beep(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 1 ) + if (rPar.Count() != 1) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } Sound::Beep(); } void SbRtl_Load(StarBASIC *, SbxArray & rPar, bool) { - if( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - SbxBase* pObj = rPar.Get32(1)->GetObject(); + SbxBase* pObj = rPar.Get(1)->GetObject(); if ( !pObj ) return; @@ -4270,15 +4143,14 @@ void SbRtl_Load(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Unload(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - if( rPar.Count32() != 2 ) + rPar.Get(0)->PutEmpty(); + if (rPar.Count() != 2) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - SbxBase* pObj = rPar.Get32(1)->GetObject(); + SbxBase* pObj = rPar.Get(1)->GetObject(); if ( !pObj ) return; @@ -4298,13 +4170,12 @@ void SbRtl_Unload(StarBASIC *, SbxArray & rPar, bool) void SbRtl_LoadPicture(StarBASIC *, SbxArray & rPar, bool) { - if( rPar.Count32() != 2 ) + if (rPar.Count() != 2) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - OUString aFileURL = getFullPath( rPar.Get32(1)->GetOUString() ); + OUString aFileURL = getFullPath(rPar.Get(1)->GetOUString()); std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aFileURL, StreamMode::READ )); if( pStream ) { @@ -4315,23 +4186,22 @@ void SbRtl_LoadPicture(StarBASIC *, SbxArray & rPar, bool) SbxObjectRef xRef = new SbStdPicture; static_cast<SbStdPicture*>(xRef.get())->SetGraphic( aGraphic ); - rPar.Get32(0)->PutObject( xRef.get() ); + rPar.Get(0)->PutObject(xRef.get()); } } void SbRtl_SavePicture(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - if( rPar.Count32() != 3 ) + rPar.Get(0)->PutEmpty(); + if (rPar.Count() != 3) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - SbxBase* pObj = rPar.Get32(1)->GetObject(); + SbxBase* pObj = rPar.Get(1)->GetObject(); if (SbStdPicture *pPicture = dynamic_cast<SbStdPicture*>(pObj)) { - SvFileStream aOStream( rPar.Get32(2)->GetOUString(), StreamMode::WRITE | StreamMode::TRUNC ); + SvFileStream aOStream(rPar.Get(2)->GetOUString(), StreamMode::WRITE | StreamMode::TRUNC); const Graphic& aGraphic = pPicture->GetGraphic(); TypeSerializer aSerializer(aOStream); aSerializer.writeGraphic(aGraphic); @@ -4340,15 +4210,20 @@ void SbRtl_SavePicture(StarBASIC *, SbxArray & rPar, bool) void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool) { - const sal_uInt32 nArgCount = rPar.Count32(); + const sal_uInt32 nArgCount = rPar.Count(); if( nArgCount < 2 || nArgCount > 6 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + } + + // tdf#147529 - check for missing parameters + if (IsMissing(rPar, 1)) + { + return StarBASIC::Error(ERRCODE_BASIC_NOT_OPTIONAL); } - WinBits nType = 0; // MB_OK - if( nArgCount >= 3 ) - nType = static_cast<WinBits>(rPar.Get32(2)->GetInteger()); + + // tdf#151012 - initialize optional parameters with their default values (number of buttons) + WinBits nType = static_cast<WinBits>(GetOptionalIntegerParamOrDefault(rPar, 2, 0)); // MB_OK WinBits nStyle = nType; nStyle &= 15; // delete bits 4-16 if (nStyle > 5) @@ -4365,22 +4240,14 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool) No = 7 }; - OUString aMsg = rPar.Get32(1)->GetOUString(); - OUString aTitle; - if( nArgCount >= 4 ) - { - aTitle = rPar.Get32(3)->GetOUString(); - } - else - { - aTitle = Application::GetDisplayName(); - } + OUString aMsg = rPar.Get(1)->GetOUString(); + // tdf#151012 - initialize optional parameters with their default values (title of dialog box) + OUString aTitle = GetOptionalOUStringParamOrDefault(rPar, 3, Application::GetDisplayName()); WinBits nDialogType = nType & (16+32+64); SolarMutexGuard aSolarGuard; - vcl::Window* pParentWin = Application::GetDefDialogParent(); - weld::Widget* pParent = pParentWin ? pParentWin->GetFrameWeld() : nullptr; + weld::Widget* pParent = Application::GetDefDialogParent(); VclMessageType eType = VclMessageType::Other; @@ -4401,7 +4268,7 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool) } std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(pParent, - eType, VclButtonsType::NONE, aMsg)); + eType, VclButtonsType::NONE, aMsg, GetpApp())); switch (nStyle) { @@ -4467,16 +4334,16 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool) xBox->set_title(aTitle); sal_Int16 nRet = xBox->run(); - rPar.Get32(0)->PutInteger(nRet); + rPar.Get(0)->PutInteger(nRet); } void SbRtl_SetAttr(StarBASIC *, SbxArray & rPar, bool) { - rPar.Get32(0)->PutEmpty(); - if ( rPar.Count32() == 3 ) + rPar.Get(0)->PutEmpty(); + if (rPar.Count() == 3) { - OUString aStr = rPar.Get32(1)->GetOUString(); - SbAttributes nFlags = static_cast<SbAttributes>( rPar.Get32(2)->GetInteger() ); + OUString aStr = rPar.Get(1)->GetOUString(); + SbAttributes nFlags = static_cast<SbAttributes>(rPar.Get(2)->GetInteger()); if( hasUno() ) { @@ -4514,7 +4381,7 @@ void SbRtl_Reset(StarBASIC *, SbxArray &, bool) void SbRtl_DumpAllObjects(StarBASIC * pBasic, SbxArray & rPar, bool) { - const sal_uInt32 nArgCount = rPar.Count32(); + const sal_uInt32 nArgCount = rPar.Count(); if( nArgCount < 2 || nArgCount > 3 ) { StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); @@ -4530,9 +4397,9 @@ void SbRtl_DumpAllObjects(StarBASIC * pBasic, SbxArray & rPar, bool) { p = p->GetParent(); } - SvFileStream aStrm( rPar.Get32(1)->GetOUString(), + SvFileStream aStrm(rPar.Get(1)->GetOUString(), StreamMode::WRITE | StreamMode::TRUNC ); - p->Dump( aStrm, rPar.Get32(2)->GetBool() ); + p->Dump(aStrm, rPar.Get(2)->GetBool()); aStrm.Close(); if( aStrm.GetError() != ERRCODE_NONE ) { @@ -4544,9 +4411,9 @@ void SbRtl_DumpAllObjects(StarBASIC * pBasic, SbxArray & rPar, bool) void SbRtl_FileExists(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() == 2 ) + if (rPar.Count() == 2) { - OUString aStr = rPar.Get32(1)->GetOUString(); + OUString aStr = rPar.Get(1)->GetOUString(); bool bExists = false; if( hasUno() ) @@ -4570,7 +4437,7 @@ void SbRtl_FileExists(StarBASIC *, SbxArray & rPar, bool) FileBase::RC nRet = DirectoryItem::get( getFullPath( aStr ), aItem ); bExists = (nRet == FileBase::E_None); } - rPar.Get32(0)->PutBool( bExists ); + rPar.Get(0)->PutBool(bExists); } else { @@ -4580,21 +4447,19 @@ void SbRtl_FileExists(StarBASIC *, SbxArray & rPar, bool) void SbRtl_Partition(StarBASIC *, SbxArray & rPar, bool) { - if ( rPar.Count32() != 5 ) + if (rPar.Count() != 5) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } - sal_Int32 nNumber = rPar.Get32(1)->GetLong(); - sal_Int32 nStart = rPar.Get32(2)->GetLong(); - sal_Int32 nStop = rPar.Get32(3)->GetLong(); - sal_Int32 nInterval = rPar.Get32(4)->GetLong(); + sal_Int32 nNumber = rPar.Get(1)->GetLong(); + sal_Int32 nStart = rPar.Get(2)->GetLong(); + sal_Int32 nStop = rPar.Get(3)->GetLong(); + sal_Int32 nInterval = rPar.Get(4)->GetLong(); if( nStart < 0 || nStop <= nStart || nInterval < 1 ) { - StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); - return; + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); } // the Partition function inserts leading spaces before lowervalue and uppervalue @@ -4645,7 +4510,7 @@ void SbRtl_Partition(StarBASIC *, SbxArray & rPar, bool) aRetStr.append(" "); } } - aRetStr.append( aLowerValue ).append(":"); + aRetStr.append( aLowerValue + ":"); if( nLen > nLen2 ) { // appending the leading spaces for the uppervalue @@ -4655,33 +4520,15 @@ void SbRtl_Partition(StarBASIC *, SbxArray & rPar, bool) } } aRetStr.append( aUpperValue ); - rPar.Get32(0)->PutString( aRetStr.makeStringAndClear()); + rPar.Get(0)->PutString(aRetStr.makeStringAndClear()); } #endif -static tools::Long GetDayDiff( const Date& rDate ) -{ - Date aRefDate( 1,1,1900 ); - tools::Long nDiffDays; - if ( aRefDate > rDate ) - { - nDiffDays = aRefDate - rDate; - nDiffDays *= -1; - } - else - { - nDiffDays = rDate - aRefDate; - } - nDiffDays += 2; // adjustment VisualBasic: 1.Jan.1900 == 2 - return nDiffDays; -} - sal_Int16 implGetDateYear( double aDate ) { - Date aRefDate( 1,1,1900 ); - tools::Long nDays = static_cast<tools::Long>(aDate); - nDays -= 2; // standardize: 1.1.1900 => 0.0 + Date aRefDate(1899'12'30); + sal_Int32 nDays = static_cast<sal_Int32>(aDate); aRefDate.AddDays( nDays ); sal_Int16 nRet = aRefDate.GetYear(); return nRet; @@ -4711,11 +4558,13 @@ bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, else #endif { - if ( 0 <= nYear && nYear < 100 && (bUseTwoDigitYear + if ( 0 <= nYear && nYear < 100 && #if HAVE_FEATURE_SCRIPTING - || SbiRuntime::isVBAEnabled() + (bUseTwoDigitYear || SbiRuntime::isVBAEnabled()) +#else + bUseTwoDigitYear #endif - ) ) + ) { nYear += 1900; } @@ -4791,8 +4640,7 @@ bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, } } - tools::Long nDiffDays = GetDayDiff( aCurDate ); - rdRet = static_cast<double>(nDiffDays); + rdRet = GetDayDiff(aCurDate); return true; } |