removetooltypes: #i112600# remove tooltypes

4 files changed, 197 insertions, 197 deletions

diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index f101b0d426b9..e4d26062d8cb 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -86,7 +86,7 @@ using namespace ::com::sun::star::util;
 
 class SfxEnumMenu: public PopupMenu
 {
-    USHORT          nSlot;
+    sal_uInt16          nSlot;
     SfxEnumItem    *pItem;
     SfxBindings*    pBindings;
 
@@ -94,20 +94,20 @@ protected:
     virtual void    Select();
 
 public:
-                    SfxEnumMenu( USHORT nSlot, SfxBindings* pBind, const SfxEnumItem &rItem );
+                    SfxEnumMenu( sal_uInt16 nSlot, SfxBindings* pBind, const SfxEnumItem &rItem );
                     ~SfxEnumMenu();
 };
 
 //=========================================================================
 
-SfxEnumMenu::SfxEnumMenu( USHORT nSlotId, SfxBindings* pBind, const SfxEnumItem &rItem ):
+SfxEnumMenu::SfxEnumMenu( sal_uInt16 nSlotId, SfxBindings* pBind, const SfxEnumItem &rItem ):
     nSlot( nSlotId ),
     pItem( (SfxEnumItem*) rItem.Clone() ),
     pBindings( pBind )
 {
-    for ( USHORT nVal = 0; nVal < pItem->GetValueCount(); ++nVal )
+    for ( sal_uInt16 nVal = 0; nVal < pItem->GetValueCount(); ++nVal )
         InsertItem( nVal+1, pItem->GetValueTextByPos(nVal) );
-    CheckItem( pItem->GetValue() + 1, TRUE );
+    CheckItem( pItem->GetValue() + 1, sal_True );
 }
 
 //-------------------------------------------------------------------------
@@ -143,7 +143,7 @@ void SfxMenuControl::SetOwnMenu( SfxVirtualMenu* pMenu )
 
 void SfxMenuControl::Bind(
     SfxVirtualMenu* pOwn,
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     const String& rTitle,
     const String &rHelpText,
     SfxBindings &rBindings )
