strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ab26 (1.66.10); FILE MERGED

Browse source 
2006/05/04 14:25:03 ab 1.66.10.4: #111951# Mid: Limit string replacement to original string len
2006/05/04 08:33:46 ab 1.66.10.3: #111951# Changed Mid runtime behaviour only for CompatibilityMode(true)
2006/04/27 10:55:15 ab 1.66.10.2: #111951# Mid as lvalue
2006/04/26 10:38:06 ab 1.66.10.1: #i61071# implStepRenameUCB(): Error if target file exists
This commit is contained in:
Rüdiger Timm 2006-05-05 07:50:04 +00:00
parent a4134442ae
commit e8deba22e8
1 changed files with 55 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
basic/source/runtime/methods.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: methods.cxx,v $
*
* $Revision: 1.67 $
* $Revision: 1.68 $
*
* last change: $Author: rt $ $Date: 2006-05-05 08:38:28 $
* last change: $Author: rt $ $Date: 2006-05-05 08:50:04 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -645,7 +645,11 @@ void implStepRenameUCB( const String& aSource, const String& aDest )
{
try
{
xSFI->move( getFullPath( aSource ), getFullPath( aDest ) );
String aDestFullPath = getFullPath( aDest );
if( xSFI->exists( aDestFullPath ) )
StarBASIC::Error( SbERR_FILE_EXISTS );
else
xSFI->move( getFullPath( aSource ), aDestFullPath );
}
catch( Exception & )
{
@ -1256,14 +1260,58 @@ RTLFUNC(Mid)
{
nStartPos--;
USHORT nLen = 0xffff;
bool bWriteNoLenParam = false;
if ( nArgCount == 3 || bWrite )
nLen = (USHORT)(rPar.Get(3)->GetLong() );
{
INT32 n = rPar.Get(3)->GetLong();
if( bWrite && n == -1 )
bWriteNoLenParam = true;
nLen = (USHORT)n;
}
String aResultStr;
if ( bWrite )
{
aResultStr = aArgStr;
aResultStr.Erase( nStartPos, nLen );
aResultStr.Insert(rPar.Get(4)->GetString(),0,nLen,nStartPos);
SbiInstance* pInst = pINST;
bool bCompatibility = ( pInst && pInst->IsCompatibility() );
if( bCompatibility )
{
USHORT nArgLen = aArgStr.Len();
if( nStartPos + 1 > nArgLen )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
String aReplaceStr = rPar.Get(4)->GetString();
USHORT nReplaceStrLen = aReplaceStr.Len();
USHORT nReplaceLen;
if( bWriteNoLenParam )
{
nReplaceLen = nReplaceStrLen;
}
else
{
nReplaceLen = nLen;
if( nReplaceLen > nReplaceStrLen )
nReplaceLen = nReplaceStrLen;
}
USHORT nReplaceEndPos = nStartPos + nReplaceLen;
if( nReplaceEndPos > nArgLen )
nReplaceLen -= (nReplaceEndPos - nArgLen);
aResultStr = aArgStr;
USHORT nErase = nReplaceLen;
aResultStr.Erase( nStartPos, nErase );
aResultStr.Insert( aReplaceStr, 0, nReplaceLen, nStartPos );
}
else
{
aResultStr = aArgStr;
aResultStr.Erase( nStartPos, nLen );
aResultStr.Insert(rPar.Get(4)->GetString(),0,nLen,nStartPos);
}
rPar.Get(1)->PutString( aResultStr );
}
else