CWS gnumake3: pull in cws removetooltypes01

1 files changed, 20 insertions, 20 deletions

diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 3a3a162f5b5e..a5ee2a0aba19 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -61,7 +61,7 @@ namespace css = ::com::sun::star;
 
 IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
 {
-    ShowObjectDialog( FALSE, TRUE );
+    ShowObjectDialog( sal_False, sal_True );
     return 0;
 }
 IMPL_LINK_INLINE_END( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
@@ -90,11 +90,11 @@ Reference< view::XRenderable > BasicIDEShell::GetRenderable()
 }
 
 #if 0
-USHORT __EXPORT BasicIDEShell::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog )
+sal_uInt16 __EXPORT BasicIDEShell::Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog )
 {
     if ( pCurWin )
     {
-        SfxPrinter* pPrinter = GetPrinter( TRUE );
+        SfxPrinter* pPrinter = GetPrinter( sal_True );
         if ( pPrinter )
         {
             SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog );
@@ -105,19 +105,19 @@ USHORT __EXPORT BasicIDEShell::Print( SfxProgress &rProgress, BOOL bIsAPI, Print
 }
 #endif
 
-BOOL BasicIDEShell::HasSelection( BOOL /* bText */ ) const
+sal_Bool BasicIDEShell::HasSelection( sal_Bool /* bText */ ) const
 {
-    BOOL bSel = FALSE;
+    sal_Bool bSel = sal_False;
     if ( pCurWin && pCurWin->ISA( ModulWindow ) )
     {
         TextView* pEditView = ((ModulWindow*)pCurWin)->GetEditView();
         if ( pEditView && pEditView->HasSelection() )
-            bSel = TRUE;
+            bSel = sal_True;
     }
     return bSel;
 }
 
-String BasicIDEShell::GetSelectionText( BOOL bWholeWord )
+String BasicIDEShell::GetSelectionText( sal_Bool bWholeWord )
 {
     String aText;
     if ( pCurWin && pCurWin->ISA( ModulWindow ) )
@@ -143,7 +143,7 @@ String BasicIDEShell::GetSelectionText( BOOL bWholeWord )
     return aText;
 }
 
-SfxPrinter* __EXPORT BasicIDEShell::GetPrinter( BOOL bCreate )
+SfxPrinter* __EXPORT BasicIDEShell::GetPrinter( sal_Bool bCreate )
 {
     if ( pCurWin ) // && pCurWin->ISA( ModulWindow ) )
     {
@@ -154,7 +154,7 @@ SfxPrinter* __EXPORT BasicIDEShell::GetPrinter( BOOL bCreate )
     return 0;
 }
 
-USHORT __EXPORT BasicIDEShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags, bool )
+sal_uInt16 __EXPORT BasicIDEShell::SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags, bool )
 {
     (void)nDiffFlags;
     BasicDocShell* pDocShell = (BasicDocShell*)GetViewFrame()->GetObjectShell();
@@ -194,7 +194,7 @@ void BasicIDEShell::SetMDITitle()
         if ( pShell && aTitle != pShell->GetTitle( SFX_TITLE_CAPTION ) )
         {
             pShell->SetTitle( aTitle );
-            pShell->SetModified( FALSE );
+            pShell->SetModified( sal_False );
         }
 
         css::uno::Reference< css::frame::XController > xController = GetController ();
@@ -227,9 +227,9 @@ void BasicIDEShell::CreateModulWindowLayout()
 
 ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName )
 {
-    bCreatingWindow = TRUE;
+    bCreatingWindow = sal_True;
 
-    ULONG nKey = 0;
+    sal_uLong nKey = 0;
     ModulWindow* pWin = 0;
 
     String aLibName( rLibName );
@@ -244,7 +244,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
         aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
 
     // Vielleicht gibt es ein suspendiertes?
-    pWin = FindBasWin( rDocument, aLibName, aModName, FALSE, TRUE );
+    pWin = FindBasWin( rDocument, aLibName, aModName, sal_False, sal_True );
 
     if ( !pWin )
     {
@@ -253,11 +253,11 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
         if ( rDocument.hasModule( aLibName, aModName ) )
             bSuccess = rDocument.getModule( aLibName, aModName, aModule );
         else
-            bSuccess = rDocument.createModule( aLibName, aModName, TRUE, aModule );
+            bSuccess = rDocument.createModule( aLibName, aModName, sal_True, aModule );
 
         if ( bSuccess )
         {
-            pWin = FindBasWin( rDocument, aLibName, aModName, FALSE, TRUE );
+            pWin = FindBasWin( rDocument, aLibName, aModName, sal_False, sal_True );
             if( !pWin )
             {
                 // new module window
@@ -291,17 +291,17 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
             aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
         }
     }
-    pTabBar->InsertPage( (USHORT)nKey, aModName );
+    pTabBar->InsertPage( (sal_uInt16)nKey, aModName );
     pTabBar->Sort();
     pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar );
     if ( !pCurWin )
-        SetCurWindow( pWin, FALSE, FALSE );
+        SetCurWindow( pWin, sal_False, sal_False );
 
-    bCreatingWindow = FALSE;
+    bCreatingWindow = sal_False;
     return pWin;
 }
 
-ModulWindow* BasicIDEShell::FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, BOOL bCreateIfNotExist, BOOL bFindSuspended )
+ModulWindow* BasicIDEShell::FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, sal_Bool bCreateIfNotExist, sal_Bool bFindSuspended )
 {
     ModulWindow* pModWin = 0;
     IDEBaseWindow* pWin = aIDEWindowTable.First();
@@ -331,7 +331,7 @@ void __EXPORT BasicIDEShell::Move()
 void __EXPORT BasicIDEShell::ShowCursor( FASTBOOL bOn )
 {
     if ( pCurWin && pCurWin->ISA( ModulWindow ) )
-        ((ModulWindow*)pCurWin)->ShowCursor( (BOOL)bOn );
+        ((ModulWindow*)pCurWin)->ShowCursor( (sal_Bool)bOn );
 }
 
 // Hack for #101048