1 files changed, 10 insertions, 10 deletions
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index f69c4c468111..791c267cda44 100644
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -65,7 +65,7 @@ TYPEINIT1(MyBasic,StarBASIC)
 class MyFactory : public SbxFactory
 {
 public:
-    virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+    virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
 };
 
 static SampleObjectFac aFac1;
@@ -73,7 +73,7 @@ static MyFactory aFac2;
 static ProcessFactory aProcessFac;
 static short nInst = 0;
 
-SbxBase* MyFactory::Create( UINT16 nSbxId, UINT32 nCr )
+SbxBase* MyFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCr )
 {
     if( nCr == SBXCR_TEST && nSbxId == SBXID_MYBASIC )
         return new MyBasic;
@@ -156,7 +156,7 @@ void MyBasic::LoadIniFile()
 {
 }
 
-SbTextType MyBasic::GetSymbolType( const String &rSymbol, BOOL bWasTTControl )
+SbTextType MyBasic::GetSymbolType( const String &rSymbol, sal_Bool bWasTTControl )
 {
     (void) rSymbol;       /* avoid warning about unused parameter */
     (void) bWasTTControl; /* avoid warning about unused parameter */
@@ -181,13 +181,13 @@ void MyBasic::Reset()
     nError = 0;
 }
 
-BOOL MyBasic::Compile( SbModule* p )
+sal_Bool MyBasic::Compile( SbModule* p )
 {
     Reset();
     return StarBASIC::Compile( p );
 }
 
-BOOL MyBasic::ErrorHdl()
+sal_Bool MyBasic::ErrorHdl()
 {
     AppBasEd* pWin = aBasicApp.pFrame->FindModuleWin( GetActiveModule()->GetName() );
     if( !pWin )
@@ -204,12 +204,12 @@ BOOL MyBasic::ErrorHdl()
               0, StarBASIC::GetErrorText(), GetLine(), GetCol1(), GetCol2() ),
               LIST_APPEND );
         nError++;
-        return BOOL( nError < 20 ); // Cancel after 20 errors
+        return sal_Bool( nError < 20 ); // Cancel after 20 errors
     }
     else
     {
         ReportRuntimeError( pWin );
-        return FALSE;
+        return sal_False;
     }
 }
 
@@ -226,7 +226,7 @@ void MyBasic::ReportRuntimeError( AppBasEd *pEditWin )
         GetCol1(), GetCol2() ).Show();
 }
 
-void MyBasic::DebugFindNoErrors( BOOL bDebugFindNoErrors )
+void MyBasic::DebugFindNoErrors( sal_Bool bDebugFindNoErrors )
 {
     (void) bDebugFindNoErrors; /* avoid warning about unused parameter */
 }
@@ -236,7 +236,7 @@ const String MyBasic::GetSpechialErrorText()
     return GetErrorText();
 }
 
-USHORT MyBasic::BreakHdl()
+sal_uInt16 MyBasic::BreakHdl()
 {
     SbModule* pMod = GetActiveModule();
     if( pMod )
@@ -270,7 +270,7 @@ USHORT MyBasic::BreakHdl()
 ***************************************************************************/
 
 BasicError::BasicError
-    ( AppBasEd* w, USHORT nE, const String& r, USHORT nL, USHORT nC1, USHORT nC2 )
+    ( AppBasEd* w, sal_uInt16 nE, const String& r, sal_uInt16 nL, sal_uInt16 nC1, sal_uInt16 nC2 )
     : aText( SttResId( IDS_ERROR1 ) )
 {
     pWin  = w;