@@ -169,7 +169,7 @@ void SfxMenuControl::Bind(
 
 void SfxMenuControl::Bind(
     SfxVirtualMenu* pOwn,
-    USHORT nSlotId,
+    sal_uInt16 nSlotId,
     SfxVirtualMenu& rMenu,
     const String& rTitle,
     const String &rHelpText,
@@ -188,7 +188,7 @@ void SfxMenuControl::Bind(
 
 // ctor for explicit registration
 
-SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
+SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings )
 :   pOwnMenu(0),
     pSubMenu(0),
     b_ShowStrings(bShowStrings)
@@ -203,18 +203,18 @@ SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
 SfxMenuControl::SfxMenuControl():
     pOwnMenu(0),
     pSubMenu(0),
-    b_ShowStrings(FALSE)
+    b_ShowStrings(sal_False)
 {
     DBG_MEMTEST();
 }
 
 //--------------------------------------------------------------------
 
-SfxMenuControl::SfxMenuControl(USHORT nSlotId, SfxBindings& rBindings):
+SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings):
     SfxControllerItem(nSlotId, rBindings),
     pOwnMenu(0),
     pSubMenu(0),
-    b_ShowStrings(FALSE)
+    b_ShowStrings(sal_False)
 {
     DBG_MEMTEST();
 
@@ -248,7 +248,7 @@ void SfxMenuControl::RemovePopup()
 
 void SfxMenuControl::StateChanged
 (
-    USHORT              nSID,
+    sal_uInt16              nSID,
     SfxItemState        eState,
     const SfxPoolItem*  pState
 )
@@ -258,14 +258,14 @@ void SfxMenuControl::StateChanged
     DBG_ASSERT( nSID == GetId(), "strange SID" );
     DBG_ASSERT( pOwnMenu != 0, "setting state to dangling SfxMenuControl" );
 
-    FASTBOOL bIsObjMenu =
+    int bIsObjMenu =
                 GetId() >= SID_OBJECTMENU0 && GetId() < SID_OBJECTMENU_LAST;
 
     // enabled/disabled-Flag pauschal korrigieren
 
 #ifdef UNIX
     if (nSID == SID_PASTE)
-        pOwnMenu->EnableItem( GetId(), TRUE );
+        pOwnMenu->EnableItem( GetId(), sal_True );
     else
 #endif
     pOwnMenu->EnableItem( GetId(), bIsObjMenu
@@ -276,7 +276,7 @@ void SfxMenuControl::StateChanged
     {
         // checken nur bei nicht-Object-Menus
         if ( !bIsObjMenu )
-            pOwnMenu->CheckItem( GetId(), FALSE );
+            pOwnMenu->CheckItem( GetId(), sal_False );
 
         // SetItemText flackert in MenuBar insbes. unter OS/2 (Bug #20658)
         if ( // !bIsObjMenu && nicht wegen "Format/Datenbank"
@@ -343,14 +343,14 @@ void SfxMenuControl::StateChanged
 
 //--------------------------------------------------------------------
 
-SfxMenuControl* SfxMenuControl::CreateImpl( USHORT /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ )
+SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ )
 {
-    return new SfxMenuControl( TRUE );
+    return new SfxMenuControl( sal_True );
 }
 
 //--------------------------------------------------------------------
 
-void SfxMenuControl::RegisterControl( USHORT nSlotId, SfxModule *pMod )
+void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
 {
     RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
                 SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
@@ -362,7 +362,7 @@ void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pF
     SFX_APP()->RegisterMenuControl_Impl( pMod, pFact );
 }
 
-SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindings &rBindings )
+SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
 {
     TypeId aSlotType = SFX_SLOTPOOL().GetSlotType(nId);
     if ( aSlotType )
@@ -376,7 +376,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
             if ( pFactories )
             {
                 SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
-                for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+                for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
                     if ( rFactories[nFactory]->nTypeId == aSlotType &&
                          ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                            ( rFactories[nFactory]->nSlotId == nId) ) )
@@ -386,7 +386,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
 
         SfxMenuCtrlFactArr_Impl &rFactories = pApp->GetMenuCtrlFactories_Impl();
 
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
             if ( rFactories[nFactory]->nTypeId == aSlotType &&
                  ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                    ( rFactories[nFactory]->nSlotId == nId) ) )
@@ -395,7 +395,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( USHORT nId, Menu &rMenu, SfxBindi
     return 0;
 }
 
-BOOL SfxMenuControl::IsSpecialControl( USHORT nId, SfxModule* pMod  )
+sal_Bool SfxMenuControl::IsSpecialControl( sal_uInt16 nId, SfxModule* pMod  )
 {
     TypeId aSlotType = SFX_SLOTPOOL().GetSlotType( nId );
     if ( aSlotType )
@@ -406,21 +406,21 @@ BOOL SfxMenuControl::IsSpecialControl( USHORT nId, SfxModule* pMod  )
             if ( pFactories )
             {
                 SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
-                for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+                for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
                     if ( rFactories[nFactory]->nTypeId == aSlotType &&
                          ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                            ( rFactories[nFactory]->nSlotId == nId) ) )
-                        return TRUE;
+                        return sal_True;
             }
         }
 
         SfxMenuCtrlFactArr_Impl &rFactories = SFX_APP()->GetMenuCtrlFactories_Impl();
 
-        for ( USHORT nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
+        for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
             if ( rFactories[nFactory]->nTypeId == aSlotType &&
                  ( ( rFactories[nFactory]->nSlotId == 0 ) ||
                    ( rFactories[nFactory]->nSlotId == nId) ) )
-                return TRUE;
+                return sal_True;
     }
     return 0;
 }
@@ -440,7 +440,7 @@ long Select_Impl( void* pHdl, void* pVoid );
 SFX_IMPL_MENU_CONTROL( SfxAppMenuControl_Impl, SfxStringItem );
 
 SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
-    USHORT nPos, Menu& rMenu, SfxBindings& rBindings )
+    sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
     : SfxMenuControl( nPos, rBindings ), pMenu(0)
 {
     String aText = rMenu.GetItemText( nPos );
@@ -473,9 +473,9 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
     if ( pActMenu )
     {
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
-        BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
-        BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
+        sal_uIntPtr nSymbolsStyle = rSettings.GetSymbolsStyle();
+        sal_Bool bIsHiContrastMode = rSettings.GetHighContrastMode();
+        sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
             ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
@@ -485,10 +485,10 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
             m_bWasHiContrastMode    = bIsHiContrastMode;
             m_bShowMenuImages       = bShowMenuImages;
 
-            USHORT nCount = pActMenu->GetItemCount();
-            for ( USHORT nSVPos = 0; nSVPos < nCount; nSVPos++ )
+            sal_uInt16 nCount = pActMenu->GetItemCount();
+            for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ )
             {
-                USHORT nItemId = pActMenu->GetItemId( nSVPos );
+                sal_uInt16 nItemId = pActMenu->GetItemId( nSVPos );
                 if ( pActMenu->GetItemType( nSVPos ) != MENUITEM_SEPARATOR )
                 {
                     if ( bShowMenuImages )
@@ -504,7 +504,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
                         if ( aImageId.getLength() > 0 )
                         {
                             Reference< ::com::sun::star::frame::XFrame > xFrame;
-                            Image aImage = GetImage( xFrame, aImageId, FALSE, bIsHiContrastMode );
+                            Image aImage = GetImage( xFrame, aImageId, sal_False, bIsHiContrastMode );
                             if ( !!aImage )
                             {
                                 bImageSet = sal_True;
@@ -516,7 +516,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
                         if ( !bImageSet && aCmd.Len() )
                         {
                             Image aImage = SvFileInformationManager::GetImage(
-                                INetURLObject(aCmd), FALSE, bIsHiContrastMode );
+                                INetURLObject(aCmd), sal_False, bIsHiContrastMode );
                             if ( !!aImage )
                                 pActMenu->SetItemImage( nItemId, aImage );
                         }
@@ -527,26 +527,26 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
-        USHORT nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt )
+        sal_uInt16 nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt )
 {
     return new SfxUnoMenuControl( rCmd, nId, rMenu, rBindings, pVirt );
 }
 
 SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
-        USHORT nId, Menu& rMenu, const String& sItemText, const String& sHelpText,
+        sal_uInt16 nId, Menu& rMenu, const String& sItemText, const String& sHelpText,
         SfxBindings& rBindings, SfxVirtualMenu* pVirt)
 {
     return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, sHelpText, rBindings, pVirt);
 }
 
-SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, USHORT nSlotId,
+SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, sal_uInt16 nSlotId,
     Menu& rMenu, SfxBindings& rBindings, SfxVirtualMenu* pVirt )
     : SfxMenuControl( nSlotId, rBindings )
 {
@@ -559,7 +559,7 @@ SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, USHORT nSlotId,
 }
 
 SfxUnoMenuControl::SfxUnoMenuControl(
-    const String& rCmd, USHORT nSlotId, Menu& /*rMenu*/,
+    const String& rCmd, sal_uInt16 nSlotId, Menu& /*rMenu*/,
     const String& rItemText, const String& rHelpText,
     SfxBindings& rBindings, SfxVirtualMenu* pVirt)
     : SfxMenuControl( nSlotId, rBindings )
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 77dbd0dcb885..445b2ecc9de0 100755
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -87,8 +87,8 @@
 #include "thessubmenu.hxx"
 
 
-static const USHORT nCompatVersion = 4;
-static const USHORT nVersion = 5;
+static const sal_uInt16 nCompatVersion = 4;
+static const sal_uInt16 nVersion = 5;
 
 // static member initialization
 PopupMenu * SfxPopupMenuManager::pStaticThesSubMenu = NULL;
@@ -119,7 +119,7 @@ SfxMenuManager::SfxMenuManager( const ResId& rResId, SfxBindings &rBindings )
     pResMgr(rResId.GetResMgr()),
     nType( rResId.GetId() )
 {
-    bAddClipboardFuncs = FALSE;
+    bAddClipboardFuncs = sal_False;
     DBG_MEMTEST();
 }
 
@@ -154,8 +154,8 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
     {
         SfxObjectShell* pDoc = pView->GetObjectShell();
         pMenu->InsertSeparator();
-        USHORT nr=0;
-        for ( USHORT n = 0; n < aVerbs.getLength(); ++n )
+        sal_uInt16 nr=0;
+        for ( sal_uInt16 n = 0; n < aVerbs.getLength(); ++n )
         {
             // check for ReadOnly verbs
             if ( pDoc->IsReadOnly() && !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_NEVERDIRTIES) )
@@ -166,7 +166,7 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
                 continue;
 
             // neue Id vergeben
-            USHORT nId = SID_VERB_START + nr++;
+            sal_uInt16 nId = SID_VERB_START + nr++;
             DBG_ASSERT(nId <= SID_VERB_END, "Zuviele Verben!");
             if ( nId > SID_VERB_END )
                 break;
@@ -239,10 +239,10 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
             if (sThesImplName.Len() > 0 && aSynonymsImageUrl.getLength() > 0)
                 aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) );
 
-            for (USHORT i = 0; (size_t)i < nNumSynonyms; ++i)
+            for (sal_uInt16 i = 0; (size_t)i < nNumSynonyms; ++i)
             {
                 //! item ids should start with values > 0, since 0 has special meaning
-                const USHORT nId = i + 1;
+                const sal_uInt16 nId = i + 1;
 
                 String aItemText( linguistic::GetThesaurusReplaceText( aSynonyms[i] ) );
                 pThesSubMenu->InsertItem( nId, aItemText );
@@ -297,10 +297,10 @@ void SfxMenuManager::UseDefault()
 
         if ( bAddClipboardFuncs )
         {
-            USHORT n, nCount = pSVMenu->GetItemCount();
+            sal_uInt16 n, nCount = pSVMenu->GetItemCount();
             for ( n=0; n<nCount; n++ )
             {
-                USHORT nId = pSVMenu->GetItemId( n );
+                sal_uInt16 nId = pSVMenu->GetItemId( n );
                 if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
                     break;
             }
@@ -312,13 +312,13 @@ void SfxMenuManager::UseDefault()
                 pSVMenu->InsertSeparator();
                 for ( n=0; n<nCount; n++ )
                 {
-                    USHORT nId = aPop.GetItemId( n );
+                    sal_uInt16 nId = aPop.GetItemId( n );
                     pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
                 }
             }
         }
 
-        pVMenu = new SfxVirtualMenu( pSVMenu, FALSE, *pBindings, TRUE, TRUE );
+        pVMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
     }
 
     Construct(*pVMenu);
@@ -336,7 +336,7 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
 {
     DBG_MEMTEST();
 
-    USHORT nId = (USHORT) pSelMenu->GetCurItemId();
+    sal_uInt16 nId = (sal_uInt16) pSelMenu->GetCurItemId();
     String aCommand = pSelMenu->GetItemCommand( nId );
     if ( !aCommand.Len() && pBindings )
     {
@@ -359,12 +359,12 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
         // special menu function
         pBindings->GetDispatcher_Impl()->Execute( nId );
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
-void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
+void SfxMenuManager::Construct_Impl( Menu* pSVMenu, sal_Bool bWithHelp )
 {
     SfxVirtualMenu *pOldVirtMenu=0;
     if ( pMenu )
@@ -375,7 +375,7 @@ void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
     }
 
     TryToHideDisabledEntries_Impl( pSVMenu );
-    SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, TRUE );
+    SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, sal_True );
     Construct(*pVMenu);
 
     if ( pOldVirtMenu )
@@ -409,10 +409,10 @@ void SfxPopupMenuManager::RemoveDisabledEntries()
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
 {
     DBG_MEMTEST();
-    USHORT nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
+    sal_uInt16 nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos );
     delete pStaticThesSubMenu;  pStaticThesSubMenu = NULL;
     return nVal;
 }
