removetooltypes01: #i112600# do not affect FASTBOOL in this cws

26 files changed, 62 insertions, 66 deletions

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 2bfd38d51276..804a43b35d7f 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -238,7 +238,7 @@ public:
     sal_uInt16                      SaveBasicManager() const;
     sal_uInt16                      SaveBasicAndDialogContainer() const;
     void                        EnterBasicCall();
-    int                    IsInBasicCall() const;
+    bool                        IsInBasicCall() const;
     void                        LeaveBasicCall();
     void                        RegisterBasicConstants( const char *pPrefix,
                                                         const SfxConstant *pConsts,
@@ -248,7 +248,7 @@ public:
     sal_Bool                        GetOptions(SfxItemSet &);
     void                        SetOptions(const SfxItemSet &);
     virtual void                Invalidate(sal_uInt16 nId = 0);
-    void                        NotifyEvent(const SfxEventHint& rEvent, int bSynchron = sal_True );
+    void                        NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true );
     sal_Bool                        IsDowning() const;
     sal_Bool                        IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const;
     static SfxObjectShellRef    DocAlreadyLoaded( const String &rName,
@@ -265,7 +265,7 @@ public:
 
     SAL_DLLPRIVATE sal_Bool         QueryExit_Impl();
     SAL_DLLPRIVATE void         SetOptions_Impl(const SfxItemSet &);
-    SAL_DLLPRIVATE int     Initialize_Impl();
+    SAL_DLLPRIVATE bool         Initialize_Impl();
 
     SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pAppData_Impl; }
 
@@ -306,7 +306,7 @@ public:
     SAL_DLLPRIVATE void         PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBas );
 
     SAL_DLLPRIVATE void         EnterAsynchronCall_Impl();
-    SAL_DLLPRIVATE int     IsInAsynchronCall_Impl() const;
+    SAL_DLLPRIVATE bool         IsInAsynchronCall_Impl() const;
     SAL_DLLPRIVATE void         LeaveAsynchronCall_Impl();
     SAL_DLLPRIVATE void         Registrations_Impl();
     SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const;
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index a4a48cf095d9..0b00fbb47ab9 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -57,7 +57,7 @@ private:
 //#endif
 public:
                             SfxPrintProgress( SfxViewShell* pViewSh,
-                                              int bShow = sal_True );
+                                              FASTBOOL bShow = sal_True );
     virtual                 ~SfxPrintProgress();
 
     virtual void            SetText( const String &rText );
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index e5c95625e587..6f21f6ed92f8 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -82,7 +82,7 @@ public:
 //#if 0 // _SOLAR__PRIVATE
     DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* );
     DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* );
-    SAL_DLLPRIVATE int StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
+    SAL_DLLPRIVATE FASTBOOL StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
     SAL_DLLPRIVATE const String& GetStateText_Impl() const;
 //#endif
 };
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index d74e565807ed..26a87fa31c3d 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -96,7 +96,7 @@ public:
     static const SfxPoolItem* GetItem( const SfxItemSet*, sal_uInt16 nSlotId,
                                        bool bDeep = false,
                                        TypeId aType = 0 );
-    const SfxPoolItem*  GetArg( sal_uInt16 nSlotId, int bDeep = sal_False, TypeId aType = 0 ) const;
+    const SfxPoolItem*  GetArg( sal_uInt16 nSlotId, bool bDeep = false, TypeId aType = 0 ) const;
     void                ReleaseArgs();
     void                SetReturnValue(const SfxPoolItem &);
     const SfxPoolItem*  GetReturnValue() const;
@@ -105,7 +105,7 @@ public:
     static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
     static sal_Bool         HasMacroRecorder( SfxViewFrame* pFrame=NULL );
     sal_uInt16              GetCallMode() const;
-    int         IsRecording() const;
+    bool            IsRecording() const;
     void                AllowRecording( sal_Bool );
     sal_Bool                AllowsRecording() const;
     sal_Bool                IsAPI() const;
@@ -119,7 +119,7 @@ public:
     void                Ignore();
     void                Cancel();
     sal_Bool                IsCancelled() const;
