4 files changed, 8 insertions, 8 deletions
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index 6cfe3fc7a0dd..e8a9da8d6d6c 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -37,7 +37,7 @@ namespace framework
 class FWE_DLLPUBLIC 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..7d01b3c6f9d8 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_uLong nEvent );
 };
 
 class FwkTabPage : public TabPage
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
index cd82d4521b21..673a110a5097 100755
--- 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;