@@ -428,13 +428,13 @@ IMPL_LINK_INLINE_END( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG )
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 )
 {
     DBG_MEMTEST();
 
     PopupMenu* pPopMenu = ( (PopupMenu*)GetMenu()->GetSVMenu() );
     pPopMenu->SetSelectHdl( LINK( this, SfxPopupMenuManager, SelectHdl ) );
-    USHORT nId = pPopMenu->Execute( pWindow, rPoint );
+    sal_uInt16 nId = pPopMenu->Execute( pWindow, rPoint );
     pPopMenu->SetSelectHdl( Link() );
 
     if ( nId )
@@ -445,7 +445,7 @@ USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_li
 
 //--------------------------------------------------------------------
 
-USHORT SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... )
+sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... )
 {
     DBG_MEMTEST();
 
@@ -470,21 +470,21 @@ void SfxPopupMenuManager::StartInsert()
 void SfxPopupMenuManager::EndInsert()
 {
     pBindings->ENTERREGISTRATIONS();
-    pMenu = new SfxVirtualMenu( pSVMenu, FALSE, *pBindings, TRUE, TRUE );
+    pMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
     Construct( *pMenu );
     pBindings->LEAVEREGISTRATIONS();
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::InsertSeparator( USHORT nPos )
+void SfxPopupMenuManager::InsertSeparator( sal_uInt16 nPos )
 {
     pSVMenu->InsertSeparator( nPos );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, USHORT nPos )
+void SfxPopupMenuManager::InsertItem( sal_uInt16 nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, sal_uInt16 nPos )
 {
     pSVMenu->InsertItem( nId, rName, nBits,nPos );
     pSVMenu->SetHelpId( nId, rHelpId );
@@ -492,21 +492,21 @@ void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemB
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::RemoveItem( USHORT nId )
+void SfxPopupMenuManager::RemoveItem( sal_uInt16 nId )
 {
     pSVMenu->RemoveItem( nId );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxPopupMenuManager::CheckItem( USHORT nId, BOOL bCheck )
+void SfxPopupMenuManager::CheckItem( sal_uInt16 nId, sal_Bool bCheck )
 {
     pSVMenu->CheckItem( nId, bCheck );
 }
 
 void SfxPopupMenuManager::AddClipboardFunctions()
 {
-    bAddClipboardFuncs = TRUE;
+    bAddClipboardFuncs = sal_True;
 }
 
 SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
@@ -516,8 +516,8 @@ SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
     pResMgr(NULL),
     nType(0)
 {
-    bAddClipboardFuncs = FALSE;
-    SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, FALSE, rBindings, TRUE, TRUE );
+    bAddClipboardFuncs = sal_False;
+    SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, sal_False, rBindings, sal_True, sal_True );
     Construct(*pVMenu);
 }
 
@@ -530,10 +530,10 @@ SfxPopupMenuManager::SfxPopupMenuManager( PopupMenu* pMenuArg, SfxBindings& rBin
 SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow )
 {
     PopupMenu *pSVMenu = new PopupMenu( rResId );
-    USHORT n, nCount = pSVMenu->GetItemCount();
+    sal_uInt16 n, nCount = pSVMenu->GetItemCount();
     for ( n=0; n<nCount; n++ )
     {
-        USHORT nId = pSVMenu->GetItemId( n );
+        sal_uInt16 nId = pSVMenu->GetItemId( n );
         if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
             break;
     }
@@ -549,7 +549,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
         pSVMenu->InsertSeparator();
         for ( n=0; n<nCount; n++ )
         {
-            USHORT nId = aPop.GetItemId( n );
+            sal_uInt16 nId = aPop.GetItemId( n );
             pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
             pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
         }
@@ -582,10 +582,10 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
 void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, Window* pWindow )
 {
     PopupMenu *pSVMenu = new PopupMenu( rResId );
-    USHORT n, nCount = pSVMenu->GetItemCount();
+    sal_uInt16 n, nCount = pSVMenu->GetItemCount();
     for ( n=0; n<nCount; n++ )
     {
-        USHORT nId = pSVMenu->GetItemId( n );
+        sal_uInt16 nId = pSVMenu->GetItemId( n );
         if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
             break;
     }
@@ -599,7 +599,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
         pSVMenu->InsertSeparator();
         for ( n=0; n<nCount; n++ )
         {
-            USHORT nId = aPop.GetItemId( n );
+            sal_uInt16 nId = aPop.GetItemId( n );
             pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
             pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
         }
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx
index e9d609151504..639669ab90c3 100644
--- a/sfx2/source/menu/objmnctl.cxx
+++ b/sfx2/source/menu/objmnctl.cxx
@@ -59,7 +59,7 @@ using namespace com::sun::star;
     in seinen Parent ein.
  */
 
-SfxObjectVerbsControl::SfxObjectVerbsControl(USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings)
+SfxObjectVerbsControl::SfxObjectVerbsControl(sal_uInt16 nSlotId, Menu &rMenu, SfxBindings &rBindings)
     : SfxMenuControl( nSlotId, rBindings )
     , pMenu(new PopupMenu)
     , rParent(rMenu)
@@ -85,8 +85,8 @@ void SfxObjectVerbsControl::FillMenu()
         const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs =  pView->GetVerbs();
         if ( aVerbs.getLength() )
         {
-            USHORT nSlotId = SID_VERB_START;
-            for (USHORT n=0; n<aVerbs.getLength(); n++)
+            sal_uInt16 nSlotId = SID_VERB_START;
+            for (sal_uInt16 n=0; n<aVerbs.getLength(); n++)
             {
                 // check for ReadOnly verbs
                 if ( pDoc->IsReadOnly() && !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_NEVERDIRTIES) )
@@ -105,7 +105,7 @@ void SfxObjectVerbsControl::FillMenu()
         }
     }
 
-    rParent.EnableItem( GetId(), (BOOL)pMenu->GetItemCount() );
+    rParent.EnableItem( GetId(), (sal_Bool)pMenu->GetItemCount() );
 }
 
 //--------------------------------------------------------------------
@@ -119,7 +119,7 @@ void SfxObjectVerbsControl::FillMenu()
  */
 
 void SfxObjectVerbsControl::StateChanged(
-    USHORT /*nSID*/,
+    sal_uInt16 /*nSID*/,
     SfxItemState eState,
     const SfxPoolItem* /*pState*/ )
 {
@@ -137,7 +137,7 @@ void SfxObjectVerbsControl::StateChanged(
 
 IMPL_LINK_INLINE_START( SfxObjectVerbsControl, MenuSelect, Menu *, pSelMenu )
 {
-    const USHORT nSlotId = pSelMenu->GetCurItemId();
+    const sal_uInt16 nSlotId = pSelMenu->GetCurItemId();
     if( nSlotId )
         GetBindings().Execute(nSlotId);
     return 1;
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index f0408a66a408..c6e09245184d 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -84,21 +84,21 @@ class SfxMenuImageControl_Impl : public SfxControllerItem
 {
     SfxVirtualMenu*     pMenu;
     long                lRotation;
-    BOOL                bIsMirrored;
+    sal_Bool                bIsMirrored;
 
 protected:
-    virtual void        StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
 public:
-                        SfxMenuImageControl_Impl( USHORT nSlotId, SfxBindings& rBindings, SfxVirtualMenu* pVMenu )
+                        SfxMenuImageControl_Impl( sal_uInt16 nSlotId, SfxBindings& rBindings, SfxVirtualMenu* pVMenu )
                             : SfxControllerItem( nSlotId, rBindings )
                             , pMenu( pVMenu )
                             , lRotation( 0 )
-                            , bIsMirrored( FALSE )
+                            , bIsMirrored( sal_False )
                         {}
     void                Update();
 };
 
-void SfxMenuImageControl_Impl::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
+void SfxMenuImageControl_Impl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
 {
     const SfxImageItem* pItem = PTR_CAST( SfxImageItem, pState );
     if ( pItem )
@@ -115,13 +115,13 @@ void SfxMenuImageControl_Impl::Update()
     SfxModule* pModule = pViewFrame->GetObjectShell()->GetModule();
     SfxSlotPool* pPool = pModule->GetSlotPool();
     Menu* pSVMenu = pMenu->GetSVMenu();
-    for (USHORT nPos = 0; nPos<pSVMenu->GetItemCount(); nPos++)
+    for (sal_uInt16 nPos = 0; nPos<pSVMenu->GetItemCount(); nPos++)
     {
-        USHORT nslotId = pSVMenu->GetItemId( nPos );
+        sal_uInt16 nslotId = pSVMenu->GetItemId( nPos );
         const SfxSlot* pSlot = pPool->GetSlot( nslotId );
         if ( pSlot && pSlot->IsMode( SFX_SLOT_IMAGEROTATION ) )
         {
-            pSVMenu->SetItemImageMirrorMode( nslotId, FALSE );
+            pSVMenu->SetItemImageMirrorMode( nslotId, sal_False );
             pSVMenu->SetItemImageAngle( nslotId, lRotation );
         }
 
@@ -135,8 +135,8 @@ void SfxMenuImageControl_Impl::Update()
 static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
                                  const rtl::OUString& aImageId,
                                  const rtl::OUString& aURL,
-                                 BOOL bBigImage,
-                                 BOOL bHiContrast )
+                                 sal_Bool bBigImage,
+                                 sal_Bool bHiContrast )
 {
     Image aImage;
 
@@ -161,7 +161,7 @@ static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFr
     darauf, ob die Applikation OLE-Server ist oder nicht.
 */
 
-BOOL IsItemHidden_Impl( USHORT nItemId, int bOleServer, int bMac )
+sal_Bool IsItemHidden_Impl( sal_uInt16 nItemId, int bOleServer, int bMac )
 {
     return ( bMac &&
              ( nItemId == SID_MINIMIZED ) ) ||
@@ -192,9 +192,9 @@ void SfxVirtualMenu::Construct_Impl()
 
 //--------------------------------------------------------------------
 
-SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
-                SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp,
-                SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
+SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId,
+                SfxVirtualMenu* pOwnParent, Menu& rMenu, sal_Bool bWithHelp,
+                SfxBindings &rBindings, sal_Bool bOLEServer, sal_Bool bRes, sal_Bool bIsAddonMenu ):
     pItems(0),
        pImageControl(0),
     pBindings(&rBindings),
@@ -202,7 +202,7 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
     pAutoDeactivate(0),
     nLocks(0),
     bHelpInitialized( bWithHelp ),
-    bWasHighContrast( FALSE ),
+    bWasHighContrast( sal_False ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
     DBG_MEMTEST();
@@ -218,19 +218,19 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
     pWindowMenu = NULL;
     pPickMenu = NULL;
     pAddonsMenu = NULL;
-    bIsActive = FALSE;
-    bControllersUnBound = FALSE;
+    bIsActive = sal_False;
+    bControllersUnBound = sal_False;
     CreateFromSVMenu();
     Construct_Impl();
-    bHelpInitialized = FALSE;
+    bHelpInitialized = sal_False;
 }
 
 //--------------------------------------------------------------------
 
 // creates a virtual menu from a StarView MenuBar or PopupMenu
 
-SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
-                    SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
+SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
+                    SfxBindings &rBindings, sal_Bool bOLEServer, sal_Bool bRes, sal_Bool bIsAddonMenu ):
     pItems(0),
        pImageControl(0),
     pBindings(&rBindings),
@@ -238,7 +238,7 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
     pAutoDeactivate(0),
     nLocks(0),
     bHelpInitialized( bWithHelp ),
-    bWasHighContrast( FALSE ),
+    bWasHighContrast( sal_False ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
     DBG_MEMTEST();
@@ -255,11 +255,11 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
     pWindowMenu = NULL;
     pPickMenu = NULL;
     pAddonsMenu = NULL;
-    bIsActive = FALSE;
-    bControllersUnBound = FALSE;
+    bIsActive = sal_False;
+    bControllersUnBound = sal_False;
     CreateFromSVMenu();
     Construct_Impl();
-    bHelpInitialized = FALSE;
+    bHelpInitialized = sal_False;
 }
 
 //--------------------------------------------------------------------
@@ -280,7 +280,7 @@ SfxVirtualMenu::~SfxVirtualMenu()
 
     if ( bIsActive )
     {
-        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = FALSE;
+        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False;
     }
 
     // QAP-Hack
@@ -325,7 +325,7 @@ SfxVirtualMenu::~SfxVirtualMenu()
 }
 //--------------------------------------------------------------------
 
-BOOL SfxVirtualMenu::IsHiContrastMode() const
+sal_Bool SfxVirtualMenu::IsHiContrastMode() const
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     return rSettings.GetHighContrastMode();
@@ -346,7 +346,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
     if ( pSVMenu->IsMenuBar() )
     {
-        USHORT nPos = pSVMenu->GetItemPos( SID_MDIWINDOWLIST );
+        sal_uInt16 nPos = pSVMenu->GetItemPos( SID_MDIWINDOWLIST );
         if ( nPos != MENU_ITEM_NOTFOUND && xFrame.is() )
         {
             // Retrieve addon popup menus and add them to our menu bar
@@ -387,8 +387,8 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
     // remember some values
     SFX_APP();
-    const int bOleServer = FALSE;
-    const int bMac = FALSE;
+    const int bOleServer = sal_False;
+    const int bMac = sal_False;
     SvtMenuOptions aOptions;
     aOptions.AddListenerLink( LINK( this, SfxVirtualMenu, SettingsChanged ) );
 
@@ -399,10 +399,10 @@ void SfxVirtualMenu::CreateFromSVMenu()
     // Update high contrast state
     bWasHighContrast = IsHiContrastMode();
 
-    USHORT nSVPos = 0;
-    for ( USHORT nPos=0; nPos<nCount; ++nPos, ++nSVPos )
+    sal_uInt16 nSVPos = 0;
+    for ( sal_uInt16 nPos=0; nPos<nCount; ++nPos, ++nSVPos )
     {
-        USHORT nSlotId = pSVMenu->GetItemId(nSVPos);
+        sal_uInt16 nSlotId = pSVMenu->GetItemId(nSVPos);
         PopupMenu* pPopup = pSVMenu->GetPopupMenu(nSlotId);
         if( pPopup && nSlotId >= SID_OBJECTMENU0 && nSlotId <= SID_OBJECTMENU_LAST )
         {
@@ -439,7 +439,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    Image aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+                    Image aImage = GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast );
                     pSVMenu->SetItemImage( nSlotId, aImage );
                 }
             }
@@ -536,13 +536,13 @@ void SfxVirtualMenu::CreateFromSVMenu()
                             if ( pMenuAttributes )
                                 aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                            aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bWasHighContrast );
+                            aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, sal_False, bWasHighContrast );
                         }
                         else
                         {
                             rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                             aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                            aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+                            aImage = GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast );
                         }
 
                         if ( !!aImage )
