removetooltypes01: #i112600# remove tooltypes from sfx2

23 files changed, 31 insertions, 31 deletions

diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index b77ec981011b..b6a0a2a655d5 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -16,7 +16,7 @@ class SfxMacro;
 
 class SfxMacroStatement
 {
-    USHORT              nSlotId;    // ausgef"uhrte Slot-Id oder 0, wenn manuell
+    sal_uInt16              nSlotId;    // ausgef"uhrte Slot-Id oder 0, wenn manuell
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs;      // aktuelle Parameter, falls nSlotId != 0
     String              aStatement; // Statement in BASIC-Syntax (ggf. mit CR/LF)
     sal_Bool                bDone;      // auskommentieren wenn kein Done() gerufen
diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx
index fa9086f2623b..d94583f44eb2 100644
--- a/sfx2/inc/sfx2/mailmodelapi.hxx
+++ b/sfx2/inc/sfx2/mailmodelapi.hxx
@@ -136,6 +136,6 @@ public:
     sal_Bool            IsEmpty() const;
 };
 
-BOOL CreateFromAddress_Impl( String& rFrom );
+sal_Bool CreateFromAddress_Impl( String& rFrom );
 
 #endif // INCLUDED_SFX_MAILMODEL_HXX
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index fe694ef5b42b..a69fd108ccea 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -254,7 +254,7 @@ class SfxSlot
 {
 public:
     sal_uInt16                      nSlotId;        // in Shell eindeutige Slot-Id
-    USHORT                      nGroupId;       // f"ur Konfigurations-Bereich
+    sal_uInt16                      nGroupId;       // f"ur Konfigurations-Bereich
     sal_uIntPtr                     nHelpId;        // i.d.R. == nSlotId
     sal_uIntPtr                     nFlags;         // artihm. veroderte Flags
 
diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx
index df8ae09f90a3..7887b12a761e 100644
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.hxx
@@ -54,7 +54,7 @@ public:
     String                  GetCurrentFilter() const;
     void                    SetCurrentFilter(const String&);
 
-    void                    SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId );
+    void                    SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId );
 private:
     // disable copy and assignment
     SFX2_DLLPRIVATE SvxOpenGraphicDialog    (const SvxOpenGraphicDialog&);
diff --git a/sfx2/inc/sfx2/sfxdefs.hxx b/sfx2/inc/sfx2/sfxdefs.hxx
index 7a5a7e96f70b..55a521e3951c 100644
--- a/sfx2/inc/sfx2/sfxdefs.hxx
+++ b/sfx2/inc/sfx2/sfxdefs.hxx
@@ -32,7 +32,7 @@
 #define MESSAGEFILE_EXT     "smd"   // Extension der Single-Mail/News-Files
 #define MESSAGETEMPFILE_EXT "sd~"   // Extension f"ur Mail/News-TempFiles
 
-#define SfxFilterFlags ULONG
+#define SfxFilterFlags sal_uLong
 #define PRODUCT_VERSION     "5.0"
 
 #endif
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index b214012ddfdb..f97fc6b4b495 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -651,7 +651,7 @@ void SfxApplication::LeaveAsynchronCall_Impl()
 
 //--------------------------------------------------------------------
 
-FASTBOOL SfxApplication::IsInAsynchronCall_Impl() const
+bool SfxApplication::IsInAsynchronCall_Impl() const
 {
     return pAppData_Impl->nAsynchronCalls > 0;
 }
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 7e775cbbb502..1054f1793c07 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -293,7 +293,7 @@ StarBASIC* SfxApplication::GetBasic()
 
 //--------------------------------------------------------------------
 
-FASTBOOL SfxApplication::IsInBasicCall() const
+bool SfxApplication::IsInBasicCall() const
 {
     return 0 != pAppData_Impl->nBasicCallLevel;
 }
@@ -493,7 +493,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
                 break;
 
             case SID_ATTR_UNDO_COUNT:
-                rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, sal::static_int_cast< UINT16 >( SvtUndoOptions().GetUndoCount() ) ) );
+                rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, sal::static_int_cast< sal_uInt16 >( SvtUndoOptions().GetUndoCount() ) ) );
                 break;
 
             case SID_UPDATE_VERSION:
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 7f6e6c335383..4a7cc13b791d 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, FASTBOOL bSynchron )
+void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
 {
     //DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!");
 
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 2aa19901d87c..295d1445ea57 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -231,7 +231,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
 
 //====================================================================
 
-FASTBOOL SfxApplication::Initialize_Impl()
+bool SfxApplication::Initialize_Impl()
 {
     RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" );
 
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 3c323b05fd72..f7053321ddfa 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -749,14 +749,14 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< :
 
 void ShutdownIcon::EnterModalMode()
 {
-    bModalMode = TRUE;
+    bModalMode = sal_True;
 }
 
 // -------------------------------
 
 void ShutdownIcon::LeaveModalMode()
 {
-    bModalMode = FALSE;
+    bModalMode = sal_False;
 }
 
 #ifdef WNT
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index c5b2834aebe5..d1bdf3d12fe6 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -823,7 +823,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4UIName( const String& rName, SfxFil
 const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
 {
     String aName( rName );
-    USHORT nIndex = aName.SearchAscii(": ");
+    sal_uInt16 nIndex = aName.SearchAscii(": ");
     if (  nIndex != STRING_NOTFOUND )
     {
         DBG_ERROR("Old filter name used!");
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index aab358b50220..297dedc50807 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -102,7 +102,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) t
         (xContainer==m_xFilterCache)
       )
     {
-        SfxFilterContainer::ReadFilters_Impl( TRUE );
+        SfxFilterContainer::ReadFilters_Impl( sal_True );
     }
 }
 
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 9561f6330d7f..3c4c78e9d630 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -327,9 +327,9 @@ long TimeOut_Impl( void*, void* pArgV )
 
 sal_Bool SfxProgress::SetStateText
 (
-    ULONG           nNewVal,    /* neuer Wert f"ur die Fortschritts-Anzeige */
+    sal_uLong           nNewVal,    /* neuer Wert f"ur die Fortschritts-Anzeige */
     const String&   rNewVal,    /* Status als Text */
-    ULONG           nNewRange   /* neuer Maximalwert, 0 f"ur Beibehaltung des alten */
+    sal_uLong           nNewRange   /* neuer Maximalwert, 0 f"ur Beibehaltung des alten */
 )
 
 {
@@ -341,9 +341,9 @@ sal_Bool SfxProgress::SetStateText
 
 sal_Bool SfxProgress::SetState
 (
-    ULONG   nNewVal,    /* neuer Wert f"ur die Fortschritts-Anzeige */
+    sal_uLong   nNewVal,    /* neuer Wert f"ur die Fortschritts-Anzeige */
 
-    ULONG   nNewRange   /* neuer Maximalwert, 0 f"ur Beibehaltung des alten */
+    sal_uLong   nNewRange   /* neuer Maximalwert, 0 f"ur Beibehaltung des alten */
 )
 /*  [Beschreibung]
 
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index cef5d7043cc5..e90b680ffa13 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -312,7 +312,7 @@ SfxControllerItem::~SfxControllerItem()
 
 void SfxControllerItem::StateChanged
 (
-    USHORT              ,   // <SID> des ausl"osenden Slot
+    sal_uInt16              ,   // <SID> des ausl"osenden Slot
     SfxItemState        ,   // <SfxItemState> von 'pState'
     const SfxPoolItem*      // Slot-Status, ggf. 0 oder IsInvalidItem()
 )
@@ -352,7 +352,7 @@ void SfxControllerItem::DeleteFloatingWindow()
 
 void SfxStatusForwarder::StateChanged
 (
-    USHORT              nSID,       // <SID> des ausl"osenden Slot
+    sal_uInt16              nSID,       // <SID> des ausl"osenden Slot
     SfxItemState        eState,     // <SfxItemState> von 'pState'
     const SfxPoolItem*  pState      // Slot-Status, ggf. 0 oder IsInvalidItem()
 )
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index 079c7180ac1a..80a55593c2f6 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -177,7 +177,7 @@ ErrCode SfxCallMacro( BasicManager* pMgr, const String& rCode,
 SfxMacroInfo::SfxMacroInfo( const String& rURL ) :
     pHelpText(0),
     nRefCnt(0),
-    bAppBasic(TRUE),
+    bAppBasic(sal_True),
     nSlotId(0),
     pSlot(0)
 {
@@ -189,7 +189,7 @@ SfxMacroInfo::SfxMacroInfo( const String& rURL ) :
             // 'macro:///lib.mod.proc(args)' => Macro via App-BASIC-Mgr
             // 'macro://[docname|.]/lib.mod.proc(args)' => Macro via zugehoerigen Doc-BASIC-Mgr
             if ( aTmp.CompareToAscii("///", 3 ) != COMPARE_EQUAL )
-                bAppBasic = FALSE;
+                bAppBasic = sal_False;
             aTmp = rURL.GetToken( 3, '/' );
             if ( aTmp.GetTokenCount('.') == 3 )
             {
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 6b05c03160ff..ffedd2632770 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -53,7 +53,7 @@ SfxSlotKind SfxSlot::GetKind() const
 
 //--------------------------------------------------------------------
 
-USHORT SfxSlot::GetWhich( const SfxItemPool &rPool ) const
+sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const
 {
     if ( !nMasterSlotId || nMasterSlotId == USHRT_MAX )
         ((SfxSlot*) this) -> nMasterSlotId = rPool.GetWhich(nSlotId);
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 718e51922e7d..ec6f9a7428e9 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -235,7 +235,7 @@ SfxRequest::SfxRequest
 
 SfxRequest::SfxRequest
 (
-    USHORT          nSlotId,    // auszuf"uhrende <Slot-Id>
+    sal_uInt16          nSlotId,    // auszuf"uhrende <Slot-Id>
     SfxCallMode     nMode,      // Synch/API/...
     SfxItemPool&    rPool       // ggf. f"ur das SfxItemSet f"ur Parameter
 )
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 5722d228ed07..a9d16aa3d5e1 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -343,7 +343,7 @@ const SfxPoolItem* SfxShell::GetItem
 
 void SfxShell::RemoveItem
 (
-    USHORT  nSlotId         // Slot-Id des zu l"oschenden <SfxPoolItem>s
+    sal_uInt16  nSlotId         // Slot-Id des zu l"oschenden <SfxPoolItem>s
 )
 
 /*  [Beschreibung]
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 87cd3a4e3a3d..76bd38377eb8 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1049,7 +1049,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
     {
         // get information about alignment, split size and position in SplitWindow
         String aStr;
-        USHORT nPos = pInfo->aExtraString.SearchAscii("AL:");
+        sal_uInt16 nPos = pInfo->aExtraString.SearchAscii("AL:");
         if ( nPos != STRING_NOTFOUND )
         {
             // alignment information
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index cbbe20bfa203..cb082987a3e1 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -82,7 +82,7 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl
     pWindow->SetSizePixel( Size( 175, 175 ) );
 
     ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
-    SetHideNotDelete( TRUE );
+    SetHideNotDelete( sal_True );
 }
 
 SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index a159f95ffd6d..774c7e44e7a7 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -49,7 +49,7 @@ SfxTemplateItem::SfxTemplateItem
 (
     sal_uInt16 nWhichId,      // Slot-ID
     const String& rStyle, // Name des aktuellen Styles
-    USHORT nValue         // Flags f"ur das Filtern bei automatischer Anzeige
+    sal_uInt16 nValue         // Flags f"ur das Filtern bei automatischer Anzeige
 ) : SfxFlagItem( nWhichId, nValue ),
     aStyle( rStyle )
 {
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index d0f6678d8641..bd23bf5659d0 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -290,7 +290,7 @@ uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(GDIMetaFile* i_pThumb)
         SvMemoryStream aStream;
 // magic value 160 taken from GraphicHelper::getThumbnailFormatFromGDI_Impl()
         if( i_pThumb->CreateThumbnail( 160, aBitmap ) ) {
-            aBitmap.GetBitmap().Write( aStream, FALSE, FALSE );
+            aBitmap.GetBitmap().Write( aStream, sal_False, sal_False );
 //            uno::Sequence<sal_uInt8> aSeq(aStream.GetSize()); // WRONG
             aStream.Seek(STREAM_SEEK_TO_END);
             uno::Sequence<sal_uInt8> aSeq(aStream.Tell());
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 844fde90d069..a208c7ac1d74 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -419,8 +419,8 @@ void   SfxObjectShell::GetContent(String &rText,
         case INDEX_IGNORE:
         {
             sal_uInt16 nTextResId = 0;
-            USHORT nClosedBitmapResId = 0; // evtl. sp"ater mal unterschiedliche
-            USHORT nOpenedBitmapResId = 0; // "     "       "   "
+            sal_uInt16 nClosedBitmapResId = 0; // evtl. sp"ater mal unterschiedliche
+            sal_uInt16 nOpenedBitmapResId = 0; // "     "       "   "
             switch(i)
             {
                 case CONTENT_STYLE: