removetooltypes01: #i112600# remove tooltypes from toolkit, svtools and framework

7 files changed, 18 insertions, 18 deletions

diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index 4bc5bb8f5990..94075aa7b66b 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -92,7 +92,7 @@ class AddonMenuManager
         static sal_Bool   HasAddonMenuElements();
         static sal_Bool   HasAddonHelpMenuElements();
 
-        static sal_Bool   IsAddonMenuId( USHORT nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
+        static sal_Bool   IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
 
         // Check if the context string matches the provided xModel context
         static sal_Bool   IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext );
@@ -110,17 +110,17 @@ class AddonMenuManager
         // Merge the addon popup menus into the given menu bar at the provided pos.
         static void       MergeAddonPopupMenus( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                                 const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel,
-                                                USHORT   nMergeAtPos,
+                                                sal_uInt16   nMergeAtPos,
                                                 MenuBar* pMergeMenuBar );
 
         // Returns the next position to insert a menu item/sub menu
-        static USHORT     GetNextPos( USHORT nPos );
+        static sal_uInt16     GetNextPos( sal_uInt16 nPos );
 
         // Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType.
         static void       BuildMenu( PopupMenu*  pCurrentMenu,
                                      MenuType    nSubMenuType,
-                                     USHORT      nInsPos,
-                                     USHORT&     nUniqueMenuId,
+                                     sal_uInt16      nInsPos,
+                                     sal_uInt16&     nUniqueMenuId,
                                      com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition,
                                      const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
                                      const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel );
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index 11668d285d69..dfd9332e3725 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -67,7 +67,7 @@ class BmkMenu : public AddonMenu
 
     protected:
         BmkMenu::BmkMenuType m_nType;
-        USHORT          CreateMenuId();
+        sal_uInt16          CreateMenuId();
 
     private:
                         BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx
index 518870b354f1..64a0f8c97d86 100644
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/classes/framelistanalyzer.hxx
@@ -124,13 +124,13 @@ class FrameListAnalyzer
             if (m_xReferenceFrame == help)
             {
                 m_xHelp   = NULL;
-                m_bIsHelp = TRUE;
+                m_bIsHelp = sal_True;
             }
             else
             if (xOtherFrame == help)
             {
                 m_xHelp   = xOtherFrame;
-                m_bIsHelp = FALSE;
+                m_bIsHelp = sal_False;
             }
             </listing>
 
@@ -150,13 +150,13 @@ class FrameListAnalyzer
             if (m_xReferenceFrame == backing)
             {
                 m_xBackingComponent   = NULL;
-                m_bIsBackingComponent = TRUE;
+                m_bIsBackingComponent = sal_True;
             }
             else
             if (xOtherFrame == backing)
             {
                 m_xBackingComponent   = xOtherFrame;
-                m_bIsBackingComponent = FALSE      ;
+                m_bIsBackingComponent = sal_False      ;
             }
             </listing>
 
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index c18eef0d77c3..33d8d9fa579a 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -36,7 +36,7 @@ namespace framework
 class FwkResId : public ResId
 {
     public:
-        FwkResId( USHORT nId );
+        FwkResId( sal_uInt16 nId );
 
     static ResMgr*  GetResManager();
 };
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 3371fc6bf826..bef0f606f993 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -54,7 +54,7 @@ class FwkTabControl : public TabControl
 public:
     FwkTabControl( Window* pParent, const ResId& rResId );
 
-    void    BroadcastEvent( ULONG nEvent );
+    void    BroadcastEvent( sal_uIntPtr nEvent );
 };
 
 class FwkTabPage : public TabPage
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
index cd82d4521b21..673a110a5097 100755..100644
--- a/framework/inc/classes/fwlresid.hxx
+++ b/framework/inc/classes/fwlresid.hxx
@@ -36,7 +36,7 @@ namespace framework
 class FwlResId : public ResId
 {
     public:
-        FwlResId( USHORT nId );
+        FwlResId( sal_uInt16 nId );
 
     static ResMgr*  GetResManager();
 };
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 8826716f1d6f..11e56a7b522e 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -121,16 +121,16 @@ class MenuManager : public ThreadHelpBase           ,
         void UpdateSpecialWindowMenu( Menu* pMenu );
         void ClearMenuDispatch(const EVENTOBJECT& Source = EVENTOBJECT(),bool _bRemoveOnly = true);
         void SetHdl();
-        void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,USHORT _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
-        USHORT FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const;
+        void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
+        sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const;
 
 
         struct MenuItemHandler
         {
-            MenuItemHandler( USHORT aItemId, MenuManager* pManager, REFERENCE< XDISPATCH >& rDispatch ) :
+            MenuItemHandler( sal_uInt16 aItemId, MenuManager* pManager, REFERENCE< XDISPATCH >& rDispatch ) :
                 nItemId( aItemId ), pSubMenuManager( pManager ), xMenuItemDispatch( rDispatch ) {}
 
-            USHORT                  nItemId;
+            sal_uInt16                  nItemId;
             ::rtl::OUString         aTargetFrame;
             ::rtl::OUString         aMenuItemURL;
             ::rtl::OUString         aFilter;
@@ -144,7 +144,7 @@ class MenuManager : public ThreadHelpBase           ,
                             ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsList,
                             const MenuItemHandler* );
 
-        MenuItemHandler* GetMenuItemHandler( USHORT nItemId );
+        MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId );
 
         sal_Bool                            m_bInitialized;
         sal_Bool                            m_bDeleteMenu;