@@ -584,27 +584,27 @@ IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu )
     if ( pMenu == pSVMenu )
     {
         // AutoDeactivate ist jetzt nicht mehr n"otig
-        //USHORT nSlotId = pMenu->GetCurItemId();
+        //sal_uInt16 nSlotId = pMenu->GetCurItemId();
         if ( pAutoDeactivate )
             pAutoDeactivate->Stop();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
 {
-    USHORT nItemCount = pSVMenu->GetItemCount();
+    sal_uInt16 nItemCount = pSVMenu->GetItemCount();
     SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
-    BOOL bIsHiContrastMode = IsHiContrastMode();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIsHiContrastMode = IsHiContrastMode();
     Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
     if ( !bIsAddonPopupMenu )
     {
-        for ( USHORT nSVPos=0; nSVPos<nItemCount; ++nSVPos )
+        for ( sal_uInt16 nSVPos=0; nSVPos<nItemCount; ++nSVPos )
         {
-            USHORT          nSlotId = pSVMenu->GetItemId( nSVPos );
+            sal_uInt16          nSlotId = pSVMenu->GetItemId( nSVPos );
             MenuItemType    nType   = pSVMenu->GetItemType( nSVPos );
             if ( nType == MENUITEM_STRING && bIcons )
             {
@@ -620,13 +620,13 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
                     if ( pMenuAttributes )
                         aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, sal_False, bIsHiContrastMode ));
                 }
                 else
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast ));
                 }
             }
             else if( nType == MENUITEM_STRINGIMAGE && !bIcons )
