removetooltypes01: #i112600# Remove tools types from sw

1 files changed, 35 insertions, 35 deletions

diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 0e51cd4c756c..c1ace145f7c5 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -107,7 +107,7 @@ void SwWrtShell::Insert(SwField &rFld)
 
 
 
-void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, BOOL bOnlyInSel )
+void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, sal_Bool bOnlyInSel )
 {
     // ueber die Liste der Eingabefelder gehen und Updaten
     SwInputFieldList* pTmp = pLst;
@@ -117,21 +117,21 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, BOOL bOnlyInSel )
     if (bOnlyInSel)
         pTmp->RemoveUnselectedFlds();
 
-    const USHORT nCnt = pTmp->Count();
+    const sal_uInt16 nCnt = pTmp->Count();
     if(nCnt)
     {
         pTmp->PushCrsr();
 
-        BOOL bCancel = FALSE;
+        sal_Bool bCancel = sal_False;
         ByteString aDlgPos;
-        for( USHORT i = 0; i < nCnt && !bCancel; ++i )
+        for( sal_uInt16 i = 0; i < nCnt && !bCancel; ++i )
         {
             pTmp->GotoFieldPos( i );
             SwField* pField = pTmp->GetField( i );
             if(pField->GetTyp()->Which() == RES_DROPDOWN)
-                bCancel = StartDropDownFldDlg( pField, TRUE, &aDlgPos );
+                bCancel = StartDropDownFldDlg( pField, sal_True, &aDlgPos );
             else
-                bCancel = StartInputFldDlg( pField, TRUE, 0, &aDlgPos);
+                bCancel = StartInputFldDlg( pField, sal_True, 0, &aDlgPos);
 
             // Sonst Updatefehler bei Multiselektion:
             pTmp->GetField( i )->GetTyp()->UpdateFlds();
@@ -150,7 +150,7 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, BOOL bOnlyInSel )
 
 
 
-BOOL SwWrtShell::StartInputFldDlg( SwField* pFld, BOOL bNextButton,
+sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
                                     Window* pParentWin, ByteString* pWindowState )
 {
 //JP 14.08.96: Bug 30332 - nach Umbau der modularietaet im SFX, muss jetzt
@@ -164,7 +164,7 @@ BOOL SwWrtShell::StartInputFldDlg( SwField* pFld, BOOL bNextButton,
     DBG_ASSERT(pDlg, "Dialogdiet fail!");
     if(pWindowState && pWindowState->Len())
         pDlg->SetWindowState(*pWindowState);
-    BOOL bRet = RET_CANCEL == pDlg->Execute();
+    sal_Bool bRet = RET_CANCEL == pDlg->Execute();
     if(pWindowState)
         *pWindowState = pDlg->GetWindowState();
 
@@ -175,7 +175,7 @@ BOOL SwWrtShell::StartInputFldDlg( SwField* pFld, BOOL bNextButton,
 /* -----------------17.06.2003 10:18-----------------
 
  --------------------------------------------------*/
-BOOL SwWrtShell::StartDropDownFldDlg(SwField* pFld, BOOL bNextButton, ByteString* pWindowState)
+sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, ByteString* pWindowState)
 {
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");
@@ -184,11 +184,11 @@ BOOL SwWrtShell::StartDropDownFldDlg(SwField* pFld, BOOL bNextButton, ByteString
     DBG_ASSERT(pDlg, "Dialogdiet fail!");
     if(pWindowState && pWindowState->Len())
         pDlg->SetWindowState(*pWindowState);
-    USHORT nRet = pDlg->Execute();
+    sal_uInt16 nRet = pDlg->Execute();
     if(pWindowState)
         *pWindowState = pDlg->GetWindowState();
     delete pDlg;
-    BOOL bRet = RET_CANCEL == nRet;
+    sal_Bool bRet = RET_CANCEL == nRet;
     GetWin()->Update();
     if(RET_YES == nRet)
     {
@@ -219,9 +219,9 @@ void SwWrtShell::InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
     Beschreibung: Verzeichnis Updaten Selektion loeschen
  --------------------------------------------------------------------*/
 
-BOOL SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
+sal_Bool SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
 {
-    BOOL bResult = FALSE;
+    sal_Bool bResult = sal_False;
 
     if(_CanInsert())
     {
@@ -245,12 +245,12 @@ BOOL SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
 
 void SwWrtShell::ClickToField( const SwField& rFld )
 {
-    bIsInClickToEdit = TRUE;
+    bIsInClickToEdit = sal_True;
     switch( rFld.GetTyp()->Which() )
     {
     case RES_JUMPEDITFLD:
         {
-            USHORT nSlotId = 0;
+            sal_uInt16 nSlotId = 0;
             switch( rFld.GetFormat() )
             {
             case JE_FMT_TABLE:
@@ -267,7 +267,7 @@ void SwWrtShell::ClickToField( const SwField& rFld )
 //          case JE_FMT_TEXT:
             }
 
-            Right( CRSR_SKIP_CHARS, TRUE, 1, FALSE );       // Feld selektieren
+            Right( CRSR_SKIP_CHARS, sal_True, 1, sal_False );       // Feld selektieren
 
             if( nSlotId )
             {
@@ -308,29 +308,29 @@ void SwWrtShell::ClickToField( const SwField& rFld )
         break;
 
     case RES_INPUTFLD:
-        StartInputFldDlg( (SwField*)&rFld, FALSE );
+        StartInputFldDlg( (SwField*)&rFld, sal_False );
         break;
 
     case RES_SETEXPFLD:
         if( ((SwSetExpField&)rFld).GetInputFlag() )
-            StartInputFldDlg( (SwField*)&rFld, FALSE );
+            StartInputFldDlg( (SwField*)&rFld, sal_False );
         break;
     case RES_DROPDOWN :
-        StartDropDownFldDlg( (SwField*)&rFld, FALSE );
+        StartDropDownFldDlg( (SwField*)&rFld, sal_False );
     break;
     }
 
-    bIsInClickToEdit = FALSE;
+    bIsInClickToEdit = sal_False;
 }
 
 
 
-void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, USHORT nFilter )
+void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter )
 {
     if( !rItem.GetValue().Len() )
         return ;
 
-    bIsInClickToEdit = TRUE;
+    bIsInClickToEdit = sal_True;
 
     // erstmal das evt. gesetzte ObjectSelect Macro ausfuehren
     const SvxMacro* pMac = rItem.GetMacro( SFX_EVENT_MOUSECLICK_OBJECT );
@@ -338,7 +338,7 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, USHORT nFilter )
     {
         SwCallMouseEvent aCallEvent;
         aCallEvent.Set( &rItem );
-        GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, FALSE );
+        GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, sal_False );
     }
 
     // damit die Vorlagenumsetzung sofort angezeigt wird
@@ -350,27 +350,27 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, USHORT nFilter )
         const_cast<SwTxtINetFmt*>(pTxtAttr)->SetVisitedValid( true );
     }
 
-    bIsInClickToEdit = FALSE;
+    bIsInClickToEdit = sal_False;
 }
 
 
 
-BOOL SwWrtShell::ClickToINetGrf( const Point& rDocPt, USHORT nFilter )
+sal_Bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     String sURL;
     String sTargetFrameName;
     const SwFrmFmt* pFnd = IsURLGrfAtPos( rDocPt, &sURL, &sTargetFrameName );
     if( pFnd && sURL.Len() )
     {
-        bRet = TRUE;
+        bRet = sal_True;
         // erstmal das evt. gesetzte ObjectSelect Macro ausfuehren
         const SvxMacro* pMac = &pFnd->GetMacro().GetMacro( SFX_EVENT_MOUSECLICK_OBJECT );
         if( pMac )
         {
             SwCallMouseEvent aCallEvent;
             aCallEvent.Set( EVENT_OBJECT_URLITEM, pFnd );
-            GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, FALSE );
+            GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, sal_False );
         }
 
         ::LoadURL( sURL, this, nFilter, &sTargetFrameName);
@@ -379,7 +379,7 @@ BOOL SwWrtShell::ClickToINetGrf( const Point& rDocPt, USHORT nFilter )
 }
 
 
-void LoadURL( const String& rURL, ViewShell* pVSh, USHORT nFilter,
+void LoadURL( const String& rURL, ViewShell* pVSh, sal_uInt16 nFilter,
               const String *pTargetFrameName )
 {
     ASSERT( rURL.Len() && pVSh, "was soll hier geladen werden?" );
@@ -419,10 +419,10 @@ void LoadURL( const String& rURL, ViewShell* pVSh, USHORT nFilter,
     SfxStringItem aTargetFrameName( SID_TARGETNAME, sTargetFrame );
     SfxStringItem aReferer( SID_REFERER, sReferer );
 
-    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, FALSE );
+    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_False );
     //#39076# Silent kann lt. SFX entfernt werden.
-//  SfxBoolItem aSilent( SID_SILENT, TRUE );
-    SfxBoolItem aBrowse( SID_BROWSE, TRUE );
+//  SfxBoolItem aSilent( SID_SILENT, sal_True );
+    SfxBoolItem aBrowse( SID_BROWSE, sal_True );
 
     if( nFilter & URLLOAD_NEWVIEW )
         aTargetFrameName.SetValue( String::CreateFromAscii("_blank") );
@@ -441,7 +441,7 @@ void LoadURL( const String& rURL, ViewShell* pVSh, USHORT nFilter,
 }
 
 void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
-                                    const USHORT nAction )
+                                    const sal_uInt16 nAction )
 {
     if( EXCHG_IN_ACTION_COPY == nAction )
     {
@@ -479,9 +479,9 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
             // the update of content from linked section at time delete
             // the undostack. Then the change of the section dont create
             // any undoobject. -  BUG 69145
-            BOOL bDoesUndo = DoesUndo();
+            sal_Bool bDoesUndo = DoesUndo();
             if( UNDO_INSSECTION != GetUndoIds() )
-                DoUndo( FALSE );
+                DoUndo( sal_False );
             UpdateSection( GetSectionFmtPos( *pIns->GetFmt() ), aSection );
             DoUndo( bDoesUndo );
         }