-    void                Done(const SfxItemSet &, int bKeep = sal_True );
+    void                Done(const SfxItemSet &, bool bKeep = true );
 
     void                ForgetAllArgs();
 
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 8eb2ed59077a..ceec7c05c719 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -254,7 +254,7 @@ public:
     virtual void                ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
 
 #ifndef _SFXSH_HXX
-    SAL_DLLPRIVATE int     CanExecuteSlot_Impl( const SfxSlot &rSlot );
+    SAL_DLLPRIVATE bool     CanExecuteSlot_Impl( const SfxSlot &rSlot );
     SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
     SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
 #endif
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 7a155af570d6..3209a791b8e0 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -224,8 +224,8 @@ public:
     // Focus, KeyInput, Cursor
     void                        GotFocus() const;
     inline void                 LostFocus() const;
-    virtual void                ShowCursor( int bOn = sal_True );
-    virtual int         KeyInput( const KeyEvent &rKeyEvent );
+    virtual void                ShowCursor( FASTBOOL bOn = sal_True );
+    virtual FASTBOOL            KeyInput( const KeyEvent &rKeyEvent );
     sal_Bool                        Escape();
 
     // Viewing Interface
@@ -300,7 +300,7 @@ public:
     SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
     SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
     SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
-    SAL_DLLPRIVATE int GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
+    SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
 
     SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient )
                                 { GetIPClientList_Impl(sal_True)->Insert(pIPClient); }
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 1443b8351011..b214012ddfdb 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -651,7 +651,7 @@ void SfxApplication::LeaveAsynchronCall_Impl()
 
 //--------------------------------------------------------------------
 
-int SfxApplication::IsInAsynchronCall_Impl() const
+FASTBOOL SfxApplication::IsInAsynchronCall_Impl() const
 {
     return pAppData_Impl->nAsynchronCalls > 0;
 }
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 1d903266ffa8..7f6e6c335383 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -1003,7 +1003,7 @@ SfxEventConfiguration* SfxApplication::GetEventConfig() const
 //--------------------------------------------------------------------
 
 //--------------------------------------------------------------------
-void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, int bSynchron )
+void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSynchron )
 {
     //DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!");
 
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index cbdddb79f0a9..c9e09254edda 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -157,7 +157,7 @@ long QuitAgain_Impl( void* pObj, void* pArg )
 void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
-    int bDone = sal_False;
+    bool bDone = sal_False;
     switch ( rReq.GetSlot() )
     {
         case SID_SETOPTIONS:
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 1fb3dd38f50f..0692b85afcda 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1292,7 +1292,7 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
 
 //------------------------------------------------------------------------
 
-int SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
+bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
 
 /*  [Beschreibung]
 
@@ -1309,10 +1309,10 @@ int SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
     for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ )
     {
         if ( aObjBarList[n].nPos == nRealPos )
-            return sal_True;
+            return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 //------------------------------------------------------------------------
@@ -1487,13 +1487,13 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
 
         // die Modi bestimmen, f"ur die die ToolBox gilt
         sal_uInt16 nTbxMode = aObjBarList[n].nMode;
-        int bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
+        bool bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
                                   ( nTbxMode & SFX_VISIBILITY_FULLSCREEN );
         nTbxMode &= ~SFX_VISIBILITY_FULLSCREEN;
         nTbxMode &= ~SFX_VISIBILITY_VIEWER;
 
         // wird in diesem Kontext eine ToolBox gefordert?
-        int bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode );
+        bool bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode );
         if ( bDestroy )
         {
             rtl::OUString aTbxId( m_aTbxTypeName );
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 5abd8f3e6ff0..9561f6330d7f 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -735,7 +735,7 @@ void SfxProgress::LeaveLock()
 
 // -----------------------------------------------------------------------
 
-int SfxProgress::StatusBarManagerGone_Impl
+FASTBOOL SfxProgress::StatusBarManagerGone_Impl
 (
     SfxStatusBarManager *   // dieser <SfxStatusBarManager> wird zerst"ort
 )
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index b2b414707291..8dab74f6c7d8 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -373,7 +373,7 @@ void SfxBindings::HidePopups( bool bHide )
         pImp->pWorkWin->HidePopups_Impl( bHide, sal_True );
 }
 
-void SfxBindings::HidePopupCtrls_Impl( int bHide )
+void SfxBindings::HidePopupCtrls_Impl( FASTBOOL bHide )
 {
     if ( bHide )
     {
@@ -1503,10 +1503,10 @@ SfxItemSet* SfxBindings::CreateSet_Impl
         }
 
         // Mu\s der Slot "uberhaupt upgedatet werden ?
-        int bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
+        bool bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
 
         // Bugfix #26161#: Es reicht nicht, nach der selben Shell zu fragen !!
-        int bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
+        bool bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
 
         // Wenn der Slot ein nicht-dirty MasterSlot ist, dann ist vielleicht
         // einer seiner Slaves dirty ? Dann wird der Masterslot doch eingef"ugt.
@@ -1736,7 +1736,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
     pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
 
     // at least 10 loops and further if more jobs are available but no input
-    int bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
+    bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
     sal_uInt16 nLoops = 10;
     pImp->bInNextJob = sal_True;
     const sal_uInt16 nCount = pImp->pCaches->Count();
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index de8df832ef5b..295b8891fbbb 100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2022,7 +2022,7 @@ void SfxDispatcher::FlushImpl()
         {
             // tats"aechlich poppen
             SfxShell* pPopped = 0;
-            int bFound = sal_False;
+            bool bFound = sal_False;
             do
             {
                 DBG_ASSERT( pImp->aStack.Count(), "popping from empty stack" );
@@ -2403,12 +2403,12 @@ sal_Bool SfxDispatcher::_FindServer
         if ( pSlot )
         {
             // Slot geh"ort zum Container?
-            int bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
-            int bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
+            bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
+            bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
 
             // Shell geh"ort zum Server?
             // AppDispatcher oder IPFrame-Dispatcher
-            int bIsServerShell = !pImp->pFrame || bIsInPlace;
+            bool bIsServerShell = !pImp->pFrame || bIsInPlace;
 
             // Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf
             // einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen.
@@ -2420,7 +2420,7 @@ sal_Bool SfxDispatcher::_FindServer
 
             // Shell geh"ort zum Container?
             // AppDispatcher oder kein IPFrameDispatcher
-            int bIsContainerShell = !pImp->pFrame || !bIsInPlace;
+            bool bIsContainerShell = !pImp->pFrame || !bIsInPlace;
             // Shell und Slot passen zusammen
             if ( !( ( bIsContainerSlot && bIsContainerShell ) ||
                     ( !bIsContainerSlot && bIsServerShell ) ) )
@@ -2521,12 +2521,12 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
         if ( pSlot )
         {
             // Slot geh"ort zum Container?
-            int bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
-            int bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
+            bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
+            bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
 
             // Shell geh"ort zum Server?
             // AppDispatcher oder IPFrame-Dispatcher
-            int bIsServerShell = !pImp->pFrame || bIsInPlace;
+            bool bIsServerShell = !pImp->pFrame || bIsInPlace;
 
             // Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf
             // einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen.
@@ -2538,7 +2538,7 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
 
             // Shell geh"ort zum Container?
             // AppDispatcher oder kein IPFrameDispatcher
-            int bIsContainerShell = !pImp->pFrame || !bIsInPlace;
+            bool bIsContainerShell = !pImp->pFrame || !bIsInPlace;
 
             // Shell und Slot passen zusammen
             if ( !( ( bIsContainerSlot && bIsContainerShell ) ||
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 4bf4eeef8696..87879656021e 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -126,11 +126,11 @@ SfxMacroStatement::SfxMacroStatement
         return;
 /*
     // Objekt-Typ bestimmen
-    int bIsApp = rShell.ISA(SfxApplication);
-    int bIsDoc = rShell.ISA(SfxObjectShell);
-    int bIsWin = !bIsApp && !bIsDoc &&
+    bool bIsApp = rShell.ISA(SfxApplication);
+    bool bIsDoc = rShell.ISA(SfxObjectShell);
+    bool bIsWin = !bIsApp && !bIsDoc &&
                       ( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) );
-    int bIsSel = !bIsApp && !bIsDoc && !bIsWin;
+    bool bIsSel = !bIsApp && !bIsDoc && !bIsWin;
 
     // Objekt nicht schon im Slot-Namen enthalten?
     if ( bIsSel || rSlot.pName[0] == '.' )
@@ -387,7 +387,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
                 }
 
                 // nicht druckbare Zeichen werden als chr$(...) geschrieben
-                int bPrevReplaced = sal_False;
+                bool bPrevReplaced = sal_False;
                 for ( sal_uInt16 n = 0; n < aRecordable.Len(); ++n )
                 {
                     sal_Unicode cChar = aRecordable.GetChar(n);
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 05c9a8da0eb0..718e51922e7d 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -471,7 +471,7 @@ void SfxRequest::RemoveItem( sal_uInt16 nID )
 const SfxPoolItem* SfxRequest::GetArg
 (
     sal_uInt16          nSlotId,    // Slot-Id oder Which-Id des Parameters
-    int         bDeep,      // sal_False: nicht in Parent-ItemSets suchen
+    bool        bDeep,      // false: nicht in Parent-ItemSets suchen
     TypeId          aType       // != 0:  RTTI Pruefung mit Assertion
 )   const
 {
@@ -574,11 +574,11 @@ void SfxRequest::Done
                                     erfragt wurden, ggf. 0 falls keine
                                     Parameter gesetzt wurden */
 
-    int             bKeep   /*  sal_True (default)
+    bool            bKeep   /*  true (default)
                                     'rSet' wird gepeichert und ist "uber
                                     GetArgs() abfragbar
 
-                                    FALSE
+                                    false
                                     'rSet' wird nicht kopiert (schneller) */
 )
 
@@ -904,7 +904,7 @@ sal_Bool SfxRequest::IsAPI() const
 //--------------------------------------------------------------------
 
 
-int SfxRequest::IsRecording() const
+bool SfxRequest::IsRecording() const
 
 /*  [Beschreibung]
 
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index eabf666078f6..5722d228ed07 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -853,7 +853,7 @@ ResMgr* SfxShell::GetResMgr() const
 
 //--------------------------------------------------------------------
 
-int SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
+bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 
 /*  [Beschreibung]
 
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index cb2498c290f7..889cf97b1b6c 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -457,10 +457,10 @@ void SfxStateCache::SetState_Impl
     DBG_PROFSTART(SfxStateCacheSetState);
 
     // m"ussen die Controller "uberhaupt benachrichtigt werden?
-    int bNotify = bItemDirty;
+    bool bNotify = bItemDirty;
     if ( !bItemDirty )
     {
-        int bBothAvailable = pLastItem && pState &&
+        bool bBothAvailable = pLastItem && pState &&
                     !IsInvalidItem(pState) && !IsInvalidItem(pLastItem);
         DBG_ASSERT( !bBothAvailable || pState != pLastItem, "setting state with own item" );
         if ( bBothAvailable )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 3c42e726a146..e9c66e2a5f13 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1761,7 +1761,7 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )
 */
 
 {
-    int bSet = ( pSet != NULL );
+    bool bSet = ( pSet != NULL );
 
     pSet = pInSet;
 
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 72fff7e0aa54..2b815a260e3a 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -79,7 +79,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta
         case SID_STYLE_FAMILY4:
         case SID_STYLE_FAMILY5:
         {
-            int bAvailable = SFX_ITEM_AVAILABLE == eState;
+            bool bAvailable = SFX_ITEM_AVAILABLE == eState;
             if ( !bAvailable )
                 rTemplateDlg.SetFamilyState(GetId(), 0);
             else {
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index d15cc20f8280..c54a627e2a78 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -68,7 +68,7 @@ private:
 
 private:
     void            Construct_Impl();
-    int        Bind_Impl( Menu *pMenu );
+    bool        Bind_Impl( Menu *pMenu );
     inline SfxMenuCtrlArr_Impl& GetAppCtrl_Impl()
     {
         return pAppCtrl? *pAppCtrl: *(pAppCtrl = new SfxMenuCtrlArr_Impl) ;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index a653ba71a085..8c06e1233297 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -335,7 +335,7 @@ public:
     void                    SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
                                     SfxInterface *pIFace, const String* pName=0 );
     Window*                 GetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId );
-    int                 KnowsObjectBar_Impl( sal_uInt16 nPos ) const;
+    bool                    KnowsObjectBar_Impl( sal_uInt16 nPos ) const;
     sal_Bool                    IsVisible_Impl();
     void                    MakeVisible_Impl( sal_Bool );
     void                    SetObjectBarVisibility_Impl( sal_uInt16 nVis );
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index e4d26062d8cb..9b7506d993b9 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -258,7 +258,7 @@ void SfxMenuControl::StateChanged
     DBG_ASSERT( nSID == GetId(), "strange SID" );
     DBG_ASSERT( pOwnMenu != 0, "setting state to dangling SfxMenuControl" );
 
-    int bIsObjMenu =
+    bool bIsObjMenu =
                 GetId() >= SID_OBJECTMENU0 && GetId() < SID_OBJECTMENU_LAST;
 
     // enabled/disabled-Flag pauschal korrigieren
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index c6e09245184d..cd5aa937e2b6 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -768,7 +768,7 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
 
 //--------------------------------------------------------------------
 
-int SfxVirtualMenu::Bind_Impl( Menu *pMenu )
+bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 {
     // Selber suchen, da SV mit 'sal_uInt16 nSID = pSVMenu->GetCurItemId();' immer
     // 0 liefert. Das ist so, weil die Event-Weiterleitung lt. TH nichts mit
@@ -778,7 +778,7 @@ int SfxVirtualMenu::Bind_Impl( Menu *pMenu )
     for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
     {
         // angesprochenes Sub-Menu gefunden?
-        int bFound = sal_False;
+        bool bFound = false;
         sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
         SfxMenuControl &rCtrl = pItems[nPos];
         bFound = pSVMenu->GetPopupMenu(nSID) == pMenu;
@@ -824,11 +824,11 @@ int SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 
         // gefunden, dann abbrechen
         if ( bFound )
-            return sal_True;
+            return true;
     }
 
     // nicht in diesem Untermenu gefunden
-    return sal_False;
+    return false;
 }
 
 void SfxVirtualMenu::BindControllers()
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index abc863e36887..d88c097a0d57 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3028,7 +3028,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
 void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
-    int bDone = sal_False;
     switch ( rReq.GetSlot() )
     {
         case SID_STOP_RECORDING :
@@ -3207,9 +3206,6 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
             break;
         }
     }
-
-    if ( bDone )
-        rReq.Done();
 }
 
 void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 2907d31ef709..9f244a1c303d 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -528,8 +528,8 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
     SfxPrinter *pDocPrinter = GetPrinter();
 
     // Printer-Options auswerten
-    int bOriToDoc = sal_False;
-    int bSizeToDoc = sal_False;
+    bool bOriToDoc = false;
+    bool bSizeToDoc = false;
     if ( &pDocPrinter->GetOptions() )
     {
         sal_uInt16 nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC);
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index cfa336470738..88b185482abb 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1758,7 +1758,7 @@ sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey)
 
 //--------------------------------------------------------------------
 
-int SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
+FASTBOOL SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
 
 /*  [Beschreibung]
 
@@ -1769,7 +1769,7 @@ int SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
 
         [R"uckgabewert]
 
-        int                TRUE
+        FASTBOOL                sal_True
                                                         die Taste ist konfiguriert, der betreffende
                                                         Handler wurde gerufen
 
@@ -1785,14 +1785,14 @@ int SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
     return ExecKey_Impl(rKeyEvent);
 }
 
-int SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent )
+bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent )
 {
     return ExecKey_Impl(rKeyEvent);
 }
 
 //--------------------------------------------------------------------
 
-void SfxViewShell::ShowCursor( int /*bOn*/ )
+void SfxViewShell::ShowCursor( FASTBOOL /*bOn*/ )
 
 /*  [Beschreibung]