@@ -663,18 +663,18 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
 
 void SfxVirtualMenu::UpdateImages()
 {
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
 
     if ( bIcons )
     {
-        BOOL            bIsHiContrastMode   = IsHiContrastMode();
-        USHORT          nItemCount          = pSVMenu->GetItemCount();
+        sal_Bool            bIsHiContrastMode   = IsHiContrastMode();
+        sal_uInt16          nItemCount          = pSVMenu->GetItemCount();
         SfxViewFrame *  pViewFrame          = pBindings->GetDispatcher()->GetFrame();
         Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
-        for ( USHORT nSVPos=0; nSVPos < nItemCount; ++nSVPos )
+        for ( sal_uInt16 nSVPos=0; nSVPos < nItemCount; ++nSVPos )
         {
-            USHORT nSlotId = pSVMenu->GetItemId( nSVPos );
+            sal_uInt16 nSlotId = pSVMenu->GetItemId( nSVPos );
             if ( pSVMenu->GetItemType( nSVPos ) == MENUITEM_STRINGIMAGE )
             {
                 if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
@@ -689,13 +689,13 @@ void SfxVirtualMenu::UpdateImages()
                     if ( pMenuAttributes )
                         aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, sal_False, bIsHiContrastMode ));
                 }
                 else
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast ));
                 }
             }
         }
@@ -714,16 +714,16 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
 
     framework::AddonsOptions    aAddonOptions;
 
-    BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
+    sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
     if ( bIcons )
     {
-        BOOL            bIsHiContrastMode   = IsHiContrastMode();
-        USHORT          nItemCount          = pMenu->GetItemCount();
+        sal_Bool            bIsHiContrastMode   = IsHiContrastMode();
+        sal_uInt16          nItemCount          = pMenu->GetItemCount();
         Reference<com::sun::star::frame::XFrame> aXFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() );
 
-        for ( USHORT nPos=0; nPos < nItemCount; ++nPos )
+        for ( sal_uInt16 nPos=0; nPos < nItemCount; ++nPos )
         {
-            USHORT nSlotId = pMenu->GetItemId( nPos );
+            sal_uInt16 nSlotId = pMenu->GetItemId( nPos );
             PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId );
             if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
             {
@@ -735,7 +735,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
                 if ( pMenuAttributes )
                     aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE, bIsHiContrastMode ));
+                pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), sal_False, bIsHiContrastMode ));
             }
 
             if ( pPopup )
@@ -754,10 +754,10 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
     if ( !pMenu )
         return;
 
-    USHORT nItemCount = pMenu->GetItemCount();
-    for ( USHORT nPos=0; nPos < nItemCount; ++nPos )
+    sal_uInt16 nItemCount = pMenu->GetItemCount();
+    for ( sal_uInt16 nPos=0; nPos < nItemCount; ++nPos )
     {
-        USHORT nSlotId = pMenu->GetItemId( nPos );
+        sal_uInt16 nSlotId = pMenu->GetItemId( nPos );
         PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId );
         if ( pMenu->GetItemType( nPos ) == MENUITEM_STRINGIMAGE )
             pMenu->SetItemImage( nSlotId, Image() );
@@ -768,18 +768,18 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
 
 //--------------------------------------------------------------------
 
-FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
+int SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 {
-    // Selber suchen, da SV mit 'USHORT nSID = pSVMenu->GetCurItemId();' immer
+    // Selber suchen, da SV mit 'sal_uInt16 nSID = pSVMenu->GetCurItemId();' immer
     // 0 liefert. Das ist so, weil die Event-Weiterleitung lt. TH nichts mit
     // CurItem des Parent-Menus zu tun hat.
     sal_uInt32 nAddonsPopupPrefixLen = ADDONSPOPUPMENU_URL_PREFIX.getLength();
 
-    for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
     {
         // angesprochenes Sub-Menu gefunden?
-        FASTBOOL bFound = FALSE;
-        USHORT nSID = pSVMenu->GetItemId(nPos);
+        int bFound = sal_False;
+        sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
         SfxMenuControl &rCtrl = pItems[nPos];
         bFound = pSVMenu->GetPopupMenu(nSID) == pMenu;
         SfxVirtualMenu *pSubMenu = rCtrl.GetPopupMenu();
@@ -789,7 +789,7 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
             // Nur ein gebundener Menu-Controller hat schon seine Id!
             if ( !rCtrl.GetId() )
             {
-                bIsAddonPopupMenu = FALSE;
+                bIsAddonPopupMenu = sal_False;
                 DBG_ASSERT( !pSubMenu, "Popup schon vorhanden!");
 
                 // Check if the popup is an Add-On popup menu
@@ -799,12 +799,12 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
                      ( nSID == SID_ADDONHELP ) ||
                      (( (sal_uInt32)aCommand.getLength() > nAddonsPopupPrefixLen ) &&
                       ( aCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 )) )
-                    bIsAddonPopupMenu = TRUE;
+                    bIsAddonPopupMenu = sal_True;
 
                 // VirtualMenu f"ur Sub-Menu erzeugen
-                BOOL bRes = bResCtor;
+                sal_Bool bRes = bResCtor;
                 pSubMenu = new SfxVirtualMenu( nSID, this,
-                        *pMenu, FALSE, *pBindings, bOLE, bRes, bIsAddonPopupMenu );
+                        *pMenu, sal_False, *pBindings, bOLE, bRes, bIsAddonPopupMenu );
 
                 DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
 
@@ -824,18 +824,18 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 
         // gefunden, dann abbrechen
         if ( bFound )
-            return TRUE;
+            return sal_True;
     }
 
     // nicht in diesem Untermenu gefunden
