1 files changed, 80 insertions, 80 deletions

diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index bd18d4176803..55e91ea879b5 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -45,19 +45,19 @@
 TextEditImp::TextEditImp( AppEdit* pParent, const WinBits& aBits )
 : Window( pParent, aBits )
 , pAppEdit( pParent )
-, bHighlightning( FALSE )
-, bDoSyntaxHighlight( FALSE )
-, bDelayHighlight( TRUE )
+, bHighlightning( sal_False )
+, bDoSyntaxHighlight( sal_False )
+, bDelayHighlight( sal_True )
 , nTipId( 0 )
-, bViewMoved( FALSE )
+, bViewMoved( sal_False )
 {
     pTextEngine = new TextEngine();
     pTextEngine->SetMaxTextLen( STRING_MAXLEN );
-    pTextEngine->EnableUndo( TRUE );
+    pTextEngine->EnableUndo( sal_True );
 
     pTextView = new TextView( pTextEngine, this );
     pTextEngine->InsertView( pTextView );
-    pTextEngine->SetModified( FALSE );
+    pTextEngine->SetModified( sal_False );
 
     aSyntaxIdleTimer.SetTimeout( 200 );
     aSyntaxIdleTimer.SetTimeoutHdl( LINK( this, TextEditImp, SyntaxTimerHdl ) );
@@ -80,10 +80,10 @@ TextEditImp::~TextEditImp()
     delete pTextEngine;
 }
 
-BOOL TextEditImp::ViewMoved()
+sal_Bool TextEditImp::ViewMoved()
 {
-    BOOL bOld = bViewMoved;
-    bViewMoved = FALSE;
+    sal_Bool bOld = bViewMoved;
+    bViewMoved = sal_False;
     return bOld;
 }
 
@@ -99,7 +99,7 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             pAppEdit->pVScroll->SetThumbPos( pTextView->GetStartDocPos().Y() );
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
                 ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->Scroll( 0, ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->GetCurYOffset() - pTextView->GetStartDocPos().Y() );
-            bViewMoved = TRUE;
+            bViewMoved = sal_True;
         }
         else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
         {
@@ -115,8 +115,8 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         }
         else if( rTextHint.GetId() == TEXT_HINT_TEXTFORMATTED )
         {
-            ULONG nWidth = pTextEngine->CalcTextWidth();
-            if ( (ULONG)nWidth != pAppEdit->nCurTextWidth )
+            sal_uIntPtr nWidth = pTextEngine->CalcTextWidth();
+            if ( (sal_uIntPtr)nWidth != pAppEdit->nCurTextWidth )
             {
                 pAppEdit->nCurTextWidth = nWidth;
                 if ( pAppEdit->pHScroll )
@@ -129,12 +129,12 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         else if( rTextHint.GetId() == TEXT_HINT_PARAINSERTED )
         {
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
-                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, TRUE );
+                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_True );
         }
         else if( rTextHint.GetId() == TEXT_HINT_PARAREMOVED )
         {
             if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
-                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, FALSE );
+                ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_False );
 
             // Itchy adaption for two signs at line ends instead of one (hard coded default)
             pTextEngine->SetMaxTextLen( STRING_MAXLEN - pTextEngine->GetParagraphCount() );
@@ -189,12 +189,12 @@ int TextAttribSpechial::operator==( const TextAttrib& rAttr ) const
                 ( maFontWeight == ((const TextAttribSpechial&)rAttr).maFontWeight ) );
 }
 
-void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
+void TextEditImp::ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff )
 {
     SbTextPortions aPortionList;
     pAppEdit->GetBasicFrame()->Basic().Highlight( rSource, aPortionList );
 
-    USHORT nCount = aPortionList.Count();
+    sal_uInt16 nCount = aPortionList.Count();
     if ( !nCount )
         return;
 
@@ -211,8 +211,8 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
     }
 
     // here is the postprocessing for types for the TestTool
-    USHORT i;
-    BOOL bWasTTControl = FALSE;
+    sal_uInt16 i;
+    sal_Bool bWasTTControl = sal_False;
     for ( i = 0; i < aPortionList.Count(); i++ )
     {
         SbTextPortion& r = aPortionList[i];
@@ -230,20 +230,20 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
                     r.eType = pAppEdit->GetBasicFrame()->Basic().GetSymbolType( aSymbol, bWasTTControl );
 
                     if ( r.eType == TT_CONTROL )
-                        bWasTTControl = TRUE;
+                        bWasTTControl = sal_True;
                     else
-                        bWasTTControl = FALSE;
+                        bWasTTControl = sal_False;
                 }
                 break;
             case SB_PUNCTUATION:
                 {
                      String aPunctuation = rSource.Copy( r.nStart, r.nEnd - r.nStart +1 );
                     if ( aPunctuation.CompareToAscii( "." ) != COMPARE_EQUAL )
-                        bWasTTControl = FALSE;
+                        bWasTTControl = sal_False;
                 }
                 break;
             default:
-                bWasTTControl = FALSE;
+                bWasTTControl = sal_False;
         }
     }
 
@@ -273,7 +273,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
                 r.nEnd = rSource.Len()-1;
         }
 
-    BOOL bWasModified = pTextEngine->IsModified();
+    sal_Bool bWasModified = pTextEngine->IsModified();
     for ( i = 0; i < aPortionList.Count(); i++ )
     {
         SbTextPortion& r = aPortionList[i];
@@ -283,7 +283,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
 
         SbTextType eCol = r.eType;
         Color aColor;
-        ULONG nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
+        sal_uIntPtr nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
         switch ( +eCol )
         {
             case SB_KEYWORD:
@@ -336,7 +336,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
     pTextEngine->SetModified( bWasModified );
 }
 
-void TextEditImp::DoSyntaxHighlight( ULONG nPara )
+void TextEditImp::DoSyntaxHighlight( sal_uIntPtr nPara )
 {
     // Due to delayed syntax highlight it can happend that the
         // paragraph does no longer exist
@@ -362,7 +362,7 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
     {
         if ( bDelayHighlight )
         {
-            aSyntaxLineTable.Insert( nPara, (void*)(ULONG)1 );
+            aSyntaxLineTable.Insert( nPara, (void*)(sal_uIntPtr)1 );
             aSyntaxIdleTimer.Start();
         }
         else
@@ -373,38 +373,38 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
 IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
 {
     DBG_ASSERT( pTextView, "Not yet a View but Syntax-Highlight ?!" );
-    pTextEngine->SetUpdateMode( FALSE );
+    pTextEngine->SetUpdateMode( sal_False );
 
-    bHighlightning = TRUE;
-    USHORT nLine;
+    bHighlightning = sal_True;
+    sal_uInt16 nLine;
     while ( aSyntaxLineTable.First() && !Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
     {
-        nLine = (USHORT)aSyntaxLineTable.GetCurKey();
+        nLine = (sal_uInt16)aSyntaxLineTable.GetCurKey();
         DoSyntaxHighlight( nLine );
         aSyntaxLineTable.Remove( nLine );
 /*      if ( Application::AnyInput() )
         {
             aSyntaxIdleTimer.Start();       // Starten, falls wir in einem Dialog landen
-            pTextView->ShowCursor( TRUE, TRUE );
-            pTextEngine->SetUpdateMode( TRUE );
-            bHighlightning = FALSE;
+            pTextView->ShowCursor( sal_True, sal_True );
+            pTextEngine->SetUpdateMode( sal_True );
+            bHighlightning = sal_False;
             GetpApp()->Reschedule();
-            bHighlightning = TRUE;
-            pTextEngine->SetUpdateMode( FALSE );
+            bHighlightning = sal_True;
+            pTextEngine->SetUpdateMode( sal_False );
         }*/
     }
 
-    BOOL bWasModified = pTextEngine->IsModified();
+    sal_Bool bWasModified = pTextEngine->IsModified();
     if ( aSyntaxLineTable.Count() > 3 )                 // Without VDev
     {
-        pTextEngine->SetUpdateMode( TRUE );
-        pTextView->ShowCursor( TRUE, TRUE );
+        pTextEngine->SetUpdateMode( sal_True );
+        pTextView->ShowCursor( sal_True, sal_True );
     }
     else
-        pTextEngine->SetUpdateMode( TRUE );             // ! With VDev
+        pTextEngine->SetUpdateMode( sal_True );             // ! With VDev
 //  pTextView->ForceUpdate();
 
-    // SetUpdateMode( TRUE ) soll kein Modify setzen
+    // SetUpdateMode( sal_True ) soll kein Modify setzen
     pTextEngine->SetModified( bWasModified );
 
     // SyntaxTimerHdl wird gerufen, wenn Text-Aenderung
@@ -413,7 +413,7 @@ IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
 //  nCurTextWidth = pTextEngine->CalcTextWidth();
 //  if ( nCurTextWidth != nPrevTextWidth )
 //      SetScrollBarRanges();
-    bHighlightning = FALSE;
+    bHighlightning = sal_False;
 
     if ( aSyntaxLineTable.First() )
         aImplSyntaxIdleTimer.Start();
@@ -430,7 +430,7 @@ void TextEditImp::InvalidateSyntaxHighlight()
         DoDelayedSyntaxHighlight( i );
 }
 
-void TextEditImp::SyntaxHighlight( BOOL bNew )
+void TextEditImp::SyntaxHighlight( sal_Bool bNew )
 {
     if ( ( bNew && bDoSyntaxHighlight ) || ( !bNew && !bDoSyntaxHighlight ) )
         return;
@@ -447,13 +447,13 @@ void TextEditImp::SyntaxHighlight( BOOL bNew )
     else
     {
         aSyntaxIdleTimer.Stop();
-        pTextEngine->SetUpdateMode( FALSE );
-        for ( ULONG i = 0; i < pTextEngine->GetParagraphCount(); i++ )
+        pTextEngine->SetUpdateMode( sal_False );
+        for ( sal_uIntPtr i = 0; i < pTextEngine->GetParagraphCount(); i++ )
             pTextEngine->RemoveAttribs( i );
 
 //      pTextEngine->QuickFormatDoc();
-        pTextEngine->SetUpdateMode( TRUE );
-        pTextView->ShowCursor(TRUE, TRUE );
+        pTextEngine->SetUpdateMode( sal_True );
+        pTextView->ShowCursor(sal_True, sal_True );
     }
 }
 
@@ -463,15 +463,15 @@ void TextEditImp::SetFont( const Font& rNewFont )
     pTextEngine->SetFont(rNewFont);
 }
 
-BOOL TextEditImp::IsModified()
+sal_Bool TextEditImp::IsModified()
 {
     return pTextEngine->IsModified();
 }
 
 void TextEditImp::KeyInput( const KeyEvent& rKeyEvent )
 {
-    BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
-    pTextView->GetTextEngine()->SetModified( FALSE );
+    sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+    pTextView->GetTextEngine()->SetModified( sal_False );
 
     if ( !pTextView->KeyInput( rKeyEvent ) )
         Window::KeyInput( rKeyEvent );
@@ -487,8 +487,8 @@ void TextEditImp::MouseButtonUp( const MouseEvent& rMouseEvent ){ pTextView->Mou
 //void TextEditImp::MouseButtonDown( const MouseEvent& rMouseEvent ){ pTextView->MouseButtonDown( rMouseEvent );}
 //void TextEditImp::MouseMove( const MouseEvent& rMouseEvent ){ pTextView->MouseMove( rMouseEvent );}
 //void TextEditImp::Command( const CommandEvent& rCEvt ){ pTextView->Command( rCEvt );}
-//BOOL TextEditImp::Drop( const DropEvent& rEvt ){ return FALSE /*pTextView->Drop( rEvt )*/;}
-//BOOL TextEditImp::QueryDrop( DropEvent& rEvt ){ return FALSE /*pTextView->QueryDrop( rEvt )*/;}
+//sal_Bool TextEditImp::Drop( const DropEvent& rEvt ){ return sal_False /*pTextView->Drop( rEvt )*/;}
+//sal_Bool TextEditImp::QueryDrop( DropEvent& rEvt ){ return sal_False /*pTextView->QueryDrop( rEvt )*/;}
 
 
 void TextEditImp::Command( const CommandEvent& rCEvt )
@@ -550,10 +550,10 @@ SbxBase* TextEditImp::GetSbxAtMousePos( String &aWord )
         if ( aSuffixes.Search( aWord.GetChar(nLastChar) ) != STRING_NOTFOUND )
             aWord.Erase( nLastChar, 1 );
         // because perhaps TestTools throws an error
-        BOOL bWasError = SbxBase::IsError();
-        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( TRUE );
+        sal_Bool bWasError = SbxBase::IsError();
+        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_True );
         SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
-        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( FALSE );
+        pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_False );
         DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" );
         if ( !bWasError && SbxBase::IsError() )
             SbxBase::ResetError();
@@ -679,8 +679,8 @@ DBG_NAME(TextEdit)
 
 TextEdit::TextEdit( AppEdit* pParent, const WinBits& aBits )
 : pBreakpointWindow( NULL )
-, bFileWasUTF8( FALSE )
-, bSaveAsUTF8( FALSE )
+, bFileWasUTF8( sal_False )
+, bSaveAsUTF8( sal_False )
 , aEdit( pParent, aBits | WB_NOHIDESELECTION )
 {
 DBG_CTOR(TextEdit,0);
@@ -689,7 +689,7 @@ DBG_CTOR(TextEdit,0);
 TextEdit::~TextEdit()
 {DBG_DTOR(TextEdit,0);}
 
-void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
+void TextEdit::Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
 {
     if ( nLine )    // Should not occure but at 'Sub expected' in first line
         nLine--;
@@ -715,7 +715,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
     // Because nCol2 *may* point after the current statement
     // (because the next one starts there) there are space
     // that must be removed
-    BOOL bColon = FALSE;
+    sal_Bool bColon = sal_False;
 
     while ( s.GetChar( nCol2 ) == ' ' && nCol2 > nCol1 && !bColon )
     {
@@ -723,7 +723,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
         if ( s.GetChar( nCol2 ) == ':' )
         {
             nCol2--;
-            bColon = TRUE;
+            bColon = sal_True;
         }
     }
 
@@ -748,31 +748,31 @@ String TextEdit::GetSelected(){ return aEdit.pTextView->GetSelected(); }
 TextSelection TextEdit::GetSelection() const{ return aEdit.pTextView->GetSelection(); }
 void TextEdit::SetSelection( const TextSelection& rSelection ){ aEdit.pTextView->SetSelection( rSelection ); }
 
-USHORT TextEdit::GetLineNr() const
+sal_uInt16 TextEdit::GetLineNr() const
 {
-    return sal::static_int_cast< USHORT >(
+    return sal::static_int_cast< sal_uInt16 >(
         aEdit.pTextView->GetSelection().GetEnd().GetPara()+1);
 }
 
 void TextEdit::ReplaceSelected( const String& rStr ){ aEdit.pTextView->InsertText(rStr); }
-BOOL TextEdit::IsModified(){ return aEdit.IsModified(); }
+sal_Bool TextEdit::IsModified(){ return aEdit.IsModified(); }
 
 String TextEdit::GetText() const
 {
     return aEdit.pTextEngine->GetText( GetSystemLineEnd() );
 }
 
-void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( FALSE ); }
+void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( sal_False ); }
 void TextEdit::SetModifyHdl( Link l ){ aEdit.SetModifyHdl(l); }
-BOOL TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
+sal_Bool TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
 
 // Search from the beginning or at mark + 1
-BOOL TextEdit::Find( const String& s )
+sal_Bool TextEdit::Find( const String& s )
 {
     DBG_CHKTHIS(TextEdit,0);
 
     TextSelection aSelection = aEdit.pTextView->GetSelection();
-    ULONG nPara = aSelection.GetStart().GetPara();
+    sal_uIntPtr nPara = aSelection.GetStart().GetPara();
     xub_StrLen nIndex = aSelection.GetStart().GetIndex();
 
     if ( aSelection.HasRange() )
@@ -786,23 +786,23 @@ BOOL TextEdit::Find( const String& s )
         if( nIndex != STRING_NOTFOUND )
         {
             aEdit.pTextView->SetSelection( TextSelection( TextPaM( nPara, nIndex ), TextPaM( nPara, nIndex + s.Len() ) ) );
-            return TRUE;
+            return sal_True;
         }
         nIndex = 0;
         nPara++;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL TextEdit::Load( const String& aName )
+sal_Bool TextEdit::Load( const String& aName )
 {
 DBG_CHKTHIS(TextEdit,0);
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SvFileStream aStrm( aName, STREAM_STD_READ );
     if( aStrm.IsOpen() )
     {
         String aText, aLine, aLineBreak;
-        BOOL bIsFirstLine = TRUE;
+        sal_Bool bIsFirstLine = sal_True;
         aLineBreak += '\n';
         aLineBreak.ConvertLineEnd();
         rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
@@ -812,29 +812,29 @@ DBG_CHKTHIS(TextEdit,0);
             if ( bIsFirstLine && IsTTSignatureForUnicodeTextfile( aLine ) )
             {
                 aFileEncoding = RTL_TEXTENCODING_UTF8;
-                bFileWasUTF8 = TRUE;
+                bFileWasUTF8 = sal_True;
             }
             else
             {
                 if ( !bIsFirstLine )
                     aText += aLineBreak;
                 aText += aLine;
-                bIsFirstLine = FALSE;
+                bIsFirstLine = sal_False;
             }
             if( aStrm.GetError() != SVSTREAM_OK )
-                bOk = FALSE;
+                bOk = sal_False;
         }
         SetText( aText );
     }
     else
-        bOk = FALSE;
+        bOk = sal_False;
     return bOk;
 }
 
-BOOL TextEdit::Save( const String& aName )
+sal_Bool TextEdit::Save( const String& aName )
 {
 DBG_CHKTHIS(TextEdit,0);
-    BOOL bOk = TRUE;
+    sal_Bool bOk = sal_True;
     SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
     rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
     if( aStrm.IsOpen() )
@@ -849,10 +849,10 @@ DBG_CHKTHIS(TextEdit,0);
         aSave.ConvertLineEnd(LINEEND_LF);
         aStrm << ByteString( aSave, aFileEncoding ).GetBuffer();
         if( aStrm.GetError() != SVSTREAM_OK )
-            bOk = FALSE;
+            bOk = sal_False;
         else
-            aEdit.pTextEngine->SetModified(FALSE);
-    } else bOk = FALSE;
+            aEdit.pTextEngine->SetModified(sal_False);
+    } else bOk = sal_False;
     return bOk;
 }