removetooltypes01: #i112600# Remove tool types from binfilter, starmath, svx, toolkit and xmloff

1 files changed, 32 insertions, 32 deletions

diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 020376c05dfb..8d2140863bb3 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -80,7 +80,7 @@ using namespace com::sun::star::uno;
 
 
 void SmGetLeftSelectionPart(const ESelection aSel,
-                            USHORT &nPara, USHORT &nPos)
+                            sal_uInt16 &nPara, sal_uInt16 &nPos)
     // returns paragraph number and position of the selections left part
 {
     // compare start and end of selection and use the one that comes first
@@ -111,7 +111,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
     SetMapMode(MAP_PIXEL);
 
     // Even RTL languages don't use RTL for math
-    rCmdBox.GetEditWindow()->EnableRTL( FALSE );
+    rCmdBox.GetEditWindow()->EnableRTL( sal_False );
 
     ApplyColorConfigValues( SM_MOD()->GetColorConfig() );
 
@@ -231,7 +231,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
         //! see also SmDocShell::GetEditEngine() !
         //!
 
-        pEditEngine->SetDefTab( USHORT( GetTextWidth( C2S("XXXX") ) ) );
+        pEditEngine->SetDefTab( sal_uInt16( GetTextWidth( C2S("XXXX") ) ) );
 
         SetEditEngineDefaultFonts( *pEditEngine, *pEditEngineItemPool );
 
@@ -270,7 +270,7 @@ IMPL_LINK(SmEditWindow, CursorMoveTimerHdl, Timer *, EMPTYARG /*pTimer*/)
         if (pView)
         {
             // get row and column to look for
-            USHORT  nRow, nCol;
+            sal_uInt16  nRow, nCol;
             SmGetLeftSelectionPart(aNewSelection, nRow, nCol);
             nRow++;
             nCol++;
@@ -336,7 +336,7 @@ void SmEditWindow::MouseButtonDown(const MouseEvent &rEvt)
 
 void SmEditWindow::Command(const CommandEvent& rCEvt)
 {
-    BOOL bForwardEvt = TRUE;
+    sal_Bool bForwardEvt = sal_True;
     if (rCEvt.GetCommand() == COMMAND_CONTEXTMENU)
     {
         GetParent()->ToTop();
@@ -364,7 +364,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
 
         pPopupMenu->Execute( this, aPoint );
         delete pPopupMenu;
-        bForwardEvt = FALSE;
+        bForwardEvt = sal_False;
     }
     else if (rCEvt.GetCommand() == COMMAND_WHEEL)
         bForwardEvt = !HandleWheelCommands( rCEvt );
@@ -379,9 +379,9 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
 }
 
 
-BOOL SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
+sal_Bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
 {
-    BOOL bCommandHandled = FALSE;    // true if the CommandEvent needs not
+    sal_Bool bCommandHandled = sal_False;    // true if the CommandEvent needs not
                                     // to be passed on (because it has fully
                                     // been taken care of).
 
@@ -389,7 +389,7 @@ BOOL SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
     if (pWData)
     {
         if (COMMAND_WHEEL_ZOOM == pWData->GetMode())
-            bCommandHandled = TRUE;     // no zooming in Command window
+            bCommandHandled = sal_True;     // no zooming in Command window
         else
             bCommandHandled = HandleScrollCommand( rCEvt, pHScrollBar, pVScrollBar);
     }
@@ -413,7 +413,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
 {
     if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE)
     {
-        BOOL bCallBase = TRUE;
+        sal_Bool bCallBase = sal_True;
         SfxViewShell* pViewShell = GetView();
         if ( pViewShell && pViewShell->ISA(SmViewShell) )
         {
@@ -496,8 +496,8 @@ void SmEditWindow::CreateEditView()
             pScrollBox  = new ScrollBarBox(this);
         pVScrollBar->SetScrollHdl(LINK(this, SmEditWindow, ScrollHdl));
         pHScrollBar->SetScrollHdl(LINK(this, SmEditWindow, ScrollHdl));
-        pVScrollBar->EnableDrag( TRUE );
-        pHScrollBar->EnableDrag( TRUE );
+        pVScrollBar->EnableDrag( sal_True );
+        pHScrollBar->EnableDrag( sal_True );
 
         pEditView->SetOutputArea(AdjustScrollBars());
 
@@ -505,7 +505,7 @@ void SmEditWindow::CreateEditView()
 
         pEditView->SetSelection(eSelection);
         Update();
-        pEditView->ShowCursor(TRUE, TRUE);
+        pEditView->ShowCursor(sal_True, sal_True);
 
         pEditEngine->SetStatusEventHdl( LINK(this, SmEditWindow, EditStatusHdl) );
         SetPointer(pEditView->GetPointer());
@@ -676,16 +676,16 @@ void SmEditWindow::LoseFocus()
 }
 
 
-BOOL SmEditWindow::IsAllSelected() const
+sal_Bool SmEditWindow::IsAllSelected() const
 {
-    BOOL bRes = FALSE;
+    sal_Bool bRes = sal_False;
     EditEngine *pEditEngine = ((SmEditWindow *) this)->GetEditEngine();
     DBG_ASSERT( pEditView, "NULL pointer" );
     DBG_ASSERT( pEditEngine, "NULL pointer" );
     if (pEditEngine  &&  pEditView)
     {
         ESelection eSelection( pEditView->GetSelection() );
-        INT32 nParaCnt = pEditEngine->GetParagraphCount();
+        sal_Int32 nParaCnt = pEditEngine->GetParagraphCount();
         if (!(nParaCnt - 1))
         {
             String Text( pEditEngine->GetText( LINEEND_LF ) );
@@ -709,7 +709,7 @@ void SmEditWindow::SelectAll()
     }
 }
 
-void SmEditWindow::InsertCommand(USHORT nCommand)
+void SmEditWindow::InsertCommand(sal_uInt16 nCommand)
 {
     DBG_ASSERT( pEditView, "EditView missing" );
     if (pEditView)
@@ -749,7 +749,7 @@ void SmEditWindow::MarkError(const Point &rPos)
     if (pEditView)
     {
         const xub_StrLen    nCol = sal::static_int_cast< xub_StrLen >(rPos.X());
-        const USHORT        nRow = sal::static_int_cast< USHORT >(rPos.Y() - 1);
+        const sal_uInt16        nRow = sal::static_int_cast< sal_uInt16 >(rPos.Y() - 1);
 
         pEditView->SetSelection(ESelection(nRow, nCol - 1, nRow, nCol));
         GrabFocus();
@@ -764,10 +764,10 @@ void SmEditWindow::SelNextMark()
     if (pEditEngine  &&  pEditView)
     {
         ESelection eSelection = pEditView->GetSelection();
-        USHORT     Pos        = eSelection.nEndPos;
+        sal_uInt16     Pos        = eSelection.nEndPos;
         String     aMark (C2S("<?>"));
         String     aText;
-        USHORT     nCounts    = pEditEngine->GetParagraphCount();
+        sal_uInt16     nCounts    = pEditEngine->GetParagraphCount();
 
         while (eSelection.nEndPara < nCounts)
         {
@@ -794,15 +794,15 @@ void SmEditWindow::SelPrevMark()
     if (pEditEngine  &&  pEditView)
     {
         ESelection eSelection = pEditView->GetSelection();
-        USHORT     Pos        = STRING_NOTFOUND;
+        sal_uInt16     Pos        = STRING_NOTFOUND;
         xub_StrLen Max        = eSelection.nStartPos;
         String     Text( pEditEngine->GetText( eSelection.nStartPara ) );
         String     aMark (C2S("<?>"));
-        USHORT     nCounts    = pEditEngine->GetParagraphCount();
+        sal_uInt16     nCounts    = pEditEngine->GetParagraphCount();
 
         do
         {
-            USHORT Fnd = Text.Search(aMark, 0);
+            sal_uInt16 Fnd = Text.Search(aMark, 0);
 
             while ((Fnd < Max) && (Fnd != STRING_NOTFOUND))
             {
@@ -827,7 +827,7 @@ void SmEditWindow::SelPrevMark()
     }
 }
 
-BOOL SmEditWindow::HasMark(const String& rText) const
+sal_Bool SmEditWindow::HasMark(const String& rText) const
     // returns true iff 'rText' contains a mark
 {
     return rText.SearchAscii("<?>", 0) != STRING_NOTFOUND;
@@ -868,17 +868,17 @@ void SmEditWindow::SetSelection(const ESelection &rSel)
     InvalidateSlots();
 }
 
-BOOL SmEditWindow::IsEmpty() const
+sal_Bool SmEditWindow::IsEmpty() const
 {
     EditEngine *pEditEngine = ((SmEditWindow *) this)->GetEditEngine();
-    BOOL bEmpty = sal::static_int_cast< BOOL >(
-                    pEditEngine ? pEditEngine->GetTextLen() == 0 : FALSE);
+    sal_Bool bEmpty = sal::static_int_cast< sal_Bool >(
+                    pEditEngine ? pEditEngine->GetTextLen() == 0 : sal_False);
     return bEmpty;
 }
 
-BOOL SmEditWindow::IsSelected() const
+sal_Bool SmEditWindow::IsSelected() const
 {
-    return pEditView ? pEditView->HasSelection() : FALSE;
+    return pEditView ? pEditView->HasSelection() : sal_False;
 }
 
 void SmEditWindow::Cut()
@@ -887,7 +887,7 @@ void SmEditWindow::Cut()
     if (pEditView)
     {
         pEditView->Cut();
-        GetDoc()->SetModified( TRUE );
+        GetDoc()->SetModified( sal_True );
     }
 }
 
@@ -904,7 +904,7 @@ void SmEditWindow::Paste()
     if (pEditView)
     {
         pEditView->Paste();
-        GetDoc()->SetModified( TRUE );
+        GetDoc()->SetModified( sal_True );
     }
 }
 
@@ -914,7 +914,7 @@ void SmEditWindow::Delete()
     if (pEditView)
     {
         pEditView->DeleteSelected();
-        GetDoc()->SetModified( TRUE );
+        GetDoc()->SetModified( sal_True );
     }
 }