-    return FALSE;
+    return sal_False;
 }
 
 void SfxVirtualMenu::BindControllers()
 {
     pBindings->ENTERREGISTRATIONS();
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < nCount; ++nPos )
     {
         SfxMenuControl& rCtrl = pItems[nPos];
@@ -847,20 +847,20 @@ void SfxVirtualMenu::BindControllers()
     for ( nPos=0; nPos<rCtrlArr.Count(); nPos++ )
     {
         SfxMenuControl* pCtrl = rCtrlArr[nPos];
-        USHORT nSlotId = pCtrl->GetId();
+        sal_uInt16 nSlotId = pCtrl->GetId();
         if ( !pSVMenu->GetItemCommand(nSlotId).Len() )
             pCtrl->ReBind();
     }
 
     pBindings->LEAVEREGISTRATIONS();
-    bControllersUnBound = FALSE;
+    bControllersUnBound = sal_False;
 }
 
 void SfxVirtualMenu::UnbindControllers()
 {
     pBindings->ENTERREGISTRATIONS();
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     for ( nPos = 0; nPos < nCount; ++nPos )
     {
         SfxMenuControl &rCtrl = pItems[nPos];
@@ -878,7 +878,7 @@ void SfxVirtualMenu::UnbindControllers()
     }
 
     pBindings->LEAVEREGISTRATIONS();
-    bControllersUnBound = TRUE;
+    bControllersUnBound = sal_True;
 }
 
 
@@ -902,7 +902,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
     // Create menu item at the end of the tools popup menu for the addons popup menu
     if ( pAddonMenu && pAddonMenu->GetItemCount() > 0 )
     {
-        USHORT nItemCount = pMenu->GetItemCount();
+        sal_uInt16 nItemCount = pMenu->GetItemCount();
         String aAddonsTitle( SfxResId( STR_MENU_ADDONS ));
         if ( nItemCount > 0 && pMenu->GetItemType( nItemCount-1 ) != MENUITEM_SEPARATOR )
             pMenu->InsertSeparator();
@@ -913,7 +913,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
         {
                rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
-         pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+         pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, sal_False, bWasHighContrast ));
         }
     }
     else
@@ -951,7 +951,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
     {
         // doppelt-Activate verhindern
         if ( bIsActive )
-            return TRUE;
+            return sal_True;
 
         // ggf. Pick-Menu erzeugen
         if ( pParent && pSVMenu == pParent->pPickMenu )
@@ -968,8 +968,8 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
             Reference< XDesktop > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
                                             DEFINE_CONST_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
 
-            USHORT  nActiveItemId = 0;
-            USHORT  nItemId = START_ITEMID_WINDOWLIST;
+            sal_uInt16  nActiveItemId = 0;
+            sal_uInt16  nItemId = START_ITEMID_WINDOWLIST;
 
             if ( xDesktop.is() )
             {
@@ -1038,9 +1038,9 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 
         //InvalidateKeyCodes();
         pBindings->GetDispatcher_Impl()->Flush();
-        for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+        for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         {
-            USHORT nSlotId = (pItems+nPos)->GetId();
+            sal_uInt16 nSlotId = (pItems+nPos)->GetId();
             if ( nSlotId && nSlotId > END_ITEMID_WINDOWLIST )
                 pBindings->Update(nSlotId);
         }
@@ -1055,7 +1055,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         }
 
         // bis zum Deactivate die Statusupdates unterdr"ucken
-        pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = TRUE;
+        pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = sal_True;
 
         if ( pAutoDeactivate ) // QAP-Hack
             pAutoDeactivate->Start();
@@ -1071,7 +1071,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         }
 
         // erledigt
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -1100,9 +1100,9 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
         // das Menue deaktiviert ( = zugeklappt ) wird
         if ( pParent )
             UnbindControllers();
-        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = FALSE;
+        pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 //--------------------------------------------------------------------
 
