INTEGRATION: CWS sb59 (1.28.22); FILE MERGED

2006/08/11 15:04:30 sb 1.28.22.1: #i67487# Made code warning-free (wntmsci10).
This commit is contained in:
Oliver Bolte
2006-10-12 13:29:59 +00:00
parent 0755ef1809
commit b110dc371a

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: methods1.cxx,v $ * $RCSfile: methods1.cxx,v $
* *
* $Revision: 1.29 $ * $Revision: 1.30 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 10:05:29 $ * last change: $Author: obo $ $Date: 2006-10-12 14:29:59 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -200,7 +200,7 @@ RTLFUNC(CDec) // JSM
(void)bWrite; (void)bWrite;
#ifdef WNT #ifdef WNT
SbxDecimal* pDec; SbxDecimal* pDec = NULL;
if ( rPar.Count() == 2 ) if ( rPar.Count() == 2 )
{ {
SbxVariable *pSbxVariable = rPar.Get(1); SbxVariable *pSbxVariable = rPar.Get(1);
@@ -1938,7 +1938,7 @@ RTLFUNC(DateAdd)
INT32 lNumber = rPar.Get(2)->GetLong(); INT32 lNumber = rPar.Get(2)->GetLong();
double dDate = rPar.Get(3)->GetDate(); double dDate = rPar.Get(3)->GetDate();
double dNewDate; double dNewDate = 0;
if( pInfo->mbSimple ) if( pInfo->mbSimple )
{ {
double dAdd = pInfo->mdValue * lNumber; double dAdd = pInfo->mdValue * lNumber;
@@ -2020,7 +2020,7 @@ RTLFUNC(DateAdd)
StarBASIC::Error( SbERR_BAD_ARGUMENT ); StarBASIC::Error( SbERR_BAD_ARGUMENT );
return; return;
} }
int nCorrectionDay = nDay; INT16 nCorrectionDay = nDay;
while( nNewMonth > nTargetMonth ) while( nNewMonth > nTargetMonth )
{ {
nCorrectionDay--; nCorrectionDay--;