removetooltypes01: #i112600# remove tooltypes from sfx2

8 files changed, 17 insertions, 17 deletions

diff --git a/sfx2/source/inc/appbas.hxx b/sfx2/source/inc/appbas.hxx
index 8b10fcb843de..05c182419514 100644
--- a/sfx2/source/inc/appbas.hxx
+++ b/sfx2/source/inc/appbas.hxx
@@ -36,7 +36,7 @@ class SbxObject;
 //=========================================================================
 
 SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
-                   const char *pName, ULONG nSID, SbxDataType eType=SbxOBJECT,
+                   const char *pName, sal_uIntPtr nSID, SbxDataType eType=SbxOBJECT,
                    SbxClassType = SbxCLASS_PROPERTY );
 
 
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 45aed74b154a..6e0061a69cf2 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -66,7 +66,7 @@ public:
 
     static sal_Bool             MakeFolder( const String& rFolder );
     static ErrCode              QueryDiskSpace( const String& rPath, sal_Int64& rFreeBytes );
-    static ULONG                GetSize( const String& rContent );
+    static sal_uIntPtr              GetSize( const String& rContent );
 
     // please don't use this!
     static sal_Bool             Exists( const String& rContent );
diff --git a/sfx2/source/inc/mnucfga.hxx b/sfx2/source/inc/mnucfga.hxx
index bbc3c1cd63ac..609661e638e9 100644
--- a/sfx2/source/inc/mnucfga.hxx
+++ b/sfx2/source/inc/mnucfga.hxx
@@ -38,7 +38,7 @@ class SfxMenuCfgItemArr;
 
 struct SfxMenuCfgItem
 {
-    USHORT             nId;        // id of the binding or 0 if none
+    sal_uInt16             nId;        // id of the binding or 0 if none
     String             aTitle;     // title of the item
     String             aHelpText;  // Hilfetext
     String              aCommand;
diff --git a/sfx2/source/inc/nochaos.hxx b/sfx2/source/inc/nochaos.hxx
index 4b5d7fb1f40e..daa06f8e4371 100644
--- a/sfx2/source/inc/nochaos.hxx
+++ b/sfx2/source/inc/nochaos.hxx
@@ -33,7 +33,7 @@ class NoChaos
 {
 public:
     static SfxItemPool*     GetItemPool();
-    static USHORT           ReleaseItemPool();
+    static sal_uInt16           ReleaseItemPool();
 };
 
 #endif
diff --git a/sfx2/source/inc/objmnctl.hxx b/sfx2/source/inc/objmnctl.hxx
index e58c6cd5592d..cac1da05fd48 100644
--- a/sfx2/source/inc/objmnctl.hxx
+++ b/sfx2/source/inc/objmnctl.hxx
@@ -44,10 +44,10 @@ class SfxObjectVerbsControl: public SfxMenuControl
 private:
     void                FillMenu();
     DECL_LINK( MenuSelect, Menu * );
-    virtual             void StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    virtual             void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
 
 public:
-                        SfxObjectVerbsControl(USHORT, Menu&, SfxBindings&);
+                        SfxObjectVerbsControl(sal_uInt16, Menu&, SfxBindings&);
                         ~SfxObjectVerbsControl();
     virtual PopupMenu*  GetPopup() const;
     SFX_DECL_MENU_CONTROL();
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 8b5069f20296..830ba2e3b810 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -63,7 +63,7 @@ class SfxPickList : public SfxListener
 
     static osl::Mutex*      GetOrCreateMutex();
 
-    void                    CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const String& aURL, sal_uInt32 nNo );
+    void                    CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const String& aURL, sal_uInt32 nNo );
     PickListEntry*          GetPickListEntry( sal_uInt32 nIndex );
     void                    CreatePickListEntries();
     void                    RemovePickListEntries();
@@ -76,7 +76,7 @@ class SfxPickList : public SfxListener
         sal_uInt32          GetAllowedMenuSize() { return m_nAllowedMenuSize; }
         sal_uInt32          GetNumOfEntries() const { return m_aPicklistVector.size(); }
         void                CreateMenuEntries( Menu* pMenu );
-        void                ExecuteMenuEntry( USHORT nId );
+        void                ExecuteMenuEntry( sal_uInt16 nId );
         void                ExecuteEntry( sal_uInt32 nIndex );
         String              GetMenuEntryTitle( sal_uInt32 nIndex );
 
diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx
index 9b0a8e94733c..afef5e926f5f 100644
--- a/sfx2/source/inc/slotserv.hxx
+++ b/sfx2/source/inc/slotserv.hxx
@@ -35,14 +35,14 @@ class SfxSlotServer
 {
 private:
     const SfxSlot*      _pSlot;
-    USHORT              _nShellLevel;
+    sal_uInt16              _nShellLevel;
 
 public:
-                        SfxSlotServer( const SfxSlot &rSlot, USHORT nShell );
+                        SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell );
                         SfxSlotServer();
 
-    USHORT              GetShellLevel() const;
-    void                SetShellLevel(USHORT nLevel) { _nShellLevel = nLevel; }
+    sal_uInt16              GetShellLevel() const;
+    void                SetShellLevel(sal_uInt16 nLevel) { _nShellLevel = nLevel; }
     void                SetSlot(const SfxSlot* pSlot) {
                             _pSlot = pSlot;
                         }
@@ -52,7 +52,7 @@ public:
 
 //--------------------------------------------------------------------
 
-inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, USHORT nShell ):
+inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ):
     _pSlot( &rSlot),
     _nShellLevel( nShell )
 {
@@ -68,7 +68,7 @@ inline SfxSlotServer::SfxSlotServer():
 
 //--------------------------------------------------------------------
 
-inline USHORT SfxSlotServer::GetShellLevel() const
+inline sal_uInt16 SfxSlotServer::GetShellLevel() const
 {
     return _nShellLevel;
 }
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index f97d7f89868c..af2ede51701d 100644
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -34,17 +34,17 @@ class SfxCommonTemplateDialog_Impl;
 
 class SfxTemplateControllerItem: public SfxControllerItem {
     SfxCommonTemplateDialog_Impl  &rTemplateDlg;
-    BYTE                            nWaterCanState;
+    sal_uInt8                            nWaterCanState;
     long                            nUserEventId;
 
     DECL_STATIC_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
                                 SfxTemplateControllerItem*);
 
 protected:
-    virtual void    StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+    virtual void    StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
 
 public:
-    SfxTemplateControllerItem( USHORT nId, SfxCommonTemplateDialog_Impl &rDlg, SfxBindings &);
+    SfxTemplateControllerItem( sal_uInt16 nId, SfxCommonTemplateDialog_Impl &rDlg, SfxBindings &);
     ~SfxTemplateControllerItem();
 };