@@ -1110,20 +1110,20 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
 
 IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
 {
-    USHORT nSlotId = (USHORT) pMenu->GetCurItemId();
+    sal_uInt16 nSlotId = (sal_uInt16) pMenu->GetCurItemId();
     DBG_OUTF( ("SfxVirtualMenu %lx selected %u from %lx", this, nSlotId, pMenu) );
 /*
     if ( pSVMenu->GetItemCommand( nSlotId ).Len() )
     {
         SfxMenuCtrlArr_Impl& rCtrlArr = GetAppCtrl_Impl();
-        for ( USHORT nPos=0; nPos<rCtrlArr.Count(); nPos++ )
+        for ( sal_uInt16 nPos=0; nPos<rCtrlArr.Count(); nPos++ )
         {
             SfxMenuControl* pCtrl = rCtrlArr[nPos];
             if ( pCtrl->GetId() == nSlotId )
             {
                 SfxUnoMenuControl *pUnoCtrl = (SfxUnoMenuControl*) pCtrl;
                 pUnoCtrl->Select();
-                return TRUE;
+                return sal_True;
             }
         }
     }
@@ -1135,7 +1135,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
                                         DEFINE_CONST_OUSTRING( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
         if ( xDesktop.is() )
         {
-            USHORT nTaskId = START_ITEMID_WINDOWLIST;
+            sal_uInt16 nTaskId = START_ITEMID_WINDOWLIST;
             Reference< XIndexAccess > xList( xDesktop->getFrames(), UNO_QUERY );
             sal_Int32 nFrameCount = xList->getCount();
             for ( sal_Int32 i=0; i<nFrameCount; ++i )
@@ -1154,7 +1154,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
     else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <= END_ITEMID_PICKLIST )
     {
@@ -1167,7 +1167,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
     else
         pBindings->Execute( nSlotId );
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
@@ -1186,12 +1186,12 @@ Menu* SfxVirtualMenu::GetSVMenu() const
 
 // return the position of the specified item
 
-USHORT SfxVirtualMenu::GetItemPos( USHORT nItemId ) const
+sal_uInt16 SfxVirtualMenu::GetItemPos( sal_uInt16 nItemId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    for ( USHORT nPos = 0; nPos < nCount; ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos )
         if ( (pItems+nPos)->GetId() == nItemId )
             return nPos;
     return MENU_ITEM_NOTFOUND;
@@ -1201,12 +1201,12 @@ USHORT SfxVirtualMenu::GetItemPos( USHORT nItemId ) const
 
 // returns the popup-menu assigned to the item or 0 if none
 
-SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( USHORT nItemId ) const
+SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( sal_uInt16 nItemId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nPos = GetItemPos(nItemId);
+    sal_uInt16 nPos = GetItemPos(nItemId);
     if ( nPos != MENU_ITEM_NOTFOUND )
         return (pItems+nPos)->GetPopupMenu();
     return 0;
@@ -1215,12 +1215,12 @@ SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( USHORT nItemId ) const
 
 // returns the text of the item as currently shown in the menu
 
-String SfxVirtualMenu::GetItemText( USHORT nSlotId ) const
+String SfxVirtualMenu::GetItemText( sal_uInt16 nSlotId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nPos = GetItemPos(nSlotId);
+    sal_uInt16 nPos = GetItemPos(nSlotId);
     if ( nPos != MENU_ITEM_NOTFOUND )
         return (pItems+nPos)->GetTitle();
     return String();
@@ -1229,12 +1229,12 @@ String SfxVirtualMenu::GetItemText( USHORT nSlotId ) const
 
 // returns the text of the item as currently shown in the menu
 
-String SfxVirtualMenu::GetItemHelpText( USHORT nSlotId ) const
+String SfxVirtualMenu::GetItemHelpText( sal_uInt16 nSlotId ) const
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nPos = GetItemPos(nSlotId);
+    sal_uInt16 nPos = GetItemPos(nSlotId);
     if ( nPos != MENU_ITEM_NOTFOUND )
         return (pItems+nPos)->GetHelpText();
     return String();
@@ -1244,7 +1244,7 @@ String SfxVirtualMenu::GetItemHelpText( USHORT nSlotId ) const
 
 // set the checkmark of the specified item
 
-void SfxVirtualMenu::CheckItem( USHORT nItemId, BOOL bCheck )
+void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1257,7 +1257,7 @@ void SfxVirtualMenu::CheckItem( USHORT nItemId, BOOL bCheck )
 
 // set the enabled-state of the specified item
 
-void SfxVirtualMenu::EnableItem( USHORT nItemId, BOOL bEnable )
+void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1271,7 +1271,7 @@ void SfxVirtualMenu::EnableItem( USHORT nItemId, BOOL bEnable )
 
 // set the text of the specified item
 
-void SfxVirtualMenu::SetItemText( USHORT nItemId, const String& rText )
+void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const String& rText )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
@@ -1285,14 +1285,14 @@ void SfxVirtualMenu::SetItemText( USHORT nItemId, const String& rText )
 
 //
 
-void SfxVirtualMenu::SetPopupMenu( USHORT nItemId, PopupMenu *pMenu )
+void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
         GetSVMenu()->SetPopupMenu( nItemId, pMenu );
-    for ( USHORT n = 0; n < nCount; ++n )
+    for ( sal_uInt16 n = 0; n < nCount; ++n )
     {
         SfxVirtualMenu *pSubMenu = (pItems+n)->GetPopupMenu();
         if ( pSubMenu )
@@ -1304,12 +1304,12 @@ void SfxVirtualMenu::SetPopupMenu( USHORT nItemId, PopupMenu *pMenu )
 
 // Erzwingt die Initialisierung, die sonst nur im Activate kommt
 
-void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
+void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, sal_Bool /*bOLE*/ )
 {
     DBG_MEMTEST();
     DBG_CHKTHIS(SfxVirtualMenu, 0);
 
-    USHORT nSID = pSVMenu->GetItemId(nPos);
+    sal_uInt16 nSID = pSVMenu->GetItemId(nPos);
     PopupMenu *pMenu = pSVMenu->GetPopupMenu( nSID );
 
     DBG_ASSERT( pMenu, "Hier gibt es kein Popup!");
@@ -1318,9 +1318,9 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
     if ( !rCtrl.GetId() )
     {
         // VirtualMenu f"ur Sub-Menu erzeugen
-        BOOL bRes = bResCtor;
+        sal_Bool bRes = bResCtor;
         SfxVirtualMenu *pSubMenu =
-            new SfxVirtualMenu(nSID, this, *pMenu, FALSE, *pBindings, bOLE, bRes);
+            new SfxVirtualMenu(nSID, this, *pMenu, sal_False, *pBindings, bOLE, bRes);
 
         DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
 
@@ -1332,16 +1332,16 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
 
 void SfxVirtualMenu::InitializeHelp()
 {
-    for ( USHORT nPos = 0; nPos<pSVMenu->GetItemCount(); ++nPos )
+    for ( sal_uInt16 nPos = 0; nPos<pSVMenu->GetItemCount(); ++nPos )
     {
-        USHORT nSlotId = pSVMenu->GetItemId(nPos);
+        sal_uInt16 nSlotId = pSVMenu->GetItemId(nPos);
         // TODO/CLEANUP: this code does nothing!
 //        if ( !bHelpInitialized )
 //            pSVMenu->SetHelpText( nId, rSlotPool.GetSlotHelpText_Impl( nId ) );
         SfxMenuControl &rCtrl = pItems[nPos];
         if ( nSlotId && !rCtrl.GetId() )
         {
-            InitPopup( nPos, TRUE );
+            InitPopup( nPos, sal_True );
         }
 
         SfxVirtualMenu *pSubMenu = rCtrl.GetPopupMenu();
@@ -1349,10 +1349,10 @@ void SfxVirtualMenu::InitializeHelp()
             pSubMenu->InitializeHelp();
     }
 
-    bHelpInitialized = TRUE;
+    bHelpInitialized = sal_True;
 }
 
-typedef ULONG (__LOADONCALLAPI *HelpIdFunc) ( const String& );
+typedef sal_uIntPtr (__LOADONCALLAPI *HelpIdFunc) ( const String& );
 
 void SfxVirtualMenu::SetHelpIds( ResMgr *pRes )
 {