removetooltypes01: #i112600# remove tooltypes from desktop

33 files changed, 137 insertions, 137 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 8eb4dd3cc25b..e2515187e688 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -89,8 +89,8 @@ class Desktop : public Application
         virtual void            Main( );
         virtual void            Init();
         virtual void            DeInit();
-        virtual BOOL            QueryExit();
-        virtual USHORT          Exception(USHORT nError);
+        virtual sal_Bool            QueryExit();
+        virtual sal_uInt16          Exception(sal_uInt16 nError);
         virtual void            SystemSettingsChanging( AllSettings& rSettings, Window* pFrame );
         virtual void            AppEvent( const ApplicationEvent& rAppEvent );
 
@@ -162,7 +162,7 @@ class Desktop : public Application
         void                    StartSetup( const ::rtl::OUString& aParameters );
 
         // Get a resource message string securely e.g. if resource cannot be retrieved return aFaultBackMsg
-        ::rtl::OUString         GetMsgString( USHORT nId, const ::rtl::OUString& aFaultBackMsg );
+        ::rtl::OUString         GetMsgString( sal_uInt16 nId, const ::rtl::OUString& aFaultBackMsg );
 
         // Create a error message depending on bootstrap failure code and an optional file url
         ::rtl::OUString         CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
@@ -201,7 +201,7 @@ class Desktop : public Application
         sal_Bool                        m_bMinimized;
         sal_Bool                        m_bInvisible;
         bool                            m_bServicesRegistered;
-        USHORT                          m_nAppEvents;
+        sal_uInt16                          m_nAppEvents;
         BootstrapError                  m_aBootstrapError;
         BootstrapStatus                 m_aBootstrapStatus;
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a49cabc90bed..3ebcb6c3cd0d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -251,7 +251,7 @@ ResMgr* Desktop::GetDesktopResManager()
 // Get a message string securely. There is a fallback string if the resource
 // is not available.
 
-OUString Desktop::GetMsgString( USHORT nId, const OUString& aFaultBackMsg )
+OUString Desktop::GetMsgString( sal_uInt16 nId, const OUString& aFaultBackMsg )
 {
     ResMgr* resMgr = GetDesktopResManager();
     if ( !resMgr )
@@ -778,7 +778,7 @@ void Desktop::DeInit()
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "FINISHED WITH Destop::DeInit" );
 }
 
-BOOL Desktop::QueryExit()
+sal_Bool Desktop::QueryExit()
 {
     try
     {
@@ -804,7 +804,7 @@ BOOL Desktop::QueryExit()
         xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a );
     }
 
-    BOOL bExit = ( !xDesktop.is() || xDesktop->terminate() );
+    sal_Bool bExit = ( !xDesktop.is() || xDesktop->terminate() );
 
 
     if ( !bExit && xPropertySet.is() )
@@ -1407,10 +1407,10 @@ void restartOnMac(bool passArguments) {
 
 }
 
-USHORT Desktop::Exception(USHORT nError)
+sal_uInt16 Desktop::Exception(sal_uInt16 nError)
 {
     // protect against recursive calls
-    static BOOL bInException = FALSE;
+    static sal_Bool bInException = sal_False;
 
     sal_uInt16 nOldMode = Application::GetSystemWindowMode();
     Application::SetSystemWindowMode( nOldMode & ~SYSTEMWINDOW_MODE_NOAUTOMODE );
@@ -1422,7 +1422,7 @@ USHORT Desktop::Exception(USHORT nError)
         Application::Abort( aDoubleExceptionString );
     }
 
-    bInException = TRUE;
+    bInException = sal_True;
     CommandLineArgs* pArgs = GetCommandLineArgs();
 
     // save all modified documents ... if it's allowed doing so.
@@ -1580,7 +1580,7 @@ void Desktop::Main()
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" );
         if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
         {
-            BOOL bQuitApp;
+            sal_Bool bQuitApp;
 
             if( !InitAccessBridge( true, bQuitApp ) )
                 if( bQuitApp )
@@ -2105,17 +2105,17 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
     hMouseSettings.SetFollow( aAppearanceCfg.IsMenuMouseFollow() ? (nFollow|MOUSE_FOLLOW_MENU) : (nFollow&~MOUSE_FOLLOW_MENU));
     rSettings.SetMouseSettings(hMouseSettings);
 
-    BOOL bUseImagesInMenus = hStyleSettings.GetUseImagesInMenus();
+    sal_Bool bUseImagesInMenus = hStyleSettings.GetUseImagesInMenus();
 
     SvtMenuOptions aMenuOpt;
     nGet = aMenuOpt.GetMenuIconsState();
     switch ( nGet )
     {
         case 0:
-            bUseImagesInMenus = FALSE;
+            bUseImagesInMenus = sal_False;
             break;
         case 1:
-            bUseImagesInMenus = TRUE;
+            bUseImagesInMenus = sal_True;
             break;
         case 2:
         default:
@@ -2564,7 +2564,7 @@ void Desktop::OpenClients()
     // check if a document has been recovered - if there is one of if a document was loaded by cmdline, no default document
     // should be created
     Reference < XComponent > xFirst;
-    BOOL bLoaded = FALSE;
+    sal_Bool bLoaded = sal_False;
 
     CommandLineArgs* pArgs = GetCommandLineArgs();
     SvtInternalOptions  aInternalOptions;
@@ -2714,7 +2714,7 @@ void Desktop::OpenClients()
                     bCrashed           ,
                     bExistsRecoveryData);
                 /* TODO we cant be shure, that at least one document could be recovered here successfully
-                    So we set bLoaded=TRUE to supress opening of the default document.
+                    So we set bLoaded=sal_True to supress opening of the default document.
                     But we should make it more safe. Otherwhise we have an office without an UI ...
                     ...
                     May be we can check the desktop if some documents are existing there.
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index c06d94fd0812..6adc4b81dc54 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -204,7 +204,7 @@ static sal_Bool impl_parseDateTime(const OUString& aString, DateTime& aDateTime)
     sal_Int32 nMinute = aTimeString.getToken(0, ':', nIndex).toInt32();
     sal_Int32 nSecond = aTimeString.getToken(0, ':', nIndex).toInt32();
 
-    Date tmpDate((USHORT)nDay, (USHORT)nMonth, (USHORT)nYear);
+    Date tmpDate((sal_uInt16)nDay, (sal_uInt16)nMonth, (sal_uInt16)nYear);
     Time tmpTime(nHour, nMinute, nSecond);
     DateTime tmpDateTime(tmpDate, tmpTime);
     if (aString.indexOf(aUTCString) < 0)
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index bd722a136e8a..0c354c3446c0 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -80,7 +80,7 @@ typedef uno::Reference< lang::XMultiServiceFactory > ConfigurationProvider;
 // Get a message string securely. There is a fallback string if the resource
 // is not available. Adapted from Desktop::GetMsgString()
 
-OUString getMsgString( USHORT nId, char const * aFallBackMsg )
+OUString getMsgString( sal_uInt16 nId, char const * aFallBackMsg )
 {
     ResMgr* pResMgr = Desktop::GetDesktopResManager();
     if ( !pResMgr || !nId )
diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx
index 90cc8e220fba..4aad5ef98036 100644
--- a/desktop/source/app/desktopresid.cxx
+++ b/desktop/source/app/desktopresid.cxx
@@ -36,7 +36,7 @@
 namespace desktop
 {
 
-DesktopResId::DesktopResId( USHORT nId ) :
+DesktopResId::DesktopResId( sal_uInt16 nId ) :
     ResId( nId, *Desktop::GetDesktopResManager() )
 {
 }
diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx
index 410ca429f5ad..767d5fb7849d 100644
--- a/desktop/source/app/desktopresid.hxx
+++ b/desktop/source/app/desktopresid.hxx
@@ -36,7 +36,7 @@ namespace desktop
 class DesktopResId : public ResId
 {
     public:
-        DesktopResId( USHORT nId );
+        DesktopResId( sal_uInt16 nId );
 };
 
 }
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 2cbcab0fce2a..8f3ddffe8e0a 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -123,7 +123,7 @@ class OfficeIPCThread : public vos::OThread
     static void                 RequestsCompleted( int n = 1 );
     static sal_Bool             ExecuteCmdLineRequests( ProcessDocumentsRequest& );
 
-    // return FALSE if second office
+    // return sal_False if second office
     static Status               EnableOfficeIPCThread();
     static void                 DisableOfficeIPCThread();
     // start dispatching events...
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index fc06850f237a..ea4e2c7f3757 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -33,7 +33,7 @@
 #include <rtl/logfile.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 
-BOOL SVMain();
+sal_Bool SVMain();
 
 // -=-= main() -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index 5df203c60fc9..af88c6689879 100644
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -60,7 +60,7 @@ void DescriptionEdit::Init()
     // read-only
     SetReadOnly();
     // no cursor
-    EnableCursor( FALSE );
+    EnableCursor( sal_False );
 }
 
 // -----------------------------------------------------------------------
diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
index ce69797db0a8..e5dec34962af 100644
--- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
+++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx
@@ -59,7 +59,7 @@ void AutoScrollEdit::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.IsA( TYPE(TextHint) ) )
     {
-        ULONG   nId = ((const TextHint&)rHint).GetId();
+        sal_uLong   nId = ((const TextHint&)rHint).GetId();
         if ( nId == TEXT_HINT_VIEWSCROLLED )
         {
             ScrollBar*  pScroll = GetVScrollBar();
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 8fd0f4c754d0..3db8ec48a86e 100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -441,7 +441,7 @@ long ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         KeyCode         aKeyCode = pKEvt->GetKeyCode();
-        USHORT          nKeyCode = aKeyCode.GetCode();
+        sal_uInt16          nKeyCode = aKeyCode.GetCode();
 
         if ( nKeyCode == KEY_TAB )
             bHandled = HandleTabKey( aKeyCode.IsShift() );
@@ -568,14 +568,14 @@ DialogHelper::~DialogHelper()
 }
 
 //------------------------------------------------------------------------------
-ResId DialogHelper::getResId( USHORT nId )
+ResId DialogHelper::getResId( sal_uInt16 nId )
 {
     const ::vos::OGuard guard( Application::GetSolarMutex() );
     return ResId( nId, *DeploymentGuiResMgr::get() );
 }
 
 //------------------------------------------------------------------------------
-String DialogHelper::getResourceString( USHORT id )
+String DialogHelper::getResourceString( sal_uInt16 id )
 {
     // init with non-acquired solar mutex:
     BrandName::get();
@@ -599,7 +599,7 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage >
 //------------------------------------------------------------------------------
 bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage,
                                               Window *pParent,
-                                              const USHORT nResID,
+                                              const sal_uInt16 nResID,
                                               bool &bHadWarning )
 {
     if ( !bHadWarning && IsSharedPkgMgr( xPackage ) )
@@ -668,8 +668,8 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
     sMsgText.SearchAndReplaceAllAscii( "%PRODUCTNAME", BrandName::get() );
     aQuery.SetMessText( sMsgText );
 
-    USHORT nYesBtnID = aQuery.GetButtonId( 0 );
-    USHORT nNoBtnID = aQuery.GetButtonId( 1 );
+    sal_uInt16 nYesBtnID = aQuery.GetButtonId( 0 );
+    sal_uInt16 nNoBtnID = aQuery.GetButtonId( 1 );
 
     if ( nYesBtnID != BUTTONDIALOG_BUTTON_NOTFOUND )
         aQuery.SetButtonText( nYesBtnID, getResourceString( RID_STR_INSTALL_FOR_ME ) );
@@ -1114,7 +1114,7 @@ IMPL_LINK( ExtMgrDialog, TimeOutHdl, Timer*, EMPTYARG )
         }
 
         if ( m_aProgressBar.IsVisible() )
-            m_aProgressBar.SetValue( (USHORT) m_nProgress );
+            m_aProgressBar.SetValue( (sal_uInt16) m_nProgress );
 
         m_aTimeoutTimer.Start();
     }
@@ -1167,7 +1167,7 @@ void ExtMgrDialog::Resize()
         Rectangle aNativeControlRegion, aNativeContentRegion;
         if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                                  CTRL_STATE_ENABLED, aValue, rtl::OUString(),
-                                                 aNativeControlRegion, aNativeContentRegion ) ) != FALSE )
+                                                 aNativeControlRegion, aNativeContentRegion ) ) != sal_False )
         {
             nProgressHeight = aNativeControlRegion.GetHeight();
         }
@@ -1204,7 +1204,7 @@ long ExtMgrDialog::Notify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         KeyCode         aKeyCode = pKEvt->GetKeyCode();
-        USHORT          nKeyCode = aKeyCode.GetCode();
+        sal_uInt16          nKeyCode = aKeyCode.GetCode();
 
         if ( nKeyCode == KEY_TAB )
         {
@@ -1231,7 +1231,7 @@ long ExtMgrDialog::Notify( NotifyEvent& rNEvt )
 }
 
 //------------------------------------------------------------------------------
-BOOL ExtMgrDialog::Close()
+sal_Bool ExtMgrDialog::Close()
 {
     bool bRet = m_pManager->queryTermination();
     if ( bRet )
@@ -1551,7 +1551,7 @@ IMPL_LINK( UpdateRequiredDialog, TimeOutHdl, Timer*, EMPTYARG )
         }
 
         if ( m_aProgressBar.IsVisible() )
-            m_aProgressBar.SetValue( (USHORT) m_nProgress );
+            m_aProgressBar.SetValue( (sal_uInt16) m_nProgress );
 
         m_aTimeoutTimer.Start();
     }
@@ -1610,7 +1610,7 @@ void UpdateRequiredDialog::Resize()
         Rectangle aNativeControlRegion, aNativeContentRegion;
         if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
                                                  CTRL_STATE_ENABLED, aValue, rtl::OUString(),
-                                                 aNativeControlRegion, aNativeContentRegion ) ) != FALSE )
+                                                 aNativeControlRegion, aNativeContentRegion ) ) != sal_False )
         {
             nProgressHeight = aNativeControlRegion.GetHeight();
         }
@@ -1648,7 +1648,7 @@ short UpdateRequiredDialog::Execute()
 
 //------------------------------------------------------------------------------
 // VCL::Dialog
-BOOL UpdateRequiredDialog::Close()
+sal_Bool UpdateRequiredDialog::Close()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 755c3aadcbdf..6b546bb3c163 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -63,7 +63,7 @@ class DialogHelper
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
     Dialog*         m_pVCLWindow;
-    ULONG           m_nEventID;
+    sal_uLong           m_nEventID;
     bool            m_bIsBusy;
 
 public:
@@ -88,12 +88,12 @@ public:
     virtual void    prepareChecking() = 0;
     virtual void    checkEntries() = 0;
 
-    static ResId    getResId( USHORT nId );
-    static String   getResourceString( USHORT id );
+    static ResId    getResId( sal_uInt16 nId );
+    static String   getResourceString( sal_uInt16 id );
     static bool     IsSharedPkgMgr( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &);
     static bool     continueOnSharedExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &,
                                                Window *pParent,
-                                               const USHORT nResID,
+                                               const sal_uInt16 nResID,
                                                bool &bHadWarning );
 
     void            setBusy( const bool bBusy ) { m_bIsBusy = bBusy; }
@@ -149,7 +149,7 @@ public:
 
     virtual void    Resize();
     virtual long    Notify( NotifyEvent& rNEvt );
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 
     virtual void    showProgress( bool bStart );
     virtual void    updateProgress( const ::rtl::OUString &rText,
@@ -221,7 +221,7 @@ public:
 
     virtual short   Execute();
     virtual void    Resize();
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 //    virtual long    Notify( NotifyEvent& rNEvt );
 
     virtual void    showProgress( bool bStart );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 54495de410dc..06df7f9ebf51 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -711,7 +711,7 @@ bool ExtensionBox_Impl::HandleTabKey( bool )
 }
 
 // -----------------------------------------------------------------------
-bool ExtensionBox_Impl::HandleCursorKey( USHORT nKeyCode )
+bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode )
 {
     if ( m_vEntries.empty() )
         return true;
@@ -876,7 +876,7 @@ long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         KeyCode         aKeyCode = pKEvt->GetKeyCode();
-        USHORT          nKeyCode = aKeyCode.GetCode();
+        sal_uInt16          nKeyCode = aKeyCode.GetCode();
 
         if ( nKeyCode == KEY_TAB )
             bHandled = HandleTabKey( aKeyCode.IsShift() );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index cbf9e27a8da1..7306459f319e 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -170,7 +170,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     void            SetupScrollBar();
     void            DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry );
     bool            HandleTabKey( bool bReverse );
-    bool            HandleCursorKey( USHORT nKeyCode );
+    bool            HandleCursorKey( sal_uInt16 nKeyCode );
     bool            FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );
     bool            isHCMode();
     void            DeleteRemoved();
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index 4fa94c5ca17c..08d1cf1f8e54 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -54,7 +54,7 @@ struct BrandName : public ::rtl::StaticWithInit<const ::rtl::OUString, BrandName
 class DpGuiResId : public ResId
 {
 public:
-    DpGuiResId( USHORT nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {}
+    DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {}
 };
 
 } // namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index d0347c7cbf4e..18ab0ef70d65 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -165,7 +165,7 @@ void TheExtensionManager::SetText( const ::rtl::OUString &rTitle )
 }
 
 //------------------------------------------------------------------------------
-void TheExtensionManager::ToTop( USHORT nFlags )
+void TheExtensionManager::ToTop( sal_uInt16 nFlags )
 {
     const ::vos::OGuard guard( Application::GetSolarMutex() );
 
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 094e25e249b7..2ed70e4a5c34 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -86,7 +86,7 @@ public:
 
     void SetText( const ::rtl::OUString &rTitle );
     void Show();
-    void ToTop( USHORT nFlags );
+    void ToTop( sal_uInt16 nFlags );
     bool Close();
     bool isVisible();
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 1112de0b34e8..8ba7df101ab3 100755
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -83,7 +83,7 @@ struct UpdateData
     aUpdateSource;
 
     // ID to find this entry in the update listbox
-    USHORT  m_nID;
+    sal_uInt16  m_nID;
     bool    m_bIgnored;
 };
 }
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 44f335dd509d..9f7271d36e2d 100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -140,9 +140,9 @@ namespace {
 
 static sal_Unicode const LF = 0x000A;
 static sal_Unicode const CR = 0x000D;
-static const USHORT CMD_ENABLE_UPDATE = 1;
-static const USHORT CMD_IGNORE_UPDATE = 2;
-static const USHORT CMD_IGNORE_ALL_UPDATES = 3;
+static const sal_uInt16 CMD_ENABLE_UPDATE = 1;
+static const sal_uInt16 CMD_IGNORE_UPDATE = 2;
+static const sal_uInt16 CMD_IGNORE_ALL_UPDATES = 3;
 
 #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 
@@ -165,13 +165,13 @@ struct UpdateDialog::DisabledUpdate {
     uno::Sequence< rtl::OUString > unsatisfiedDependencies;
     // We also want to show release notes and publisher for disabled updates
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo;
-    USHORT m_nID;
+    sal_uInt16 m_nID;
 };
 
 struct UpdateDialog::SpecificError {
     rtl::OUString name;
     rtl::OUString message;
-    USHORT m_nID;
+    sal_uInt16 m_nID;
 };
 
 //------------------------------------------------------------------------------
@@ -195,15 +195,15 @@ struct UpdateDialog::Index
 {
     Kind          m_eKind;
     bool          m_bIgnored;
-    USHORT        m_nID;
-    USHORT        m_nIndex;
+    sal_uInt16        m_nID;
+    sal_uInt16        m_nIndex;
     rtl::OUString m_aName;
 
-    Index( Kind theKind, USHORT nID, USHORT nIndex, const rtl::OUString &rName );
+    Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName );
 };
 
 //------------------------------------------------------------------------------
-UpdateDialog::Index::Index( Kind theKind, USHORT nID, USHORT nIndex, const rtl::OUString &rName ):
+UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ):
     m_eKind( theKind ),
     m_bIgnored( false ),
     m_nID( nID ),
@@ -671,7 +671,7 @@ UpdateDialog::~UpdateDialog()
 }
 
 //------------------------------------------------------------------------------
-BOOL UpdateDialog::Close() {
+sal_Bool UpdateDialog::Close() {
     m_thread->stop();
     return ModalDialog::Close();
 }
@@ -699,10 +699,10 @@ UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & r
 UpdateDialog::CheckListBox::~CheckListBox() {}
 
 //------------------------------------------------------------------------------
-USHORT UpdateDialog::CheckListBox::getItemCount() const {
-    ULONG i = GetEntryCount();
-    OSL_ASSERT(i <= std::numeric_limits< USHORT >::max());
-    return sal::static_int_cast< USHORT >(i);
+sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const {
+    sal_uLong i = GetEntryCount();
+    OSL_ASSERT(i <= std::numeric_limits< sal_uInt16 >::max());
+    return sal::static_int_cast< sal_uInt16 >(i);
 }
 
 //------------------------------------------------------------------------------
@@ -740,7 +740,7 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
 
     if ( pData )
     {
-        USHORT nEntryPos = GetSelectEntryPos();
+        sal_uInt16 nEntryPos = GetSelectEntryPos();
         UpdateDialog::Index * p = static_cast< UpdateDialog::Index * >( GetEntryData( nEntryPos ) );
 
         if ( ( p->m_eKind == ENABLED_UPDATE ) || ( p->m_eKind == DISABLED_UPDATE ) )
@@ -755,7 +755,7 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
                 aPopup.InsertItem( CMD_IGNORE_ALL_UPDATES, m_ignoreAllUpdates );
             }
 
-            USHORT aCmd = aPopup.Execute( this, rPos );
+            sal_uInt16 aCmd = aPopup.Execute( this, rPos );
             if ( ( aCmd == CMD_IGNORE_UPDATE ) || ( aCmd == CMD_IGNORE_ALL_UPDATES ) )
             {
                 p->m_bIgnored = true;
@@ -787,11 +787,11 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
-USHORT UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind )
+sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind )
 {
     m_updates.InsertEntry( pEntry->m_aName, LISTBOX_APPEND, static_cast< void * >( pEntry ), kind );
 
-    for ( USHORT i = m_updates.getItemCount(); i != 0 ; )
+    for ( sal_uInt16 i = m_updates.getItemCount(); i != 0 ; )
     {
         i -= 1;
         UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData( i ) );
@@ -820,7 +820,7 @@ void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind
 void UpdateDialog::addEnabledUpdate( rtl::OUString const & name,
                                      dp_gui::UpdateData & data )
 {
-    USHORT nIndex = sal::static_int_cast< USHORT >( m_enabledUpdates.size() );
+    sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() );
     UpdateDialog::Index *pEntry = new UpdateDialog::Index( ENABLED_UPDATE, m_nLastID, nIndex, name );
 
     data.m_nID = m_nLastID;
@@ -831,7 +831,7 @@ void UpdateDialog::addEnabledUpdate( rtl::OUString const & name,
 
     if ( ! isIgnoredUpdate( pEntry ) )
     {
-        USHORT nPos = insertItem( pEntry, SvLBoxButtonKind_enabledCheckbox );
+        sal_uInt16 nPos = insertItem( pEntry, SvLBoxButtonKind_enabledCheckbox );
         m_updates.CheckEntryPos( nPos );
     }
     else
@@ -846,7 +846,7 @@ void UpdateDialog::addEnabledUpdate( rtl::OUString const & name,
 //------------------------------------------------------------------------------
 void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
 {
-    USHORT nIndex = sal::static_int_cast< USHORT >( m_disabledUpdates.size() );
+    sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_disabledUpdates.size() );
     UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, m_nLastID, nIndex, data.name );
 
     data.m_nID = m_nLastID;
@@ -862,7 +862,7 @@ void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
 //------------------------------------------------------------------------------
 void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data )
 {
-    USHORT nIndex = sal::static_int_cast< USHORT >( m_specificErrors.size() );
+    sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_specificErrors.size() );
     UpdateDialog::Index *pEntry = new UpdateDialog::Index( DISABLED_UPDATE, m_nLastID, nIndex, data.name );
 
     data.m_nID = m_nLastID;
@@ -1320,7 +1320,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
 
     if ( p != NULL )
     {
-        USHORT pos = p->m_nIndex;
+        sal_uInt16 pos = p->m_nIndex;
 
         switch (p->m_eKind)
         {
@@ -1415,7 +1415,7 @@ IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG)
     }
     else
     {
-        for ( USHORT i = 0; i < m_updates.getItemCount(); )
+        for ( sal_uInt16 i = 0; i < m_updates.getItemCount(); )
         {
             UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData(i) );
             if ( p->m_bIgnored || ( p->m_eKind != ENABLED_UPDATE ) )
@@ -1463,7 +1463,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
     }
 
 
-    for (USHORT i = 0; i < m_updates.getItemCount(); ++i) {
+    for (sal_uInt16 i = 0; i < m_updates.getItemCount(); ++i) {
         UpdateDialog::Index const * p =
             static_cast< UpdateDialog::Index const * >(
                 m_updates.GetEntryData(i));
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 54e645f195d8..fefddd0e4ddc 100755
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -98,7 +98,7 @@ public:
 
     ~UpdateDialog();
 
-    virtual BOOL Close();
+    virtual sal_Bool Close();
 
     virtual short Execute();
 
@@ -127,7 +127,7 @@ private:
 
         virtual ~CheckListBox();
 
-        USHORT getItemCount() const;
+        sal_uInt16 getItemCount() const;
 
     private:
         CheckListBox(UpdateDialog::CheckListBox &); // not defined
@@ -148,7 +148,7 @@ private:
 
     friend class CheckListBox;
 
-    USHORT insertItem( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
+    sal_uInt16 insertItem( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
     void addAdditional( UpdateDialog::Index *pIndex, SvLBoxButtonKind kind );
     bool isIgnoredUpdate( UpdateDialog::Index *pIndex );
     void setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll );
@@ -223,7 +223,7 @@ private:
     Size    m_aFirstLineSize;
     long    m_nFirstLineDelta;
     long    m_nOneLineMissing;
-    USHORT  m_nLastID;
+    sal_uInt16  m_nLastID;
     bool    m_bModified;
 };
 
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 067a703ec413..06bd27780504 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -261,14 +261,14 @@ UpdateInstallDialog::UpdateInstallDialog(
     m_xExtensionManager = css::deployment::ExtensionManager::get( xCtx );
 
     m_cancel.SetClickHdl(LINK(this, UpdateInstallDialog, cancelHandler));
-    m_mle_info.EnableCursor(FALSE);
+    m_mle_info.EnableCursor(sal_False);
     if ( ! dp_misc::office_is_running())
         m_help.Disable();
 }
 
 UpdateInstallDialog::~UpdateInstallDialog() {}
 
-BOOL UpdateInstallDialog::Close()
+sal_Bool UpdateInstallDialog::Close()
 {
     m_thread->stop();
     return ModalDialog::Close();
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index c0e64a8028e8..4df06a619bb3 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -81,7 +81,7 @@ public:
 
     ~UpdateInstallDialog();
 
-    BOOL Close();
+    sal_Bool Close();
     virtual short Execute();
 
 private:
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 9698e257b953..bed190176d60 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -62,7 +62,7 @@ namespace dp_gui {
 
 class LicenseView : public MultiLineEdit, public SfxListener
 {
-    BOOL            mbEndReached;
+    sal_Bool            mbEndReached;
     Link            maEndReachedHdl;
     Link            maScrolledHdl;
 
@@ -72,9 +72,9 @@ public:
 
     void ScrollDown( ScrollType eScroll );
 
-    BOOL IsEndReached() const;
-    BOOL EndReached() const { return mbEndReached; }
-    void SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
+    sal_Bool IsEndReached() const;
+    sal_Bool EndReached() const { return mbEndReached; }
+    void SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
 
     void SetEndReachedHdl( const Link& rHdl )  { maEndReachedHdl = rHdl; }
     const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
@@ -145,20 +145,20 @@ void LicenseView::ScrollDown( ScrollType eScroll )
         pScroll->DoScrollAction( eScroll );
 }
 
-BOOL LicenseView::IsEndReached() const
+sal_Bool LicenseView::IsEndReached() const
 {
-    BOOL bEndReached;
+    sal_Bool bEndReached;
 
     ExtTextView*    pView = GetTextView();
     ExtTextEngine*  pEdit = GetTextEngine();
-    ULONG           nHeight = pEdit->GetTextHeight();
+    sal_uLong           nHeight = pEdit->GetTextHeight();
     Size            aOutSize = pView->GetWindow()->GetOutputSizePixel();
     Point           aBottom( 0, aOutSize.Height() );
 
-    if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
-        bEndReached = TRUE;
+    if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+        bEndReached = sal_True;
     else
-        bEndReached = FALSE;
+        bEndReached = sal_False;
 
     return bEndReached;
 }
@@ -167,8 +167,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.IsA( TYPE(TextHint) ) )
     {
-        BOOL    bLastVal = EndReached();
-        ULONG   nId = ((const TextHint&)rHint).GetId();
+        sal_Bool    bLastVal = EndReached();
+        sal_uLong   nId = ((const TextHint&)rHint).GetId();
 
         if ( nId == TEXT_HINT_PARAINSERTED )
         {
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index 7dcdd7df7fbb..28191bc4e508 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -39,12 +39,12 @@
 namespace dp_misc {
 
 //==============================================================================
-ResId getResId( USHORT id );
+ResId getResId( sal_uInt16 id );
 
 //==============================================================================
-DESKTOP_DEPLOYMENTMISC_DLLPUBLIC String getResourceString( USHORT id );
+DESKTOP_DEPLOYMENTMISC_DLLPUBLIC String getResourceString( sal_uInt16 id );
 
-template <typename Unique, USHORT id>
+template <typename Unique, sal_uInt16 id>
 struct StaticResourceString :
         public ::rtl::StaticWithInit<const ::rtl::OUString, Unique> {
     const ::rtl::OUString operator () () { return getResourceString(id); }
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index 10ee436ff60c..32587497e02e 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -71,14 +71,14 @@ osl::Mutex s_mutex;
 } // anon namespace
 
 //==============================================================================
-ResId getResId( USHORT id )
+ResId getResId( sal_uInt16 id )
 {
     const osl::MutexGuard guard( s_mutex );
     return ResId( id, *DeploymentResMgr::get() );
 }
 
 //==============================================================================
-String getResourceString( USHORT id )
+String getResourceString( sal_uInt16 id )
 {
     const osl::MutexGuard guard( s_mutex );
     String ret( ResId( id, *DeploymentResMgr::get() ) );
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 53a7ba1c316d..5a7538f6a866 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -525,7 +525,7 @@ void BackendImpl::implProcessHelp
 
                     if( !bSuccess )
                     {
-                        USHORT nErrStrId = 0;
+                        sal_uInt16 nErrStrId = 0;
                         switch( aErrorInfo.m_eErrorClass )
                         {
                         case HELPPROCESSING_GENERAL_ERROR:
diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 53ec488c2082..c8164d498e41 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -225,7 +225,7 @@ IMPL_LINK( LicensePage, PageDownHdl, PushButton *, EMPTYARG )
 
 IMPL_LINK( LicensePage, EndReachedHdl, LicenseView *, EMPTYARG )
 {
-    m_bLicenseRead = TRUE;
+    m_bLicenseRead = sal_True;
     updateDialogTravelUI();
     return 0;
 }
@@ -259,20 +259,20 @@ void LicenseView::ScrollDown( ScrollType eScroll )
         pScroll->DoScrollAction( eScroll );
 }
 
-BOOL LicenseView::IsEndReached() const
+sal_Bool LicenseView::IsEndReached() const
 {
-    BOOL bEndReached;
+    sal_Bool bEndReached;
 
     ExtTextView*    pView = GetTextView();
     ExtTextEngine*  pEdit = GetTextEngine();
-    ULONG           nHeight = pEdit->GetTextHeight();
+    sal_uLong           nHeight = pEdit->GetTextHeight();
     Size            aOutSize = pView->GetWindow()->GetOutputSizePixel();
     Point           aBottom( 0, aOutSize.Height() );
 
-    if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
-        bEndReached = TRUE;
+    if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+        bEndReached = sal_True;
     else
-        bEndReached = FALSE;
+        bEndReached = sal_False;
 
     return bEndReached;
 }
@@ -281,8 +281,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.IsA( TYPE(TextHint) ) )
     {
-        BOOL    bLastVal = EndReached();
-        ULONG   nId = ((const TextHint&)rHint).GetId();
+        sal_Bool    bLastVal = EndReached();
+        sal_uLong   nId = ((const TextHint&)rHint).GetId();
 
         if ( nId == TEXT_HINT_PARAINSERTED )
         {
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx
index 776268eb475c..4981f68bbaa0 100644
--- a/desktop/source/migration/pages.hxx
+++ b/desktop/source/migration/pages.hxx
@@ -66,7 +66,7 @@ protected:
 
 class LicenseView : public MultiLineEdit, public SfxListener
 {
-    BOOL            mbEndReached;
+    sal_Bool            mbEndReached;
     Link            maEndReachedHdl;
     Link            maScrolledHdl;
 
@@ -76,9 +76,9 @@ public:
 
     void ScrollDown( ScrollType eScroll );
 
-    BOOL IsEndReached() const;
-    BOOL EndReached() const { return mbEndReached; }
-    void SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
+    sal_Bool IsEndReached() const;
+    sal_Bool EndReached() const { return mbEndReached; }
+    void SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
 
     void SetEndReachedHdl( const Link& rHdl )  { maEndReachedHdl = rHdl; }
     const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 3e9836fa2e84..8bb9e82f3810 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -292,7 +292,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
                     utl::TextSearch  ts(param, LANGUAGE_DONTKNOW);
 
                     xub_StrLen start = 0;
-                    xub_StrLen end   = static_cast<USHORT>(aExtIdentifier.getLength());
+                    xub_StrLen end   = static_cast<sal_uInt16>(aExtIdentifier.getLength());
                     if (ts.SearchFrwrd(aExtIdentifier, &start, &end))
                         return false;
                 }
@@ -317,7 +317,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript
                 utl::TextSearch  ts(param, LANGUAGE_DONTKNOW);
 
                 xub_StrLen start = 0;
-                xub_StrLen end   = static_cast<USHORT>(sDescriptionXmlURL.getLength());
+                xub_StrLen end   = static_cast<sal_uInt16>(sDescriptionXmlURL.getLength());
                 if (ts.SearchFrwrd(sDescriptionXmlURL, &start, &end))
                     return false;
             }
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 1ac8f38dca56..fb73a905db6b 100755
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -176,7 +176,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile )
                 bRet = true;
             else
             {
-                USHORT nLen;
+                sal_uInt16 nLen;
                 pStream->Seek (nSniffPos);
                 *pStream >> nLen;
                 if ( nLen < MAX_HEADER_LENGTH )
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx
index 5cc90577aaff..3a4a0069967f 100644
--- a/desktop/source/migration/wizard.cxx
+++ b/desktop/source/migration/wizard.cxx
@@ -112,7 +112,7 @@ static sal_Int32 getBuildId()
     return nBuildId;
 }
 
-WizardResId::WizardResId( USHORT nId ) :
+WizardResId::WizardResId( sal_uInt16 nId ) :
     ResId( nId, *FirstStartWizard::GetResManager() )
 {
 }
@@ -280,7 +280,7 @@ long FirstStartWizard::PreNotify( NotifyEvent& rNEvt )
     {
         const KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode();
         if( rKey.GetCode() == KEY_F1 && ! rKey.GetModifier() )
-            return TRUE;
+            return sal_True;
     }
     return RoadmapWizard::PreNotify(rNEvt);
 }
diff --git a/desktop/source/migration/wizard.hxx b/desktop/source/migration/wizard.hxx
index 3317880f8bd6..7e97f7d8e30e 100644
--- a/desktop/source/migration/wizard.hxx
+++ b/desktop/source/migration/wizard.hxx
@@ -40,7 +40,7 @@ namespace desktop
 class WizardResId : public ResId
 {
 public:
-    WizardResId( USHORT nId );
+    WizardResId( sal_uInt16 nId );
 };
 
 class FirstStartWizard : public svt::RoadmapWizard
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index c6a185b8e54d..db14293f789d 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -102,7 +102,7 @@ void SAL_CALL SplashScreen::start(const OUString&, sal_Int32 nRange)
         _bProgressEnd = sal_False;
         ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
         if ( _eBitmapMode == BM_FULLSCREEN )
-            ShowFullScreenMode( TRUE );
+            ShowFullScreenMode( sal_True );
         Show();
         Paint(Rectangle());
         Flush();
@@ -129,7 +129,7 @@ void SAL_CALL SplashScreen::reset()
     if (_bVisible && !_bProgressEnd )
     {
         if ( _eBitmapMode == BM_FULLSCREEN )
-            ShowFullScreenMode( TRUE );
+            ShowFullScreenMode( sal_True );
         Show();
         updateStatus();
     }
@@ -146,7 +146,7 @@ void SAL_CALL SplashScreen::setText(const OUString& rText)
         if (_bVisible && !_bProgressEnd)
         {
             if ( _eBitmapMode == BM_FULLSCREEN )
-                ShowFullScreenMode( TRUE );
+                ShowFullScreenMode( sal_True );
             Show();
             updateStatus();
         }
@@ -162,7 +162,7 @@ void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
     if (_bVisible && !_bProgressEnd) {
         if ( _eBitmapMode == BM_FULLSCREEN )
-            ShowFullScreenMode( TRUE );
+            ShowFullScreenMode( sal_True );
         Show();
         if (nValue >= _iMax) _iProgress = _iMax;
     else _iProgress = nValue;
@@ -320,40 +320,40 @@ void SplashScreen::loadConfig()
 
     if ( sProgressFrameColor.getLength() )
     {
-        UINT8 nRed = 0;
-        UINT8 nGreen = 0;
-        UINT8 nBlue = 0;
+        sal_uInt8 nRed = 0;
+        sal_uInt8 nGreen = 0;
+        sal_uInt8 nBlue = 0;
         sal_Int32 idx = 0;
         sal_Int32 temp = sProgressFrameColor.getToken( 0, ',', idx ).toInt32();
         if ( idx != -1 )
         {
-            nRed = static_cast< UINT8 >( temp );
+            nRed = static_cast< sal_uInt8 >( temp );
             temp = sProgressFrameColor.getToken( 0, ',', idx ).toInt32();
         }
         if ( idx != -1 )
         {
-            nGreen = static_cast< UINT8 >( temp );
-            nBlue = static_cast< UINT8 >( sProgressFrameColor.getToken( 0, ',', idx ).toInt32() );
+            nGreen = static_cast< sal_uInt8 >( temp );
+            nBlue = static_cast< sal_uInt8 >( sProgressFrameColor.getToken( 0, ',', idx ).toInt32() );
             _cProgressFrameColor = Color( nRed, nGreen, nBlue );
         }
     }
 
     if ( sProgressBarColor.getLength() )
     {
-        UINT8 nRed = 0;
-        UINT8 nGreen = 0;
-        UINT8 nBlue = 0;
+        sal_uInt8 nRed = 0;
+        sal_uInt8 nGreen = 0;
+        sal_uInt8 nBlue = 0;
         sal_Int32 idx = 0;
         sal_Int32 temp = sProgressBarColor.getToken( 0, ',', idx ).toInt32();
         if ( idx != -1 )
         {
-            nRed = static_cast< UINT8 >( temp );
+            nRed = static_cast< sal_uInt8 >( temp );
             temp = sProgressBarColor.getToken( 0, ',', idx ).toInt32();
         }
         if ( idx != -1 )
         {
-            nGreen = static_cast< UINT8 >( temp );
-            nBlue = static_cast< UINT8 >( sProgressBarColor.getToken( 0, ',', idx ).toInt32() );
+            nGreen = static_cast< sal_uInt8 >( temp );
+            nBlue = static_cast< sal_uInt8 >( sProgressBarColor.getToken( 0, ',', idx ).toInt32() );
             _cProgressBarColor = Color( nRed, nGreen, nBlue );
         }
     }
@@ -631,7 +631,7 @@ void SplashScreen::Paint( const Rectangle&)
     if(!_bVisible) return;
 
     //native drawing
-    BOOL bNativeOK = FALSE;
+    sal_Bool bNativeOK = sal_False;
 
     // in case of native controls we need to draw directly to the window
     if( _bNativeProgress && IsNativeControlSupported( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL ) )
@@ -652,7 +652,7 @@ void SplashScreen::Paint( const Rectangle&)
         }
 
         if( (bNativeOK = DrawNativeControl( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect,
-                                            CTRL_STATE_ENABLED, aValue, _sProgressText )) != FALSE )
+                                            CTRL_STATE_ENABLED, aValue, _sProgressText )) != sal_False )
         {
             return;
         }