From 642cfe8ac206af4fe82bc695d38b5c7f0edf7dc7 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Mon, 10 Jan 2011 14:40:57 +0100
Subject: removetooltypes01: #i112600# adjust basic and scaddins

---
 basic/source/sbx/sbxconv.hxx | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'basic/source/sbx/sbxconv.hxx')

diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index 16fec542cded..61edeef3a4fa 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -33,19 +33,19 @@
 class SbxArray;
 
 // SBXSCAN.CXX
-extern void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, BOOL bCoreString=FALSE );
+extern void ImpCvtNum( double nNum, short nPrec, ::rtl::OUString& rRes, sal_Bool bCoreString=sal_False );
 extern SbxError ImpScan
-    ( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, USHORT* pLen,
-      BOOL bAllowIntntl=FALSE, BOOL bOnlyIntntl=FALSE );
+    ( const ::rtl::OUString& rSrc, double& nVal, SbxDataType& rType, sal_uInt16* pLen,
+      sal_Bool bAllowIntntl=sal_False, sal_Bool bOnlyIntntl=sal_False );
 
-// mit erweiterter Auswertung (International, "TRUE"/"FALSE")
-extern BOOL ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
+// mit erweiterter Auswertung (International, "sal_True"/"sal_False")
+extern sal_Bool ImpConvStringExt( ::rtl::OUString& rSrc, SbxDataType eTargetType );
 
 // SBXINT.CXX
 
 double      ImpRound( double );
-INT16       ImpGetInteger( const SbxValues* );
-void        ImpPutInteger( SbxValues*, INT16 );
+sal_Int16       ImpGetInteger( const SbxValues* );
+void        ImpPutInteger( SbxValues*, sal_Int16 );
 sal_Int64   ImpGetInt64( const SbxValues* );
 void        ImpPutInt64( SbxValues*, sal_Int64 );
 sal_uInt64  ImpGetUInt64( const SbxValues* );
@@ -57,8 +57,8 @@ double      ImpSalUInt64ToDouble( sal_uInt64 n );
 
 // SBXLNG.CXX
 
-INT32   ImpGetLong( const SbxValues* );
-void    ImpPutLong( SbxValues*, INT32 );
+sal_Int32   ImpGetLong( const SbxValues* );
+void    ImpPutLong( SbxValues*, sal_Int32 );
 
 // SBXSNG.CXX
 
@@ -68,7 +68,7 @@ void    ImpPutSingle( SbxValues*, float );
 // SBXDBL.CXX
 
 double  ImpGetDouble( const SbxValues* );
-void    ImpPutDouble( SbxValues*, double, BOOL bCoreString=FALSE );
+void    ImpPutDouble( SbxValues*, double, sal_Bool bCoreString=sal_False );
 
 #if FALSE
 // SBX64.CXX
@@ -87,10 +87,10 @@ SbxINT64  ImpDoubleToINT64( double );
 double    ImpINT64ToDouble( const SbxINT64& );
 
 #if TRUE
-INT32     ImpGetCurrLong( const SbxValues* );
-void      ImpPutCurrLong( SbxValues*, INT32 );
-INT32     ImpDoubleToCurrLong( double );
-double    ImpCurrLongToDouble( INT32 );
+sal_Int32     ImpGetCurrLong( const SbxValues* );
+void      ImpPutCurrLong( SbxValues*, sal_Int32 );
+sal_Int32     ImpDoubleToCurrLong( double );
+double    ImpCurrLongToDouble( sal_Int32 );
 #endif
 
 SbxINT64  ImpGetCurrency( const SbxValues* );
@@ -126,23 +126,23 @@ sal_Unicode ImpGetChar( const SbxValues* );
 void    ImpPutChar( SbxValues*, sal_Unicode );
 
 // SBXBYTE.CXX
-BYTE    ImpGetByte( const SbxValues* );
-void    ImpPutByte( SbxValues*, BYTE );
+sal_uInt8   ImpGetByte( const SbxValues* );
+void    ImpPutByte( SbxValues*, sal_uInt8 );
 
 // SBXUINT.CXX
 
-UINT16  ImpGetUShort( const SbxValues* );
-void    ImpPutUShort( SbxValues*, UINT16 );
+sal_uInt16  ImpGetUShort( const SbxValues* );
+void    ImpPutUShort( SbxValues*, sal_uInt16 );
 
 // SBXULNG.CXX
 
-UINT32  ImpGetULong( const SbxValues* );
-void    ImpPutULong( SbxValues*, UINT32 );
+sal_uInt32  ImpGetULong( const SbxValues* );
+void    ImpPutULong( SbxValues*, sal_uInt32 );
 
 // SBXBOOL.CXX
 
 enum SbxBOOL ImpGetBool( const SbxValues* );
-void    ImpPutBool( SbxValues*, INT16 );
+void    ImpPutBool( SbxValues*, sal_Int16 );
 
 // ByteArry <--> String
 SbxArray* StringToByteArray(const ::rtl::OUString& rStr);
-- 
cgit