summaryrefslogtreecommitdiff
path: root/basic/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 13:29:43 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 13:29:43 +0000
commit0755ef18090d219407d39d564a2f8ea172e34fbf (patch)
tree0672ffe0bcc88f4bbd84c0b2e7aa7e7d777cd02b /basic/source
parent5488d7f882a09a9a004028eeba973ed9716434af (diff)
INTEGRATION: CWS sb59 (1.69.8); FILE MERGED
2006/08/18 18:44:39 sb 1.69.8.2: RESYNC: (1.69-1.70); FILE MERGED 2006/08/11 15:04:29 sb 1.69.8.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'basic/source')
-rw-r--r--basic/source/runtime/methods.cxx27
1 files changed, 13 insertions, 14 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d6d5dceba6d9..c443135171ad 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: methods.cxx,v $
*
- * $Revision: 1.71 $
+ * $Revision: 1.72 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 10:05:16 $
+ * last change: $Author: obo $ $Date: 2006-10-12 14:29:43 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -77,12 +77,6 @@
#include <i18npool/lang.h>
#endif
-#if defined (WNT)
-#ifndef _SVWIN_H
-#include <tools/svwin.h>
-#endif
-#endif
-
#include "runtime.hxx"
#include "sbunoobj.hxx"
#ifdef _OLD_FILE_IMPL
@@ -1565,7 +1559,7 @@ RTLFUNC(StrComp)
nTextCompare = !nTextCompare;
StringCompare aResult;
- int nRetValue = 0;
+ sal_Int32 nRetValue = 0;
if( nTextCompare )
{
::utl::TransliterationWrapper* pTransliterationWrapper = GetSbData()->pTransliterationWrapper;
@@ -1592,7 +1586,7 @@ RTLFUNC(StrComp)
nRetValue = 1;
}
- rPar.Get(0)->PutInteger( nRetValue );
+ rPar.Get(0)->PutInteger( sal::static_int_cast< INT16 >( nRetValue ) );
}
RTLFUNC(String)
@@ -3317,12 +3311,16 @@ RTLFUNC(Shell)
std::list<String> aTokenList;
String aToken;
USHORT i = 0;
- char c;
+ sal_Unicode c;
while( i < nLen )
{
// Spaces weg
- while( ( c = aCmdLine.GetBuffer()[ i ] ) == ' ' || c == '\t' )
- i++;
+ for ( ;; ++i )
+ {
+ c = aCmdLine.GetBuffer()[ i ];
+ if ( c != ' ' && c != '\t' )
+ break;
+ }
if( c == '\"' || c == '\'' )
{
@@ -3399,7 +3397,8 @@ RTLFUNC(Shell)
iter++;
- USHORT nParamCount = aTokenList.size() - 1;
+ USHORT nParamCount = sal::static_int_cast< USHORT >(
+ aTokenList.size() - 1 );
::rtl::OUString* pArgumentList = NULL;
//const char** pParamList = NULL;
if( nParamCount )